summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/ubrowser/httpcomm.cpp43
-rw-r--r--noncore/net/ubrowser/httpcomm.h6
-rw-r--r--noncore/net/ubrowser/httpfactory.cpp25
-rw-r--r--noncore/net/ubrowser/httpfactory.h1
4 files changed, 59 insertions, 16 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
@@ -38,14 +38,16 @@ 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()
{
@@ -69,14 +71,17 @@ void HttpComm::connected()
}
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)
{
@@ -131,8 +136,9 @@ void HttpComm::incoming()
}
}
else
{
+ int startclength=0;
QString tempQString = tempString;
//remove the http header, if one exists
if(j != 0)
{
@@ -187,22 +193,27 @@ void HttpComm::incoming()
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();
}
@@ -226,22 +237,27 @@ void HttpComm::incoming()
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();
}
@@ -307,11 +323,20 @@ void HttpComm::processBody()
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() );
- browser->setTextFormat(RichText);
- browser->mimeSourceFactory()->setFilePath(context);
- browser->setText(body, context);
+ 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
@@ -19,8 +19,10 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#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
@@ -28,9 +30,9 @@ 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();
@@ -48,10 +50,12 @@ private:
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
@@ -21,17 +21,18 @@ 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;
@@ -45,9 +46,10 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
name = name.remove(0, 7);
}
else
{
- return 0;
+ name.prepend(browser->context());
+ name = name.remove(0, 7);
}
addrEnd = name.find('/');
if(addrEnd == -1)
@@ -76,16 +78,27 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
if(port == 80)
{
portS="80";
}
+
+ 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);
+ comm->setStuff(host, portS, file, text, image, isImage);
socket->connectToHost(host, port);
- text->setText("");
-
- return text;
+ if(!image)
+ {
+ text->setText("");
+ return text;
+ }
+ else
+ {
+ return image;
+ }
}
const QMimeSource * HttpFactory::data(const QString &abs_or_rel_name, const QString & context) const
{
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
@@ -33,6 +33,7 @@ public:
private:
QSocket *socket;
HttpComm *comm;
QTextDrag *text;
+ QImageDrag *image;
QTextBrowser *browser;
};