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)

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
@@ -39,12 +39,14 @@ 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()
@@ -70,12 +72,15 @@ 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)
@@ -132,6 +137,7 @@ void HttpComm::incoming()
 		}
 		else
 		{
+			int startclength=0;
 			QString tempQString = tempString;
 			//remove the http header, if one exists
 			if(j != 0)
@@ -188,7 +194,10 @@ void HttpComm::incoming()
 						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;
 					}
@@ -197,11 +206,13 @@ void HttpComm::incoming()
 					{
 						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();
@@ -227,7 +238,10 @@ void HttpComm::incoming()
 						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;
 					}
@@ -236,11 +250,13 @@ void HttpComm::incoming()
 					{
 						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();
@@ -308,10 +324,19 @@ void HttpComm::processBody()
 	
 	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
@@ -20,6 +20,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <qstringlist.h>
 #include <qdragobject.h>
 #include <qtextbrowser.h>
+#include <qcstring.h>
+#include <qimage.h>
 
 #include <stdio.h>
 
@@ -29,7 +31,7 @@ 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:
@@ -49,9 +51,11 @@ private:
 	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
@@ -22,6 +22,7 @@ HttpFactory::HttpFactory(QTextBrowser *newBrowser):QMimeSourceFactory()
 	text = new QTextDrag;
 	browser=newBrowser;
 	comm = new HttpComm(socket, browser);
+	image = new QImageDrag;
 }
 
 const QMimeSource * HttpFactory::data(const QString &abs_name) const
@@ -30,7 +31,7 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
 
 	int port=80, addrEnd, portSep;
 	QString host, file, portS, name, tempString;
-	bool done=false;
+	bool done=false, isImage=false;
 	
 	comm->setUp((QString *)&abs_name);
 
@@ -46,7 +47,8 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
 	}
 	else
 	{
-		return 0;
+		name.prepend(browser->context());
+		name = name.remove(0, 7);
 	}
 
 	addrEnd = name.find('/');
@@ -78,14 +80,25 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
 		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
 {
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
@@ -34,5 +34,6 @@ private:
 	QSocket *socket;
 	HttpComm *comm;
 	QTextDrag *text;
+	QImageDrag *image;
 	QTextBrowser *browser;
 };