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

 #include "..\lib\draw_buf.h"
 #include "..\lib\list_box.h"
+#include "..\TWB\links.h"
 int	downloader_id;
 	void TextGoDown();
 };
 TWebBrowser WB1;
-byte rez, b_text, i_text, u_text, s_text, pre_text, blq_text, li_text, li_tab,
+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 { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT};
 enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT};
 dword text_colors[300];
-dword text_colors[300];
+dword text_color_index;
-dword text_color_index;
+dword link_color_inactive;
 #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\links.h"
 	b_text = i_text = u_text = s_text = blq_text =
 	li_text = link = ignor_text = text_color_index = text_colors[0] = li_tab =
 	condition_text_val = condition_text_active = 0; //îáíóëÿåì òåãè
 	condition_max = 255;
 	text_align = ALIGN_LEFT;
-	link_color = 0x0000FF;
+	link_color_inactive = 0x0000FF;
+	link_color_active = 0xFF0000;
 	bg_color = 0xFFFFFF;
 	DrawBuf.Fill(bg_color);
 	PageLinks.Clear();
 	strcpy(#header, #version);
 	stroka = -list.first;
 				DrawPage();
 				strcpy(#line, #temp);
 				TextGoDown(list.x + 5, stroka * 10 + list.y + 5, list.w - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
+			}
 			DrawPage();
-			line=NULL;
+			if (tag) WhatTextStyle(list.x + 5, stroka * 10 + list.y + 5, list.w - 20); //îáðàáîòêà òåãîâ
-			if (tag) WhatTextStyle(list.x + 5, stroka * 10 + list.y + 5, list.w - 20); //îáðàáîòêà òåãîâ
+			line=NULL;
 			tag = parametr = tagparam = ignor_param = NULL;
 			break;
 char oldtag[100];
+void TWebBrowser::WhatTextStyle(int left1, top1, width1) {
-void TWebBrowser::WhatTextStyle(int left1, top1, width1) {
+	dword hr_color;
-	dword hr_color;
+	byte opened;
 	//ïðîâåðÿåì òåã îòêðûâàåòñÿ èëè çàêðûâàåòñÿ
 	if (tag[0] == '/')
+	{
-		 rez = 0;
+		 opened = 0;
 		 strcpy(#tag, #tag+1);
+	}
-	else rez = 1;
+	else opened = 1;
 	if (isTag("html"))
 	{
-		IF(!strcmp(#URL + strlen(#URL) - 4, ".mht")) IF (rez==0) ignor_text = 1; ELSE ignor_text = 0;
+		IF(!strcmp(#URL + strlen(#URL) - 4, ".mht")) IF (opened==0) ignor_text = 1; ELSE ignor_text = 0;
 		return;
 	}
-	if (isTag("script")) || (isTag("style")) || (isTag("binary")) ignor_text = rez;
+	if (isTag("script")) || (isTag("style")) || (isTag("binary")) ignor_text = opened;
 	if(isTag("title"))
+	{
-	{
+		if (opened) header=NULL;
+		else if (!stroka) DrawTitle(#header); //òåã çàêðûëñÿ - âûâåëè ñòðîêó
-		if (rez) header=NULL;
+		return;
+	}
+	if (ignor_text) return;
+	IF(isTag("q"))
-		else if (!stroka) DrawTitle(#header); //òåã çàêðûëñÿ - âûâåëè ñòðîêó
+	{
+		if (opened)
+		{
+			TextGoDown(left1, top1, width1);
-		return;
+			strcat(#line, ' \"');
+		}
 		if (!opened)
 	if (ignor_text) return;
 			chrcat(#line, '\"');
 			TextGoDown(left1, top1, width1);
+		}
-	IF(isTag("q")) chrcat(#line, '\"');
+	}
+	if (anchor) && (!strcmp(#parametr, "id=")) //î÷åíü ïëîõî!!! ïîòîìó ÷òî åñëè íå ïîñëåäíèé òåã, ðàáîòàòü íå áóäåò
 	if (anchor) && (!strcmp(#parametr, "id=")) //î÷åíü ïëîõî!!! ïîòîìó ÷òî åñëè íå ïîñëåäíèé òåã, ðàáîòàòü íå áóäåò
 		if (!strcmp(#anchor, #options))	anchor_line_num=list.first+stroka;
 		if (!strcmp(#anchor, #options))	anchor_line_num=list.first+stroka;
 	if (isTag("body"))
 		return;
+	}
 	if (isTag("a"))
 	{
-		if (rez)
+		if (opened)
+		{
 			if (link) IF(text_color_index > 0) text_color_index--; //åñëè ïðåäûäóùèé òåã à íå áûë çàêðûò
 					text_color_index++;
 					text_colors[text_color_index] = text_colors[text_color_index-1];
 					link = 1;
 					blink++;
-					text_colors[text_color_index] = link_color;
+					text_colors[text_color_index] = link_color_inactive;
-					PageLinks.Add(#options);
+					PageLinks.AddLink(#options, stolbec*6+left1, top1);
+				}
 				if (anchor) && (!strcmp(#parametr, "name="))
+				{
 					if (!strcmp(#anchor, #options))
+				}
 			} while(GetNextParam());
+		}
 		else {
 			link = 0;
+			PageLinks.AddText(#line, strlen(#line)*6, list.line_h);
 			IF(text_color_index > 0) text_color_index--;
+		}
 		return;
+	}
 	if (isTag("font"))
 	{
-		if (rez)
+		if (opened)
+		{
 			text_color_index++;
 			text_colors[text_color_index] = text_colors[text_color_index-1];
 		return;
+	}
 	if (isTag("p")) {
 		IF(oldtag[0] == 'h') return;
 		TextGoDown(left1, top1, width1);
-		IF(rez) TextGoDown(left1, top1 + 10, width1);
+		IF(opened) TextGoDown(left1, top1 + 10, width1);
 		return;
+	}
 	/*
 	if (isTag("center"))
+	{
-		if (rez) text_align = ALIGN_CENTER;
+		if (opened) text_align = ALIGN_CENTER;
-		if (!rez)
+		if (!opened)
+		{
 			TextGoDown(left1, top1, width1);
 			text_align = ALIGN_LEFT;
+		}
 		return;
+	}
 	if (isTag("right"))
+	{
-		if (rez) text_align = ALIGN_RIGHT;
+		if (opened) text_align = ALIGN_RIGHT;
-		if (!rez)
+		if (!opened)
+		{
 			TextGoDown(left1, top1, width1);
 			text_align = ALIGN_LEFT;
+		}
 		return;
+	}
 	*/
 	if (isTag("h1")) || (isTag("h2")) || (isTag("h3")) || (isTag("h4")) {
 		TextGoDown(left1, top1, width1);
-		if (rez) && (stroka>1) TextGoDown(left1, top1 + 10, width1);
+		if (opened) && (stroka>1) TextGoDown(left1, top1 + 10, width1);
 		strcpy(#oldtag, #tag);
-		if (rez)
+		if (opened)
+		{
 			if (!strcmp(#parametr, "align=")) && (!strcmp(#options,"center")) text_align = ALIGN_CENTER;
 			if (!strcmp(#parametr, "align=")) && (!strcmp(#options,"right")) text_align = ALIGN_RIGHT;
 			b_text = 1;
+		}
-		if (!rez)
+		if (!opened)
+		{
 			text_align = ALIGN_LEFT;
 			b_text = 0;
+		}
 		return;
+	}
 	else
 		oldtag=NULL;
 	if (isTag("b")) || (isTag("strong")) || (isTag("big")) {
-		b_text = rez;
+		b_text = opened;
 		return;
+	}
 	if(isTag("i")) || (isTag("em")) || (isTag("subtitle")) {
-		i_text = rez;
+		i_text = opened;
 		return;
+	}
 	if (isTag("dt"))
 	{
-		li_text = rez;
+		li_text = opened;
-		IF(rez == 0) return;
+		IF(opened == 0) return;
 		TextGoDown(left1, top1, width1);
 		return;
+	}
 	if (isTag("condition"))
 	{
-		condition_text_active = rez;
+		condition_text_active = opened;
-		if (rez) && (!strcmp(#parametr, "show_if=")) condition_text_val = atoi(#options);
+		if (opened) && (!strcmp(#parametr, "show_if=")) condition_text_val = atoi(#options);
 		return;
+	}
 	if (isTag("li")) || (isTag("dt")) //íàäî ñäåëàòü âëîæåííûå ñïèñêè
 	{
-		li_text = rez;
+		li_text = opened;
-		if (rez)
+		if (opened)
+		{
 			TextGoDown(left1, top1, width1);
 			if (stroka > -1) && (stroka - 2 < list.visible) DrawBuf.DrawBar(li_tab * 5 * 6 + left1 - 5, list.line_h/2-3, 2, 2, 0x555555);
+		}
 		return;
 	}
-	if (isTag("u")) || (isTag("ins")) u_text = rez;
+	if (isTag("u")) || (isTag("ins")) u_text = opened;
-	if (isTag("s")) || (isTag("strike")) || (isTag("del")) s_text = rez;
+	if (isTag("s")) || (isTag("strike")) || (isTag("del")) s_text = opened;
-	if (isTag("ul")) || (isTag("ol")) IF(!rez)
+	if (isTag("ul")) || (isTag("ol")) IF(!opened)
 	{
-		li_text = rez;
+		li_text = opened;
 		li_tab--;
 		TextGoDown(left1, top1, width1);
 	} ELSE li_tab++;
 	if (isTag("dd")) stolbec += 5;
-	if (isTag("blockquote")) blq_text = rez;
+	if (isTag("blockquote")) blq_text = opened;
-	if (isTag("pre")) pre_text = rez;
+	if (isTag("pre")) pre_text = opened;
 	if (isTag("hr"))
+	{
 		if (anchor) || (stroka < -1)
+		{
 		DrawBuf.DrawBar(5, list.line_h/2, list.w-10, 1, hr_color);
 		TextGoDown(left1, top1+list.line_h, width1);
+	}
 	if (isTag("img"))
+	{
-		ImgCache1.Images( left1, top1, width1);
+		ImgCache.Images( left1, top1, width1);
 		return;
+	}
 	if (isTag("meta")) || (isTag("?xml"))
+	{
 		do{
 		} while(GetNextParam());
 		return;
+	}
+}
+/*
+char *encodings = {
+	"utf-8",  _UTF,
+	"utf8",   _UTF,
+	"koi8-r", _KOI,
+	"koi8-u", _KOI,
+	"dos",    _DOS,
+	"cp-866", _DOS
+};
 */
 void TWebBrowser::DrawScroller() //íå îïòèìàëüíàÿ îòðèñîâêà, íî çàòî â îäíîì ìåñòå
+{

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/TWB/TWB.c @ 8439 – Rev 4488 → 4491