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

 struct _style {
 byte
-	b, i, u, s,
+	b, i, u, s, h,
 	pre,
 	blq,
 	li,
 	li_tab,
 	align;
 };
 struct TWebBrowser {
 	llist list;
-	_style style;
-	dword draw_line_width;
+	_style style;
 	DrawBufer DrawBuf;
 	void Prepare();
 	void SetStyle();
 	void DrawStyle();
 char line[500];
 char tagparam[10000];
 char tag[100];
-char attr[1200];
+char oldtag[100];
-char val[4096];
+char attr[1200];
+char val[4096];
-char anchor[256];
+char anchor[256]=0;
 #include "..\TWB\history.h"
 #include "..\TWB\links.h"
 #include "..\TWB\colors.h"
 #include "..\TWB\unicode_tags.h"
 #include "..\TWB\img_cache.h"
+	{
 		start_x = stolbec * list.font_w + body_magrin * DrawBuf.zoom + list.x;
 		start_y = stroka * list.line_h + body_magrin;
-		stolbec_len = utf8_strlen(#line);
+		stolbec_len = utf8_strlen(#line) * DrawBuf.zoom;
-		line_length = stolbec_len * list.font_w * DrawBuf.zoom;
+		line_length = stolbec_len * list.font_w;
+		if (style.h) stroka++;
 		WriteBufText(start_x, start_y, list.font_type, text_colors[text_color_index], #line, buf_data);
 		if (style.b) WriteBufText(start_x+1, start_y, list.font_type, text_colors[text_color_index], #line, buf_data);
 		if (style.i) { stolbec++; DrawBuf.Skew(start_x, start_y, line_length, list.line_h); } // bug with zoom>1
 		if (style.s) DrawBuf.DrawBar(start_x, list.line_h / 2 - DrawBuf.zoom + start_y, line_length, DrawBuf.zoom, text_colors[text_color_index]);
 		if (style.u) DrawBuf.DrawBar(start_x, list.line_h - DrawBuf.zoom - DrawBuf.zoom + start_y, line_length, DrawBuf.zoom, text_colors[text_color_index]);
 	dword bufpos = bufpointer;
 	int line_len;
-	style.b = style.i = style.u = style.s = style.blq = t_html = t_body =
+	style.b = style.i = 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.align = ALIGN_LEFT;
 	link_color_inactive = 0x0000FF;
 	link_color_active = 0xFF0000;
 	bg_color = 0xFFFFFF;
 	DrawBuf.Fill(bg_color);
 	stolbec = 0;
 	line = 0;
-	draw_line_width = list.w * DrawBuf.zoom;
+	//for plaint text use CP866 for other UTF
-	//for plaint text use CP866 for other UTF
 	if (strstri(bufpointer, "html"))
+	{
 		style.pre = 0;
 		cur_encoding = CH_CP866;
 		//WB1.list.SetFont(8, 14, 10111000b);
-		//list.line_h = list.font_h + 4;
-	}
 	else
+	{
 		style.pre = 1;
 		cur_encoding = CH_UTF8;
 		//WB1.list.SetFont(8, 14, 10001000b);
-		//list.line_h = list.font_h + 4;
-	}
 	for ( ; (bufpointer+bufsize > bufpos) && (ESBYTE[bufpos]!=0); bufpos++;)
+	{
 		bukva = ESBYTE[bufpos];
 			break;
 		case '<':
 			bufpos++;
-			tag = attr = tagparam = ignor_param = NULL;
+			if (!strncmp(bufpos,"!--",3))
 			if (ESBYTE[bufpos] == '!') //ôèëüòðàöèÿ âíóòðè , äåðçêî
-			{
-				bufpos++;
-				if (ESBYTE[bufpos] == '-')
-				{
-				HH_:
+				if (!strncmp(bufpos,"-->",3)) || (bufpointer + bufsize <= bufpos) break;
-					do
-					{
-						bufpos++;
-						if (bufpointer + bufsize <= bufpos) break 2;
+				bufpos++;
+			}
 			tag = attr = tagparam = ignor_param = NULL;
-					while (ESBYTE[bufpos] <>'-');
-					bufpos++;
-					if (ESBYTE[bufpos] <>'-') goto HH_;
-				}
-			}
-			while (ESBYTE[bufpos] !='>') && (bufpos < bufpointer + bufsize) //ïîëó÷àåì òåã è åãî ïàðàìåòðû
 			while (ESBYTE[bufpos] !='>') && (bufpos < bufpointer + bufsize) //ïîëó÷àåì òåã è åãî ïàðàìåòðû
+			{
 				bukva = ESBYTE[bufpos];
 				if (bukva == '\9') || (bukva == '\x0a') || (bukva == '\x0d') bukva = ' ';
 				if (!ignor_param) && (bukva <>' ')
+				{
 					if (strlen(#tag)
 			if (tag[strlen(#tag)-1]=='/') tag[strlen(#tag)-1]=NULL; //for br/
 			if (tagparam) GetNextParam();
-			if (stolbec + utf8_strlen(#line) > list.column_max) Perenos();
+			Perenos();
 			DrawStyle();
 			line = NULL;
 			if (tag) SetStyle(WB1.DrawBuf.zoom * 5 + list.x, stroka * list.line_h + list.y + 5); //îáðàáîòêà òåãîâ
+			strcpy(#oldtag, #tag);
 			tag = attr = tagparam = ignor_param = NULL;
 			break;
 		default:
 			DEFAULT_MARK:
 			if (bukva<=15) bukva=' ';
 				if (!stolbec) && (!line) break; //no paces at the beginning of the line
+			}
 			if (line_len < sizeof(line)) chrcat(#line, bukva);
-			if (stolbec + line_len > list.column_max) Perenos();
+			Perenos();
+		}
 	}
 	DrawStyle();
 	NewLine();
 	DrawPage();
 	if (list.first == 0) list.count = stroka;
 	if (anchor) //åñëè ïîñðåäè òåêñòà ïîÿâèòñÿ íîâûé ÿêîðü - áóäåò áåñêîíå÷íûé öèêë
+{
 	int perenos_num;
 	char new_line_text[4096];
-	perenos_num = strrchr(#line, ' ');
+	if (stolbec + utf8_strlen(#line) < list.column_max) return;
-	if (!perenos_num) && (utf8_strlen(#line)>list.column_max) perenos_num=list.column_max;
+	perenos_num = strrchr(#line, ' ');
+	if (!perenos_num) && (utf8_strlen(#line)>list.column_max) perenos_num=list.column_max;
 	strcpy(#new_line_text, #line + perenos_num);
 	line[perenos_num] = 0x00;
 	DrawStyle();
 	strcpy(#line, #new_line_text);
 	NewLine();
+}
 //============================================================================================
-char oldtag[100];
+void TWebBrowser::SetStyle(int left1, top1) {
-void TWebBrowser::SetStyle(int left1, top1) {
+	dword hr_color;
-	dword hr_color;
 	byte opened;
 	byte meta_encoding;
 	//ïðîâåðÿåì òåã îòêðûâàåòñÿ èëè çàêðûâàåòñÿ
 	if (tag[0] == '/')
+	{
 	if (istag("blockquote")) { style.blq = opened; return; }
 	if (istag("pre")) || (istag("code")) { style.pre = opened; return; }
 	if (istag("img")) { ImgCache.Images( left1, top1, WB1.list.w); return; }
-	/*
+	if (istag("h1")) || (istag("h2")) || (istag("h3")) || (istag("h4")) || (istag("caption")) {
-	if (istag("center"))
+		style.h = opened;
-	{
-		if (opened) style.align = ALIGN_CENTER;
-		if (!opened)
-		{
-			NewLine();
-			style.align = ALIGN_LEFT;
-		}
-		return;
-	}
-	if (istag("right"))
-	{
-		if (opened) style.align = ALIGN_RIGHT;
-		if (!opened)
-		{
-			NewLine();
-			style.align = ALIGN_LEFT;
-		}
-		return;
-	}
-	*/
-	if (istag("h1")) || (istag("h2")) || (istag("h3")) || (istag("h4")) || (istag("caption")) {
-		NewLine();
-		if (opened) && (stroka>1) NewLine();
+		NewLine();
+		if (opened)
 		strcpy(#oldtag, #tag);
-		if (opened)
-		{
-			if (isattr("align=")) && (isval("center")) style.align = ALIGN_CENTER;
+			WB1.DrawBuf.zoom=2;
-			if (isattr("align=")) && (isval("right")) style.align = ALIGN_RIGHT;
+			WB1.list.SetFont(8, 14, 10111001b);
+			if (isattr("align=")) && (isval("center")) style.align = ALIGN_CENTER;
+			if (isattr("align=")) && (isval("right")) style.align = ALIGN_RIGHT;
-			style.b = 1;
+			if (stroka>1) NewLine();
+		}
-		if (!opened)
+		else
+		{
-			style.align = ALIGN_LEFT;
+			WB1.DrawBuf.zoom=1;
-			style.b = 0;
+			WB1.list.SetFont(8, 14, 10111000b);
+			style.align = ALIGN_LEFT;
+		}
 		return;
-		return;
+	}
-	else
+	if (istag("dt")) {
-		oldtag=NULL;
+		style.li = opened;
-	if (istag("dt")) {
-		style.li = opened;
 		if (opened) NewLine();
 		return;
+	}
 	if (istag("li")) || (istag("dt")) //íàäî ñäåëàòü âëîæåííûå ñïèñêè
+	{

Subversion Repositories Kolibri OS

(root)/programs/cmm/TWB/TWB.c – Rev 5766 → 5768