WebSVN – Kolibri OS – Diff – /programs/cmm/TWB/TWB.c

 #include "..\TWB\links.h"
+dword bufpointer;
-dword bufpointer;
+dword o_bufpointer;
 dword bufsize;
 struct TWebBrowser {
 	llist list;
 	DrawBufer DrawBuf;
 	void GetNewUrl();
-	void ReadHtml();
+	void Prepare();
 	void Parse();
 	void WhatTextStyle();
 	void DrawPage();
 	void DrawScroller();
 byte b_text, i_text, u_text, s_text, pre_text, blq_text, li_text, li_tab,
 	link, ignor_text, cur_encoding, text_align;
 byte condition_text_active, condition_text_val, condition_href, condition_max;
-enum { _WIN, _DOS, _KOI, _UTF };
+enum { _WIN, _DOS, _KOI, _UTF, _DEFAULT };
 #include "..\TWB\history.h"
 #include "..\TWB\colors.h"
 #include "..\TWB\unicode_tags.h"
 #include "..\TWB\img_cache.h"
 #include "..\TWB\parce_tag.h"
+#include "..\TWB\table.h"
 		strcat(#newurl, #URL);
 		strcpy(#URL, #newurl);
-}
+}
+void BufEncode(int set_new_encoding)
-void TWebBrowser::ReadHtml(byte encoding)
+{
 	cur_encoding = set_new_encoding;
-	if (native_http)
-	{
-			if (strncmp(#URL,"http:",5)) {
+	if (o_bufpointer==0)
-				file_size stdcall (#URL);
-				bufsize = EBX;
-			}
+	{
-			if (!bufsize) return;
+		debugi(bufsize);
-			if (strncmp(#URL,"http:",5)) {
+		bufsize = strlen(bufpointer);
-				mem_Free(bufpointer);
-				bufpointer = mem_Alloc(bufsize);
-			}
-			if (strncmp(#URL,"http:",5)) ReadFile(0, bufsize, bufpointer, #URL);
+		debugi(bufsize);
-			cur_encoding = encoding;
-			if (encoding==_WIN) wintodos(bufpointer);
-			if (encoding==_UTF) utf8rutodos(bufpointer);
+		o_bufpointer = malloc(bufsize);
-			if (encoding==_KOI) koitodos(bufpointer);
+		strcpy(o_bufpointer, bufpointer);
+	}
-	else
-	{
-			if (!strncmp(#URL,"http:",5))
-				file_size stdcall (#download_path);
-			else
-				file_size stdcall (#URL);
-			bufsize = EBX;
-			if (!bufsize) return;
+	else
-			mem_Free(bufpointer);
-			bufpointer = mem_Alloc(bufsize);
-			if (!strncmp(#URL,"http:",5))
-				ReadFile(0, bufsize, bufpointer, #download_path);
-			else
-				ReadFile(0, bufsize, bufpointer, #URL);
-			cur_encoding = encoding;
-			if (encoding==_WIN) wintodos(bufpointer);
 			if (encoding==_UTF) utf8rutodos(bufpointer);
+		strcpy(bufpointer, o_bufpointer);
+	}
+	if (set_new_encoding==_WIN) wintodos(bufpointer);
-			if (encoding==_KOI) koitodos(bufpointer);
+	if (set_new_encoding==_UTF) utf8rutodos(bufpointer);
-	}
-}
+	if (set_new_encoding==_KOI) koitodos(bufpointer);
+}
+void TWebBrowser::Prepare(dword bufpos, in_filesize){
-/*
-void TWebBrowser::ReadHtml(byte encoding)
 	bufsize = in_filesize;
+	bufpointer = bufpos;
 	Parse();
 */
-void TWebBrowser::Parse(dword bufpos, in_filesize){
-	word bukva[2];
+void TWebBrowser::Parse(){
-	int j, perenos_num;
+	word bukva[2];
-	byte ignor_param;
+	int j, perenos_num;
-	char temp[768];
+	byte ignor_param;
-	bufsize = in_filesize;
+	char temp[768];
 	if (list.first == 0) list.count = stroka;
 	if (anchor) //åñëè ïîñðåäè òåêñòà ïîÿâèòñÿ íîâûé ÿêîðü - áóäåò áåñêîíå÷íûé öèêë
+	{
 		anchor=NULL;
 		list.first=anchor_line_num;
-		Parse(bufpointer, bufsize);
+		Parse();
+	}
 	DrawScroller();
+}
 char oldtag[100];
-void TWebBrowser::WhatTextStyle(int left1, top1, width1) {
+void TWebBrowser::WhatTextStyle(int left1, top1, width1) {
 	dword hr_color;
 	byte opened;
 	byte meta_encoding;
 	//ïðîâåðÿåì òåã îòêðûâàåòñÿ èëè çàêðûâàåòñÿ
 	if (tag[0] == '/')
+		}
 		else
 			if (text_color_index > 0) text_color_index--;
 		return;
+	}
-	if(isTag("tr")) || (isTag("br")) {
+	if (isTag("br")) {
 		TextGoDown(left1, top1, width1);
 		return;
+	}
 	if (isTag("div")) || (isTag("header")) || (isTag("footer")) {
 		IF(oldtag[0] <>'h') TextGoDown(left1, top1, width1);
 		IF(oldtag[0] == 'h') return;
 		TextGoDown(left1, top1, width1);
 		IF(opened) TextGoDown(left1, top1 + 10, width1);
 		return;
+	}
+	if(isTag("table")) {
+		if (opened)
+		{
+			table.active = true;
+			TextGoDown(left1, top1, width1);
+			table.NewTable();
+		}
+		else
+		{
+			table.active = false;
+			TextGoDown(left1, top1, width1);
+		}
+	}
+	if(isTag("td")) {
+		if (opened)
+		{
+			//
+		}
+		else
+		{
+			//
+		}
+	}
+	if(isTag("tr")) {
+		if (opened)
+		{
+			//
+		}
+		else
+		{
+			TextGoDown(left1, top1, width1);
+			if (table.cur_row == 0) table.max_cols = table.cur_col;
+			table.cur_row++;
+		}
+	}
 	/*
 	if (isTag("center"))
+	{
 		if (opened) text_align = ALIGN_CENTER;
 		if (!opened)
+	{
 		do{
 			if (!strcmp(#parametr, "charset=")) || (!strcmp(#parametr, "content=")) || (!strcmp(#parametr, "encoding="))
+			{
 				strcpy(#options, #options[strrchr(#options, '=')]); //ïîèñê â content=
+				strlwr(#options);
-				if (!strcmp(#options, "utf-8"))  || (!strcmp(#options,"utf8"))      ReadHtml(_UTF);
+				if (!strcmp(#options, "utf-8"))  || (!strcmp(#options,"utf8")) meta_encoding = _UTF;
-				if (!strcmp(#options, "koi8-r")) || (!strcmp(#options, "koi8-u"))   ReadHtml(_KOI);
+				if (!strcmp(#options, "koi8-r")) || (!strcmp(#options, "koi8-u")) meta_encoding = _KOI;
+				if (!strcmp(#options, "windows-1251")) || (!strcmp(#options, "windows1251")) meta_encoding = _WIN;
-				if (!strcmp(#options, "dos"))    || (!strcmp(#options, "cp-866"))   ReadHtml(_DOS);
+				//if (!strcmp(#options, "dos"))    || (!strcmp(#options, "cp-866"))   meta_encoding = _DOS;
+				if ((cur_encoding==_DEFAULT) && (http_transfer==0)) BufEncode(meta_encoding);
+				return;
+			}
 		} while(GetNextParam());
 		return;
+	}
+}
-/*
-char *encodings = {
-	"utf-8",  _UTF,
-	"utf8",   _UTF,
-	"koi8-r", _KOI,
-	"koi8-u", _KOI,
-	"dos",    _DOS,
-	"cp-866", _DOS
-};
-*/
 void TWebBrowser::DrawScroller() //íå îïòèìàëüíàÿ îòðèñîâêà, íî çàòî â îäíîì ìåñòå
+{
 	scroll_wv.max_area = list.count;
 	scroll_wv.cur_area = list.visible;
 int isTag(dword text)
+{
 	if (!strcmp(#tag,text)) return 1; else return 0;
+}
+>

Subversion Repositories Kolibri OS

(root)/programs/cmm/TWB/TWB.c @ 5773 – Rev 4562 → 4636