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

 	int cur_encoding, custom_encoding;
 	bool link, t_html, t_body;
 	dword bufpointer;
 	dword bufsize;
 	void DrawStyle();
 	void SetPageDefaults();
 	void AddCharToTheLine();
 	void ParseHtml();
-	void SetStyle();
-	void DrawStyle();
-	void DrawPage();
-	void DrawScroller();
-	void NewLine();
+	void SetStyle();
+	bool CheckForLineBreak();
+	void NewLine();
+	void DrawScroller();
+	void ChangeEncoding();
-	bool CheckForLineBreak();
+	void DrawPage();
 	char line[500];
 	char header[150];
 };
 scroll_bar scroll_wv = { 15,NULL,NULL,NULL,0,2,NULL,0,0,0xeeeeee,0xBBBbbb,0xeeeeee};
 //============================================================================================
+void TWebBrowser::DrawStyle()
 void TWebBrowser::DrawStyle()
 	dword start_x, line_length, stolbec_len;
-	dword start_x, line_length, stolbec_len;
+	dword text_color__;
 		if (style.button) {
 			DrawBuf.DrawBar(start_x, draw_y, line_length, list.item_h - calc(zoom*2), 0xCCCccc);
 			DrawBuf.DrawBar(start_x, draw_y + list.item_h - calc(zoom*2), line_length, zoom, 0x999999);
+		}
+		text_color__ = text_colors[text_color_index];
+		if (link) && (text_colors[text_color_index]==text_colors[0]) text_color__ = link_color_default;
-		DrawBuf.WriteText(start_x, draw_y, list.font_type, text_colors[text_color_index], #line);
+		DrawBuf.WriteText(start_x, draw_y, list.font_type, text_color__, #line);
-		if (style.b) DrawBuf.WriteText(start_x+1, draw_y, list.font_type, text_colors[text_color_index], #line);
+		if (style.b) DrawBuf.WriteText(start_x+1, draw_y, list.font_type, text_color__, #line);
-		if (style.s) DrawBuf.DrawBar(start_x, list.item_h / 2 - zoom + draw_y, line_length, zoom, text_colors[text_color_index]);
+		if (style.s) DrawBuf.DrawBar(start_x, list.item_h / 2 - zoom + draw_y, line_length, zoom, text_color__);
-		if (style.u) DrawBuf.DrawBar(start_x, list.item_h - zoom - zoom + draw_y, line_length, zoom, text_colors[text_color_index]);
+		if (style.u) DrawBuf.DrawBar(start_x, list.item_h - zoom - zoom + draw_y, line_length, zoom, text_color__);
 		if (link) {
 			if (line[0]==' ') && (line[1]==NULL) {} else {
 				DrawBuf.DrawBar(start_x, draw_y + list.item_h - calc(zoom*2)-1, line_length, zoom, link_color_default);
 				PageLinks.AddText(start_x, draw_y + list.y, line_length, list.item_h - calc(zoom*2)-1, UNDERLINE, zoom);
 			ignor_param=false;
 			while (ESBYTE[bufpos] !='>') && (bufpos < bufpointer + bufsize) //ïîëó÷àåì òåã è åãî ïàðàìåòðû
+			{
 				bukva = ESBYTE[bufpos];
-				if (bukva == '\9') || (bukva == '\x0a') || (bukva == '\x0d') bukva = ' ';
+				if (bukva == '\x9') || (bukva == '\x0a') || (bukva == '\x0d') bukva = ' ';
 				if (!ignor_param) && (bukva <>' ')
+				{
 					if (strlen(#tag.name)+1
+				}
 	DrawStyle();
 	strcpy(#line, #new_line_text);
 	NewLine();
-	//if (strlen(#line)*zoom + stolbec > list.column_max)CheckForLineBreak();
+	//while (CheckForLineBreak()==true) {};
 	return true;
+}
 //============================================================================================
-void TWebBrowser::SetStyle() {
-	char img_path[4096]=0;
+void TWebBrowser::SetStyle() {
-	int meta_encoding;
+	char img_path[4096]=0;
+	}
 	if (tag.is("html")) {
 		t_html = tag.opened;
 		return;
+	}
-	if (tag.is("q"))
-	{
-		if (tag.opened)	{
-			meta_encoding = strlen(#line);
-			if (line[meta_encoding-1] != ' ') chrcat(#line, ' ');
-			chrcat(#line, '\"');
-		}
-		if (!tag.opened) strcat(#line, "\" ");
-		return;
-	}
 	if (tag.is("title")) {
 		style.tag_title = tag.opened;
 		if (!tag.opened) DrawTitle(#header);
 		return;
+	}
 		if (value = tag.get_value_of("text="))  text_colors[0]=GetColor(value);
 		if (value = tag.get_value_of("bgcolor=")) {
 			style.bg_color = page_bg = GetColor(value);
 			DrawBuf.Fill(0, page_bg);
+		}
+		// Autodetecting encoding if no encoding was set
+		if (tag.opened) && (custom_encoding==-1) && (cur_encoding == CH_CP866) {
+			if (strstr(bufpointer, "\208\190")) ChangeEncoding(CH_UTF8);
+			else if (chrnum(bufpointer, '\x246')>5) ChangeEncoding(CH_CP1251);
+		}
 		return;
+	}
+	if (tag.is("br")) { NewLine(); return; }
+	if (tag.is("b")) || (tag.is("strong")) || (tag.is("big")) { style.b = tag.opened; return; }
 	if (tag.is("a")) {
 		if (tag.opened)
+		{
-			if (link) IF(text_color_index > 0) text_color_index--; //åñëè ïðåäûäóùèé òåã à íå áûë çàêðûò
 			if (value = tag.get_value_of("href=")) && (!strstr(value,"javascript:"))
+			{
-				text_color_index++;
-				text_colors[text_color_index] = text_colors[text_color_index-1];
-				link = 1;
+				link = true;
-				text_colors[text_color_index] = link_color_default;
 				PageLinks.AddLink(value);
+			}
 		} else {
-			link = 0;
+			link = false;
-			IF(text_color_index > 0) text_color_index--;
+		}
 		return;
+	}
+	if (tag.is("iframe")) && (value = tag.get_value_of("src=")) {
+		NewLine();
+		strcpy(#line, "IFRAME: ");
+		DrawStyle();
+		link=true;
+		PageLinks.AddLink(value);
+		strncpy(#line, value, sizeof(TWebBrowser.line)-1);
+		while (CheckForLineBreak()) {};
+		DrawStyle();
+		link=false;
+		NewLine();
+	}
 	if (tag.is("font")) {
 		style.bg_color = page_bg;
 		if (tag.opened)
+		{
 			text_color_index++;
 	if (tag.is("p")) {
 		IF (tag.prior[0] == 'h') || (streq(#tag.prior,"td")) || (streq(#tag.prior,"p")) return;
 		NewLine();
 		return;
+	}
-	if (tag.is("br")) { NewLine(); return; }
+	if (tag.is("pre")) { style.pre = tag.opened; return; }
 	if (tag.is("td")) { if (tag.opened) AddCharToTheLine(' '); return; }
 	if (tag.is("tr")) { if (tag.opened) NewLine(); return; }
-	if (tag.is("b")) || (tag.is("strong")) || (tag.is("big")) { style.b = tag.opened; return; }
 	if (tag.is("button")) { style.button = tag.opened; stolbec++; return; }
 	if (tag.is("u")) || (tag.is("ins")) { style.u=tag.opened; return;}
 	if (tag.is("s")) || (tag.is("strike")) || (tag.is("del")) { style.s=tag.opened; return; }
-	if (tag.is("dd")) { stolbec += 5; return; }
+	//if (tag.is("dd")) { stolbec += 5; return; } //stolbec overflow!
 	if (tag.is("blockquote")) { style.blq = tag.opened; return; }
-	if (tag.is("pre")) { style.pre = tag.opened; return; }
 	if (tag.is("code")) {
 		if (tag.opened) style.bg_color = 0xe4ffcb; else style.bg_color = page_bg;
 		style.pre = tag.opened; return;
+	}
 	if (tag.is("img")) {
 			sprintf(#line, "%i. ", style.tag_list.inc_counter());
 			stolbec = style.tag_list.level * 5 - strlen(#line);
+		}
 		return;
+	}
+	if (tag.is("q"))
+	{
+		if (tag.opened)	{
+			EAX = strlen(#line);
+			if (line[EAX-1] != ' ') chrcat(#line, ' ');
+			chrcat(#line, '\"');
+		}
+		if (!tag.opened) strcat(#line, "\" ");
+		return;
+	}
 	if (tag.is("hr")) {
 		if (value = tag.get_value_of("color=")) EDI = GetColor(value); else EDI = 0x999999;
 		$push edi;
 		NewLine();
 		$pop edi;
 		NewLine();
 		draw_y += 10;
 		return;
+	}
 	if (custom_encoding == -1) && (tag.is("meta")) || (tag.is("?xml")) {
-		meta_encoding = CH_CP866;
 		if (value = tag.get_value_of("charset=")) || (value = tag.get_value_of("content=")) || (value = tag.get_value_of("encoding="))
+		{
 			value += strrchr(value, '='); //search in content=
 			strlwr(value);
-			if      (streq(value,"utf-8"))        || (streq(value,"utf8"))        meta_encoding = CH_UTF8;
+			if      (streq(value,"utf-8"))        || (streq(value,"utf8"))        ChangeEncoding(CH_UTF8);
-			else if (streq(value,"windows-1251")) || (streq(value,"windows1251")) meta_encoding = CH_CP1251;
+			else if (streq(value,"windows-1251")) || (streq(value,"windows1251")) ChangeEncoding(CH_CP1251);
-			else if (streq(value,"dos"))          || (streq(value,"cp-866"))      meta_encoding = CH_CP866;
+			else if (streq(value,"dos"))          || (streq(value,"cp-866"))      ChangeEncoding(CH_CP866);
-			else if (streq(value,"iso-8859-5"))   || (streq(value,"iso8859-5"))   meta_encoding = CH_ISO8859_5;
+			else if (streq(value,"iso-8859-5"))   || (streq(value,"iso8859-5"))   ChangeEncoding(CH_ISO8859_5);
-			else if (streq(value,"koi8-r"))       || (streq(value,"koi8-u"))      meta_encoding = CH_KOI8;
+			else if (streq(value,"koi8-r"))       || (streq(value,"koi8-u"))      ChangeEncoding(CH_KOI8);
-		}
-		if (meta_encoding != CH_CP866) && (cur_encoding != meta_encoding) {
-			cur_encoding = meta_encoding;
-			bufpointer = ChangeCharset(cur_encoding*10+#charsets, "CP866", bufpointer);
-			if (header) {
-				ChangeCharset(cur_encoding*10+#charsets, "CP866", #header);
-				DrawTitle(#header);
-			}
+		}
 		return;
+	}
+}
 //============================================================================================
 	scroll_wv.start_y = list.y;
 	scroll_wv.size_y = list.h;
 	scrollbar_v_draw(#scroll_wv);
+}
 //============================================================================================
+void TWebBrowser::ChangeEncoding(int _new_encoding)
+{
+	if (cur_encoding == _new_encoding) return;
+	cur_encoding = _new_encoding;
+	bufpointer = ChangeCharset(cur_encoding*10+#charsets, "CP866", bufpointer);
+	if (header) {
+		ChangeCharset(cur_encoding*10+#charsets, "CP866", #header);
+		DrawTitle(#header);
+	}
+}
+//============================================================================================
 void TWebBrowser::NewLine()
+{
 	dword onleft, ontop;
 	static int empty_line=0;

Subversion Repositories Kolibri OS

(root)/programs/cmm/TWB/TWB.c @ 7889 – Rev 7759 → 7762