author | spiralman <spiralman> | 2002-08-03 03:25:31 (UTC) |
---|---|---|
committer | spiralman <spiralman> | 2002-08-03 03:25:31 (UTC) |
commit | 7d4b246bc728b73e9d38e110619222dd89c1fd1c (patch) (side-by-side diff) | |
tree | 7e6fbb8bbb106967993fa786a917fccde43970f3 | |
parent | 4005263f7c64a631f4df9aeece83321ba818160d (diff) | |
download | opie-7d4b246bc728b73e9d38e110619222dd89c1fd1c.zip opie-7d4b246bc728b73e9d38e110619222dd89c1fd1c.tar.gz opie-7d4b246bc728b73e9d38e110619222dd89c1fd1c.tar.bz2 |
fixed relative links (except from forward and back buttons), added initial image code (not working), changes to chunked encoding (still not working, might be a qsocket issue)
-rw-r--r-- | noncore/net/ubrowser/httpcomm.cpp | 37 | ||||
-rw-r--r-- | noncore/net/ubrowser/httpcomm.h | 6 | ||||
-rw-r--r-- | noncore/net/ubrowser/httpfactory.cpp | 21 | ||||
-rw-r--r-- | noncore/net/ubrowser/httpfactory.h | 1 |
4 files changed, 54 insertions, 11 deletions
diff --git a/noncore/net/ubrowser/httpcomm.cpp b/noncore/net/ubrowser/httpcomm.cpp index 3c14053..4f189ce 100644 --- a/noncore/net/ubrowser/httpcomm.cpp +++ b/noncore/net/ubrowser/httpcomm.cpp @@ -30,30 +30,32 @@ HttpComm::HttpComm(QSocket *newSocket, QTextBrowser *newBrowser):QObject() bRead = 0; chunked=false; lengthset=false; browser=newBrowser; } void HttpComm::setUp(QString *newName) { name = newName; } -void HttpComm::setStuff(QString newHost, QString newPortS, QString newFile, QTextDrag *newText) +void HttpComm::setStuff(QString newHost, QString newPortS, QString newFile, QTextDrag *newText, QImageDrag *newImage, bool newIsImage) { host = newHost; portS = newPortS; file = newFile; text = newText; + isImage = newIsImage; + image = newImage; } void HttpComm::hostFound() { printf("HttpComm::hostFound: host found\n"); } void HttpComm::connected() { QString request("GET " + file + " HTTP/1.1\r\nHost: " + host + ':' + portS + "\r\nConnection: close\r\n\r\n"); // QString request("GET " + file + " HTTP/1.0\r\n\r\n"); printf("HttpComm::data: bytes written: %d\n", socket->writeBlock(request.latin1(), request.length()) ); @@ -61,30 +63,33 @@ void HttpComm::connected() headerRead=false; bRead=0; length = 0; header=""; body=""; chunked=false; lengthset=false; } void HttpComm::incoming() { - int ba=socket->bytesAvailable(), i=0, j=0, semi=0; + int ba=socket->size(), i=0, j=0, semi=0; char *tempString = new char [ba]; + int br = socket->readBlock(tempString, ba); + socket->flush(); bool nextChunk=false; bool done=false; - socket->readBlock(tempString, ba); printf("HttpComm::incoming: ba: %d\n", ba); + printf("HttpComm::incoming: bytes read from socket: %d\n", br); +// printf("HttpComm::incoming: tempString length: %d\n"); QString sclength; if(headerRead == false) { for(i=0; i<ba; i++) { if(tempString[i] != '\r') { if(tempString[i] == '\n' && header[header.length()-1] == '\n') { j=i; headerRead = true; @@ -123,24 +128,25 @@ void HttpComm::incoming() // printf("bRead2: %d\n", bRead); } if(bRead >= length) { printf("HttpComm::incoming: finished reading body\n"); processBody(); socket->close(); } } else { + int startclength=0; QString tempQString = tempString; //remove the http header, if one exists if(j != 0) { tempQString.remove(0, j+1); printf("HttpComm::incoming: removing http header. Result: \n%s", tempQString.latin1()); } while(!done) { switch(status) { //case 0=need to read chunk length @@ -179,38 +185,43 @@ void HttpComm::incoming() case 1: //the current data extends beyond the end of the chunk if(bRead + tempQString.length() > clength) { QString newTQstring = tempQString; newTQstring.truncate(clength-bRead); bRead+=newTQstring.length(); body+=newTQstring; printf("HttpComm::incoming: start new body piece 1: \n"); printf("%s", newTQstring.latin1() ); printf("HttpComm::incoming: end new body piece 1.\n"); status=0; - tempQString = tempQString.remove(0, clength); + tempQString = tempQString.remove(0, newTQstring.length()); + startclength = tempQString.find('\n'); + printf("HttpComm::incoming: startclength: %d\n", startclength); + tempQString = tempQString.remove(0, startclength+1); done=false; // break; } //the chunk extends beyond the current data; else { if(tempQString.length() <= ba) { + printf("HttpComm::incoming: not truncating tempQString\n"); body+=tempQString; bRead+=tempQString.length(); } else { + printf("HttpComm::incoming: truncating tempQString\n"); tempQString.truncate(ba); body+=tempQString; bRead+=tempQString.length(); } printf("HttpComm::incoming: start new body piece 2: \n"); printf("%s", tempQString.latin1() ); printf("HttpComm::incoming: end new body piece 2.\n"); done=true; status=2; // break; } break; @@ -218,38 +229,43 @@ void HttpComm::incoming() case 2: //the current data extends beyond the end of the chunk if(bRead + tempQString.length() > clength) { QString newTQstring = tempQString; newTQstring.truncate(clength-bRead); bRead+=newTQstring.length(); body+=newTQstring; printf("HttpComm::incoming: start new body piece 3: \n"); printf("%s", newTQstring.latin1() ); printf("HttpComm::incoming: end new body piece 3.\n"); status=0; - tempQString = tempQString.remove(0, clength); + tempQString = tempQString.remove(0, newTQstring.length()); + startclength = tempQString.find('\n'); + printf("HttpComm::incoming: startclength, tempQString length: %d %d\n", startclength, tempQString.length()); + tempQString = tempQString.remove(0, startclength+1); done=false; // break; } //the chunk extends beyond the current data; else { if(tempQString.length() <= ba) { + printf("HttpComm::incoming: not truncating tempQString\n"); body+=tempQString; bRead+=tempQString.length(); } else { + printf("HttpComm::incoming: truncating tempQString\n"); tempQString.truncate(ba); body+=tempQString; bRead+=tempQString.length(); } printf("HttpComm::incoming: start new body piece 4: \n"); printf("%s", tempQString.latin1() ); printf("HttpComm::incoming: end new body piece 4.\n"); done=true; status=2; // break; } break; @@ -299,19 +315,28 @@ void HttpComm::parseHeader() void HttpComm::processBody() { printf("HttpComm::processBody: processing body\n"); // printf("HttpComm::processBody: start body\n\n"); // printf("%s", body.latin1()); // printf("HttpComm::processBody: end body\n"); int lastSlash = file.findRev('/'); QString end = file; end.truncate(lastSlash+1); - QString context("http://"+host+':'+portS+end); + QString context = "http://"+host+':'+portS+end; printf("HttpComm::processBody: context: %s\n", context.latin1() ); + if(!isImage) + { browser->setTextFormat(RichText); browser->mimeSourceFactory()->setFilePath(context); browser->setText(body, context); } + else + { + QImage tempImage(body.latin1()); + image->setImage(tempImage); + browser->update(); + } +} diff --git a/noncore/net/ubrowser/httpcomm.h b/noncore/net/ubrowser/httpcomm.h index c20fe72..d6f63fc 100644 --- a/noncore/net/ubrowser/httpcomm.h +++ b/noncore/net/ubrowser/httpcomm.h @@ -11,47 +11,51 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <qobject.h> #include <qstring.h> #include <qsocket.h> #include <qstringlist.h> #include <qdragobject.h> #include <qtextbrowser.h> +#include <qcstring.h> +#include <qimage.h> #include <stdio.h> class HttpComm : public QObject { Q_OBJECT public: HttpComm(QSocket *newSocket, QTextBrowser *newBrowser); void setUp(QString *newName); - void setStuff(QString newHost, QString newPortS, QString newFile, QTextDrag *newText); + void setStuff(QString newHost, QString newPortS, QString newFile, QTextDrag *newText, QImageDrag *newImage, bool newIsImage); void parseHeader(); void processBody(); public slots: void hostFound(); void connected(); void connectionClosed(); void incoming(); private: QString *name; QSocket *socket; QString host; QString portS; QString file; bool headerRead; QString header; QString body; unsigned int length; unsigned int bRead; QTextDrag *text; + QImageDrag *image; QTextBrowser *browser; bool chunked; bool lengthset; unsigned int clength; int status; + bool isImage; }; diff --git a/noncore/net/ubrowser/httpfactory.cpp b/noncore/net/ubrowser/httpfactory.cpp index 92718fb..50a3c9a 100644 --- a/noncore/net/ubrowser/httpfactory.cpp +++ b/noncore/net/ubrowser/httpfactory.cpp @@ -13,49 +13,51 @@ Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "httpfactory.h" HttpFactory::HttpFactory(QTextBrowser *newBrowser):QMimeSourceFactory() { socket = new QSocket; text = new QTextDrag; browser=newBrowser; comm = new HttpComm(socket, browser); + image = new QImageDrag; } const QMimeSource * HttpFactory::data(const QString &abs_name) const { printf("HttpFactory::data: using absolute data func\n"); int port=80, addrEnd, portSep; QString host, file, portS, name, tempString; - bool done=false; + bool done=false, isImage=false; comm->setUp((QString *)&abs_name); name = abs_name; // name = name.lower(); name = name.stripWhiteSpace(); printf("%s\n", name.latin1()); if(name.startsWith("http://")) { name = name.remove(0, 7); } else { - return 0; + name.prepend(browser->context()); + name = name.remove(0, 7); } addrEnd = name.find('/'); if(addrEnd == -1) { name += '/'; addrEnd = name.length()-1; } host = name; file = name; @@ -69,32 +71,43 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const host.truncate(portSep); portS.remove(0, portSep+1); port = portS.toInt(); } printf("%s %s %d\n", host.latin1(), file.latin1(), port); if(port == 80) { portS="80"; } - comm->setStuff(host, portS, file, text); + if(file.find(".png", file.length()-4) != -1 || file.find(".gif", file.length()-4) != -1 || file.find(".jpg", file.length()-4) != -1) + { + isImage=true; + } + + comm->setStuff(host, portS, file, text, image, isImage); socket->connectToHost(host, port); + if(!image) + { text->setText(""); - return text; } + else + { + return image; + } +} const QMimeSource * HttpFactory::data(const QString &abs_or_rel_name, const QString & context) const { printf("HttpFactory::data: using relative data func\n"); if(abs_or_rel_name.startsWith(context)) { return data(abs_or_rel_name); } else { return data(context + abs_or_rel_name); diff --git a/noncore/net/ubrowser/httpfactory.h b/noncore/net/ubrowser/httpfactory.h index bb7615b..1802f56 100644 --- a/noncore/net/ubrowser/httpfactory.h +++ b/noncore/net/ubrowser/httpfactory.h @@ -25,14 +25,15 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "httpcomm.h" class HttpFactory : public QMimeSourceFactory { public: HttpFactory(QTextBrowser *newBrowser); const QMimeSource * data(const QString &abs_name) const; const QMimeSource * data(const QString &abs_or_rel_name, const QString & context) const; private: QSocket *socket; HttpComm *comm; QTextDrag *text; + QImageDrag *image; QTextBrowser *browser; }; |