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

 		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]);
 		if (link) {
-			DrawBuf.DrawBar(start_x, list.line_h - DrawBuf.zoom - DrawBuf.zoom + start_y, line_length, DrawBuf.zoom, text_colors[text_color_index]);
+			DrawBuf.DrawBar(start_x, list.line_h*style.h + list.line_h - DrawBuf.zoom - DrawBuf.zoom + start_y, line_length, DrawBuf.zoom, text_colors[text_color_index]);
-			PageLinks.AddText(#line, line_length, list.line_h, UNDERLINE);
+			PageLinks.AddText(#line, line_length, list.line_h*style.h + list.line_h, UNDERLINE);
 		}
 		stolbec += stolbec_len;
+	}
+}
 //============================================================================================
 void TWebBrowser::LoadInternalPage(dword bufpos, in_filesize){
 	bufsize = in_filesize;
 	word bukva[2];
 	int j;
 	byte ignor_param;
-	char temp[768];
+	dword bufpos;
-	dword bufpos = bufpointer;
+	int line_len;
-	int line_len;
+	style.b = style.i = style.u = style.s = style.h = 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.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);
 	stroka = -list.first;
 	stolbec = 0;
 	line = 0;
 	//for plaint text use CP866 for other UTF
-	//for plaint text use CP866 for other UTF
+	if (strstri(bufpointer, "html"))
-	if (strstri(bufpointer, "html"))
+	{
 		style.pre = 0;
-		cur_encoding = CH_CP866;
+		cur_encoding = CH_UTF8;
+	}
 	else
+	{
 		style.pre = 1;
-		cur_encoding = CH_UTF8;
+		cur_encoding = CH_CP866;
+	}
+	for (bufpos=bufpointer ; (bufpos < bufpointer+bufsize) && (ESBYTE[bufpos]!=0) ; bufpos++;)
 	for ( ; (bufpointer+bufsize > bufpos) && (ESBYTE[bufpos]!=0); bufpos++;)
-	{
-		bukva = ESBYTE[bufpos];
+		if (ignor_text) && (ESBYTE[bufpos]!='<') continue;
-		if (ignor_text) && (bukva!='<') continue;
+		bukva = ESBYTE[bufpos];
+		switch (bukva)
 		switch (bukva)
-		{
 		case 0x0a:
 			if (style.pre)
+			{
 				chrcat(#line, ' ');
-				bukva = temp = NULL;
+				Perenos();
-				Perenos();
+				break;
-				break;
+			}
 		case '\9':
 			if (style.pre) //èíà÷å èä¸ì íà 0x0d
+			{
 				tab_len = strlen(#line) % 4;
 				break;
+			}
 			goto DEFAULT_MARK;
 		case '&': //  and so on
-		case '&': //  and so on
+			bufpos++;
-			bufpos++;
 			tag=0;
 			for (j=0; (ESBYTE[bufpos]<>';') && (j<7);   j++, bufpos++;)
+			{
 				bukva = ESBYTE[bufpos];
 				chrcat(#tag, bukva);
 			Perenos();
 			DrawStyle();
 			line = NULL;
-			if (tag) SetStyle(WB1.DrawBuf.zoom * 5 + list.x, stroka * list.line_h + list.y + 5); //îáðàáîòêà òåãîâ
+			if (tag) SetStyle(); //îáðàáîòêà òåãîâ
 			strcpy(#oldtag, #tag);
 			tag = attr = tagparam = ignor_param = NULL;
 			break;
 		default:
 			DEFAULT_MARK:
 			if (bukva<=15) bukva=' ';
+{
 	int perenos_num;
 	char new_line_text[4096];
-	if (stolbec + utf8_strlen(#line) < list.column_max) return;
+	if (utf8_strlen(#line)*DrawBuf.zoom + stolbec < list.column_max) return;
 	perenos_num = strrchr(#line, ' ');
-	if (!perenos_num) && (utf8_strlen(#line)>list.column_max) perenos_num=list.column_max;
+	if (!perenos_num) && (utf8_strlen(#line)*DrawBuf.zoom>list.column_max) perenos_num=list.column_max/DrawBuf.zoom;
 	strcpy(#new_line_text, #line + perenos_num);
 	line[perenos_num] = 0x00;
 	DrawStyle();
 	strcpy(#line, #new_line_text);
 	NewLine();
+}
 //============================================================================================
-void TWebBrowser::SetStyle(int left1, top1) {
+void TWebBrowser::SetStyle() {
-	dword hr_color;
+	int left1 = 5 + list.x;
-	byte opened;
+	int top1 = stroka * list.line_h + list.y + 5;
-	byte meta_encoding;
+	byte opened;
+	byte meta_encoding;
 	//ïðîâåðÿåì òåã îòêðûâàåòñÿ èëè çàêðûâàåòñÿ
 	if (tag[0] == '/')
+	{
 		 opened = 0;
 		 strcpy(#tag, #tag+1);
+	}
 	else opened = 1;
 	if (istag("html")) {
-	if (istag("html")) {
+		t_html = opened;
-		t_html = opened;
 		return;
+	}
 	if (istag("script")) || (istag("style")) || (istag("binary")) || (istag("select")) { ignor_text = opened; return; }
 	if (istag("form")) if (!opened) ignor_text = false;
 	if(istag("title")) {
 		if (opened) NewLine();
 		return;
+	}
-	if (istag("li")) || (istag("dt")) //íàäî ñäåëàòü âëîæåííûå ñïèñêè
+	if (istag("li")) || (istag("dt"))
+	{
 		style.li = opened;
 		if (opened)
+		{
 			NewLine();
-			if (stroka > -1) && (stroka - 2 < list.visible)
+			DrawBuf.DrawBar(style.li_tab * 5 * list.font_w * DrawBuf.zoom + list.x, stroka +1 * list.line_h - 3
-				DrawBuf.DrawBar(style.li_tab * 5 * list.font_w * DrawBuf.zoom + list.x, list.line_h
+			 - DrawBuf.zoom - DrawBuf.zoom, DrawBuf.zoom*2, DrawBuf.zoom*2, 0x454545);
-					/ 2 - DrawBuf.zoom - DrawBuf.zoom, DrawBuf.zoom*2, DrawBuf.zoom*2, 0x555555);
 		}
 		return;
+	}
 	if (istag("ul")) || (istag("ol")) {
 		if (!opened)
+		{
 			style.li = opened;
 		else style.li_tab++;
+	}
 	if (istag("hr")) {
-		if (anchor) || (stroka < -1)
+		if (isattr("color=")) EDI = GetColor(#val); else EDI = 0x999999;
 		$push edi;
-			stroka+=2;
+		NewLine();
-			return;
-		}
+		$pop edi;
-		if (strcmp(#attr, "color=") == 0) hr_color = GetColor(#val); else hr_color = 0x999999;
-		NewLine();
-		DrawBuf.DrawBar(5, list.line_h/2, list.w-10, 1, hr_color);
-		NewLine();
+		DrawBuf.DrawBar(5, list.line_h*stroka+4, list.w-10, 1, EDI);
+		NewLine();
-	}
+		return;
 	if (istag("meta")) || (istag("?xml")) {
+	if (istag("meta")) || (istag("?xml")) {
 		do{
 			if (isattr("charset=")) || (isattr("content=")) || (isattr("encoding="))
+			{
 				strcpy(#val, #val[strrchr(#val, '=')]); //ïîèñê â content=
 				strlwr(#val);

Subversion Repositories Kolibri OS

(root)/programs/cmm/TWB/TWB.c – Rev 5772 → 5773