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

 	llist list;
 	_style style;
 	DrawBufer DrawBuf;
 	int zoom;
-	void Prepare();
+	bool opened; //is this a "start tag" or "end tag"
+	void SetPageDefaults();
+	void Prepare();
 	void SetStyle();
 	void DrawStyle();
 	void DrawPage();
 	void DrawScroller();
 	void LoadInternalPage();
 bool
-	link,
-	ignor_text,
+	link,
 	cur_encoding,
 	t_html,
 	t_body;
 		if (style.b) DrawBuf.WriteText(start_x+1, draw_y, list.font_type, text_colors[text_color_index], #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.u) DrawBuf.DrawBar(start_x, list.item_h - zoom - zoom + draw_y, line_length, zoom, text_colors[text_color_index]);
 		if (link) {
-			DrawBuf.DrawBar(start_x, draw_y + list.item_h - calc(zoom*2), line_length, zoom, text_colors[text_color_index]);
+			if (streq[0]=' ') && (line[1]==NULL) {} else {
+				DrawBuf.DrawBar(start_x, draw_y + list.item_h - calc(zoom*2), line_length, zoom, text_colors[text_color_index]);
-			PageLinks.AddText(start_x, draw_y + list.y, line_length, list.item_h - calc(zoom*2), UNDERLINE, zoom); //TODO: set bigger underline_h for style.h
+				PageLinks.AddText(start_x, draw_y + list.y, line_length, list.item_h - calc(zoom*2), UNDERLINE, zoom);
-		}
+			}
+		}
 		stolbec += stolbec_len;
+	}
+}
 //============================================================================================
 void TWebBrowser::LoadInternalPage(dword bufpos, in_filesize){
 	bufpointer = bufpos;
 	Prepare();
+}
 //============================================================================================
-void TWebBrowser::Prepare(){
+void TWebBrowser::SetPageDefaults()
-	word bukva[2];
+{
-	dword j;
-	byte ignor_param;
+	style.b = style.u = style.s = style.h = style.blq = t_html = t_body = style.pre =
-	dword bufpos;
-	dword line_len;
-	style.b = style.u = style.s = style.h = style.blq = t_html = t_body =
-	style.li = link = ignor_text = text_color_index = text_colors[0] = style.li_tab = 0;
+	style.li = link = text_color_index = text_colors[0] = style.li_tab = false;
 	style.align = ALIGN_LEFT;
 	link_color_inactive = 0x0000FF;
 	link_color_active = 0xFF0000;
 	page_bg = 0xFFFFFF;
 	style.bg_color = page_bg;
 	DrawBuf.Fill(0, page_bg);
 	PageLinks.Clear();
 	strcpy(#header, #version);
-	draw_y = body_magrin;
+	cur_encoding = CH_NULL;
+	draw_y = body_magrin;
 	stolbec = 0;
 	line = 0;
 	zoom = 1;
 	//for plaint text use CP866 for other UTF
-	if (strstri(bufpointer, "html")!=-1)
-	{
-		debugln(" found");
-		style.pre = false;
-		cur_encoding = CH_NULL;
-	}
-	else
-	{
-		debugln("no ");
-		style.pre = true;
-		cur_encoding = CH_NULL;
-	}
-	for (bufpos=bufpointer ; (bufpos < bufpointer+bufsize) && (ESBYTE[bufpos]!=0) ; bufpos++;)
+//============================================================================================
+void TWebBrowser::Prepare(){
+	word bukva[2];
+	dword j;
+	bool ignor_param;
+	dword bufpos;
+	dword line_len;
+	SetPageDefaults();
+	if (strstri(bufpointer, "
+	for (bufpos=bufpointer ; (bufpos < bufpointer+bufsize) && (ESBYTE[bufpos]!=0) ; bufpos++;)
+	{
-		if (ignor_text) && (ESBYTE[bufpos]!='<') continue;
+		bukva = ESBYTE[bufpos];
-		bukva = ESBYTE[bufpos];
 		switch (bukva)
+		{
 		case 0x0a:
 			if (style.pre)
+			{
 				while (strncmp(bufpos,"-->",3)!=0) && (bufpos < bufpointer + bufsize)
+				{
 					bufpos++;
+				}
-				bufpos+=3;
+				bufpos+=2;
 				break;
+			}
 			tag = attr = tagparam = ignor_param = NULL;
 			while (ESBYTE[bufpos] !='>') && (bufpos < bufpointer + bufsize) //ïîëó÷àåì òåã è åãî ïàðàìåòðû
+			{
 				bukva = ESBYTE[bufpos];
+				}
 				else
+				{
 					ignor_param = true;
-					if (!ignor_text) && (strlen(#tagparam)+1
+					if (strlen(#tagparam)+1
 				}
 				bufpos++;
+			}
 			strlwr(#tag);
+			// ignore text inside the next tags
+			if (istag("script")) || (istag("style")) || (istag("binary")) || (istag("select"))  {
+				for (j=10; j>0; j--) tag[j]=tag[j-1];
+				tag[0] = '/';
+				j = strstri(bufpos, #tag);
+				if (j!=-1) {
+					bufpos = j;
+				}
+				break;
+			}
 			if (tag[strlen(#tag)-1]=='/') tag[strlen(#tag)-1]=NULL; //for br/
 			if (tagparam) GetNextParam();
+			if (tag[0] == '/')
+			{
+				 opened = 0;
+				 strcpy(#tag, #tag+1);
+			}
+			else opened = 1;
+			if (tag) && (!istag("span")) && (!istag("i")) && (!istag("svg")) {
-			Perenos();
+				Perenos();
-			DrawStyle();
+				DrawStyle();
-			line = NULL;
+				line = NULL;
-			if (tag) SetStyle();
+				if (tag) SetStyle();
+			}
 			strlcpy(#oldtag, #tag, sizeof(oldtag));
 			tag = attr = tagparam = ignor_param = NULL;
 			break;
 		default:
 			DEFAULT_MARK:
 //============================================================================================
 void TWebBrowser::SetStyle() {
 	char img_path[4096];
 	int left1 = body_magrin + list.x;
-	bool opened;
+	int meta_encoding;
-	int meta_encoding;
-	if (tag[0] == '/')
+	if (istag("html")) {
-	{
-		 opened = 0;
-		 strcpy(#tag, #tag+1);
-	}
-	else opened = 1;
-	if (istag("html")) {
 		t_html = opened;
 		return;
+	}
-	if (istag("script")) || (istag("style")) || (istag("binary")) || (istag("select")) { ignor_text = opened; return; }
+	if(istag("title")) {
-	if (istag("form")) if (!opened) ignor_text = false;
-	if(istag("title")) {
 		if (opened) header=NULL;
 		return;
+	}
 	if (ignor_text) return;
 	IF(istag("q"))
+	{
 		if (opened)	strcat(#line, " \"");
 		if (!opened) strcat(#line, "\" ");
+		}
 		else if (text_color_index > 0) text_color_index--;
 		return;
+	}
-	if (istag("div")) || (istag("header")) || (istag("article")) || (istag("footer")) {
+	if (istag("div")) {
+		if (streq(#oldtag,"div")) && (opened) return;
+		NewLine();
+		//IF (oldtag[0] != 'h')
+		return;
+	}
+	if (istag("header")) || (istag("article")) || (istag("footer")) || (istag("figure")) {
-		IF(oldtag[0] != 'h') NewLine();
+		NewLine();
 		return;
+	}
 	if (istag("p")) {
-		IF(oldtag[0] == 'h') return;
+		IF (oldtag[0] == 'h') || (streq(#oldtag,"td")) || (streq(#oldtag,"p")) return;
 		NewLine();
-		IF(opened) NewLine();
+		//IF(opened) NewLine();
 		return;
+	}
 	if (istag("br")) { NewLine(); return; }
 	if (istag("tr")) { if (opened) NewLine(); return; }
 	if (istag("b")) || (istag("strong")) || (istag("big")) { style.b = opened; return; }
 	if (istag("button")) { style.button = opened; stolbec++; return; }
 	if (istag("img")) {
 		do{
 			if (isattr("src=")) strcpy(#img_path, #val);
 			if (isattr("alt=")) sprintf(#line, "[%s]", #val);
-		} while(GetNextParam());
+			if (isattr("title=")) sprintf(#line, "[%s]", #val);
+		} while(GetNextParam());
-		style.image = true;
+		debugln(#val);
+		style.image = true;
 		text_color_index++;
 		text_colors[text_color_index] = 0x9A6F29;
 		if (!line) {
 			if (!strncmp(#img_path, "data:", 5)) img_path=0;
 			sprintf(#line, "[%s]", #img_path+strrchr(#img_path, '/'));
 		if (isattr("color=")) EDI = GetColor(#val); else EDI = 0x999999;
 		$push edi;
 		NewLine();
 		$pop edi;
-		DrawBuf.DrawBar(5, draw_y - 1, list.w-10, 1, EDI);
+		draw_y += 10;
+		DrawBuf.DrawBar(5, draw_y - 1, list.w-10, 1, EDI);
 		NewLine();
-		return;
+		draw_y += 10;
+		return;
+	}
 	if (istag("meta")) || (istag("?xml")) {
 		meta_encoding = CH_NULL;
 		do{
 			if (isattr("charset=")) || (isattr("content=")) || (isattr("encoding="))
 		if (meta_encoding!=CH_NULL) BufEncode(meta_encoding);
 		return;
+	}
+}
 //============================================================================================
-void TWebBrowser::BufEncode(dword set_new_encoding)
+void TWebBrowser::BufEncode(dword set_new_encoding)
+{
 	if (cur_encoding == set_new_encoding) return;
 	if (o_bufpointer==0)
+	{
 		o_bufpointer = malloc(bufsize);

Subversion Repositories Kolibri OS

(root)/programs/cmm/TWB/TWB.c – Rev 7743 → 7746