WebSVN – Kolibri OS – Diff – /programs/network/htmlv/browser/TWB.h--

 	void WhatTextStyle(int left1, top1, width1);
 };
+TWebBrowser WB1;
+byte rez, b_text, i_text, u_text, s_text, w_title, pre_text, blq_text, li_text, link, ignor_text, li_tab;
+dword text_colors[10],
+	text_color_index = 0,
+	link_color;
+int stroka,
+	stolbec,
+	tab_len;
+char line[330],
+	tag[100],
+	tagparam[10000],
+	parametr[1200],
+	options[1000];
 TWebBrowser WB1;
 #include "include\history.h--"
 #include "include\colors.h--"
 		Load(#URL);
 		Draw_Window();
 		return;
+	}
 	//edit1.flags=64;
-	IF(kolichestvo < max_kolvo_strok) SWITCH(id) {
+	IF(count < max_kolvo_strok) SWITCH(id) {
 		CASE 183: CASE 184: CASE 180: CASE 181: return;
 	} //åñëè ìàëî ñòðîê èãíîðèðóåì íåêîòîðûå êíîïêè
 	switch (id) {
 	case 011:
 		ReadHtml();
 	case ID1: //ìîòàåì ââåðõ
 		IF(za_kadrom > 0) za_kadrom--;
 		ELSE return;
 		break;
 	case ID2: //ìîòàåì âíèç
-		IF(max_kolvo_strok + za_kadrom >= kolichestvo) return;
+		IF(max_kolvo_strok + za_kadrom >= count) return;
 		za_kadrom++;
 		break;
 	case 183: //PgDown
-		IF(za_kadrom == kolichestvo - max_kolvo_strok) return;
+		IF(za_kadrom == count - max_kolvo_strok) return;
 		za_kadrom = za_kadrom + max_kolvo_strok + 2;
-		IF(max_kolvo_strok + za_kadrom > kolichestvo) za_kadrom = kolichestvo - max_kolvo_strok;
+		IF(max_kolvo_strok + za_kadrom > count) za_kadrom = count - max_kolvo_strok;
 		BREAK;
 	case 184: //PgUp
 		IF(za_kadrom == 0) RETURN;
     za_kadrom = za_kadrom - max_kolvo_strok - 2;
 		IF(za_kadrom < 0) za_kadrom = 0;
 	case 180: //home
 		IF (za_kadrom <>0) za_kadrom = 0;
 		ELSE RETURN;
 		BREAK;
 	case 181: //end
-		za_kadrom = kolichestvo - max_kolvo_strok;
+		za_kadrom = count - max_kolvo_strok;
 		BREAK;
 	default:
 		RETURN;
+	}
 	IF(id == 11) koitodos(buf);
 	dword on_y;
 	DrawBar(left + width - 15, top + 17, 1, height - 34, 0x94AECE); //ëèíèÿ ñëåâà îò ïðîêðóòêè
 	DrawFlatButton(left + width - 15, top + height - 17, 16, 16, ID2, 0xE4DFE1, "\x19");
 	DrawFlatButton(left + width - 15, top, 16, 16, ID1, 0xE4DFE1, "\x18");
-	IF(kolichestvo <= max_kolvo_strok) {
+	IF(count <= max_kolvo_strok) {
 		DrawBar(left + width - 14, top + 17, 16, height - 34, 0xCED0D0);
 		return;
 	}
-	razm_scrl = height - 16 * max_kolvo_strok / kolichestvo - 3;
+	scroll_size = height - 16 * max_kolvo_strok / count - 3;
-	IF(razm_scrl < 10) razm_scrl = 10;
+	IF(scroll_size < 10) scroll_size = 10;
-	IF(za_kadrom + max_kolvo_strok >= kolichestvo) on_y = height - razm_scrl + top - 17;
+	IF(za_kadrom + max_kolvo_strok >= count) on_y = height - scroll_size + top - 17;
-	ELSE on_y = height - 32 * za_kadrom / kolichestvo + top + 16;
+	ELSE on_y = height - 32 * za_kadrom / count + top + 16;
-	DrawFlatButton(left + width - 15, on_y, 16, razm_scrl, 0, 0xE4DFE1, ""); //ïîëçóíîê
+	DrawFlatButton(left + width - 15, on_y, 16, scroll_size, 0, 0xE4DFE1, ""); //ïîëçóíîê
   IF(on_y > top + 17) DrawBar(left + width - 14, top + 17, 16, on_y - top - 17, 0xCED0D0); //ïîëå äî ïîëçóíêà
-	IF(height - razm_scrl + top - 17 > on_y)
+	IF(height - scroll_size + top - 17 > on_y)
-		DrawBar(left + width - 14, on_y + razm_scrl + 1, 16, height - razm_scrl - on_y + top - 18, 0xCED0D0); //ïîëå ïîñëå ïîëçóíêà
+		DrawBar(left + width - 14, on_y + scroll_size + 1, 16, height - scroll_size - on_y + top - 18, 0xCED0D0); //ïîëå ïîñëå ïîëçóíêà
+}
 	&& (strcmp(get_URL_part(3),"/bd")<>0) && (strcmp(get_URL_part(3),"/fd")<>0) && (strcmp(get_URL_part(3),"/cd")<>0)
 	&& (strcmp(get_URL_part(5),"http:")<>0)	&& (strcmp(get_URL_part(5),"mailt")<>0)	&& (strcmp(get_URL_part(5),"ftp:/")<>0)
+	{
 		copystr(BrowserHistory.CurrentUrl(), #editURL); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
-		IF (editURL[find_symbol(#editURL, '/')-2]<>'/')  // åñëè íå http://test.ua
+		IF (editURL[find_symbol(#editURL, '/')-2]<>'/')  // åñëè íå http://pagename.ua
+		{
 			editURL[find_symbol(#editURL, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
 			IF (URL[0]=='/') copystr(#URL+1,#URL);
+		}
+		}
 		file_size stdcall (#download_path);
+	}
 	ELSE file_size stdcall (#URL);
 	filesize = EBX;
 	IF (!filesize) return; //Lee 22.09
 	mem_Free(buf);
 	buf = mem_Alloc(filesize);
 	IF (!strcmp(#version, #header)) DrawTitle(#header);
+}
-byte rez, b_text, i_text, u_text, s_text, w_title, pre_text, blq_text, li_text, link, ignor_text, li_tab;
-dword text_colors[10],
-	text_color_index = 0,
-	link_color;
-int stroka,
-	stolbec,
-	tab_len;
-	byte line[330],
-	tag[100],
-	tagparam[10000],
-	parametr[1200],
-	options[1000];
 	byte ignor_param = 0;
 void TWebBrowser::ParseHTML(dword bword, fsize){
-void TWebBrowser::ParseHTML(dword bword, fsize){
+	word bukva[1];
-	word bukva[1];
+	byte ignor_param = 0;
 	char temp[768];
 	stroka = -za_kadrom;
+	}
 	IF(max_kolvo_strok * 10 + 25 <= height)
 		DrawBar(left, max_kolvo_strok * 10 + top + 25, width - 15, -max_kolvo_strok * 10 + height - 25, 0xFFFFFF);
 	IF(stroka * 10 + 15 <= height)
 		DrawBar(left, stroka * 10 + top + 15, width - 15, -stroka * 10 + height - 15, 0xFFFFFF); //çàêðàøèâàåì âñ¸ äî êîíöà
-	IF(za_kadrom == 0) kolichestvo = stroka;
+	IF(za_kadrom == 0) count = stroka;
 	DrawScroller(); //ðèñóåì ñêðîëë
+}
     dword image=0;
     char temp[4096];
+    int w, h, img_za_kadrom=0;
-    int w, h, img_za_kadrom=0;
+	//ïðîâåðÿåì òåã îòêðûâàåòñÿ èëè çàêðûâàåòñÿ
 	IF(tag[0] == '/')
 	IF(tag[0] == '/') {
+		rez = 0;
+		copystr(#tag + 1, #tag);
-		rez = 0;
+	}
+	ELSE
-		copystr(#tag + 1, #tag);
+		rez = 1;
 	} ELSE rez = 1;
 	//
 	IF(!chTag("html")) {
 		IF(!strcmp(#URL + strlen(#URL) - 4, ".mht")) IF (rez==0) ignor_text = 1; ELSE ignor_text = 0;
 		return;
+	}
 	IF(!chTag("script")) || (!chTag("style")) ignor_text = rez;
 	IF (ignor_text == 1) return;
+	//
 	//
 	if(!chTag("title")) IF(w_title == 0)
 	if(!chTag("title")) IF(w_title == 0) {
 		copystr(" ", #line);
 		w_title = 1;
 		copystr(#version, #header + strlen(#header));
 		IF(stroka == 0) || (WindowRePaint == 1) DrawTitle(#header);
 		//äà, çíàþ, 2 ðàçà âûõîäèò, íî, åñëè áîëüøàÿ ñòðàíèöà, òî òðóú
 		return;
+	}
 	//
 	IF(!chTag("q")) copystr("\"", #line + strlen(#line));
+	//âûâîä íà ýêðàí
-	if (stroka > -1) && (stroka - 2 < max_kolvo_strok) && (line) {
+	if (stroka >= 0) && (stroka - 2 < max_kolvo_strok) && (line)
+	{
 		WriteText(stolbec * 6 + left1, top1, 0x80, text_colors[text_color_index], #line, 0);
-		IF(b_text) WriteText(stolbec * 6 + left1 + 1, top1, 0x80, text_colors[text_color_index], #line, 0);
+		IF (b_text) WriteText(stolbec * 6 + left1 + 1, top1, 0x80, text_colors[text_color_index], #line, 0);
-		IF(i_text) Skew(stolbec * 6 + left1, top1, strlen(#line)+1*6, 10);
+		IF (i_text) Skew(stolbec * 6 + left1, top1, strlen(#line)+1*6, 10); //íàêëîííûé òåêñò
-		IF(s_text) DrawBar(stolbec * 6 + left1, top1 + 4, strlen(#line) * 6, 1, text_colors[text_color_index]); //çà÷¸ðêíóòûé
+		IF (s_text) DrawBar(stolbec * 6 + left1, top1 + 4, strlen(#line) * 6, 1, text_colors[text_color_index]); //çà÷¸ðêíóòûé
-		IF(u_text) DrawBar(stolbec * 6 + left1, top1 + 8, strlen(#line) * 6, 1, text_colors[text_color_index]); //ïîä÷¸ðêíóòûé
+		IF (u_text) DrawBar(stolbec * 6 + left1, top1 + 8, strlen(#line) * 6, 1, text_colors[text_color_index]); //ïîä÷¸ðêíóòûé
-		IF(link) {
+		IF (link) {
 			DefineButton(stolbec * 6 + left1 - 2, top1, strlen(#line) * 6 + 3, 9, blink + BT_HIDE, 0xB5BFC9); //
 			DrawBar(stolbec * 6 + left1, top1 + 8, strlen(#line) * 6, 1, text_colors[text_color_index]);
+		}
+	}
 	//
 	IF(!tag) return;
 	stolbec += strlen(#line);
+	//////////////////////////
+	if (!chTag("body"))
+	{
+		BODY_MARK:
+		if (strcmp(#parametr, "link=") == 0)
+			link_color = GetColor(#options);
+		/*if (strcmp(#parametr, "text=") == 0)
+		{
+			text_colors[0]=GetColor(#options);
+		}
+		if (strcmp(#parametr, "bgcolor=") == 0)
+		{
+			//text_colors[0]=GetColor(#options);
+			WriteDebug("bgcolor=");
+			WriteDebug(#options);
+		}*/
+		IF(tagparam) {
+			GetNextParam();
+			GOTO BODY_MARK;
+		}
+	}
 	//////////////////////////
 	if (!chTag("a")) {
 		IF (stroka - 1 > max_kolvo_strok) || (stroka < -2) return;
 		if (rez) {
 			HREF: IF(strcmp(#parametr, "href=") == 0) {
 		IF(stroka < 0) || (stroka - 1 > max_kolvo_strok) return;
 		COL_MARK:
 		if (strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
+		{
 			text_color_index++;
-			IF (options[0] == '#')
-			{
-				text_colors[text_color_index] = StrToCol(#options);
+			text_colors[text_color_index] = GetColor(#options);
-			}
-			ELSE
-			{
-				FOR (i=0; color_names[i]!=0; i++)
-				{
-					IF(!strcmp(#options, color_names[i]))
-					{
-						text_colors[text_color_index] = colors[i];
-						BREAK;
-					}
-					text_colors[text_color_index] = text_colors[0];
+		}
-			}
-		}
-		IF(tagparam[0] <>'') {
+		IF(tagparam) {
 			GetNextParam();
 			GOTO COL_MARK;
+		}
 		IF(!rez) && (text_color_index > 0) text_color_index--;
 		return;
 		li_tab--;
 		TextGoDown(left1, top1, width1);
 	} ELSE li_tab++;
 	IF(!chTag("dd")) stolbec += 5;
 	IF(!chTag("blockquote")) blq_text = rez;
-	IF(!chTag("body")) IF(strcmp(#parametr, "link=") == 0) link_color = StrToCol(#options);
 	IF(!chTag("pre")) pre_text = rez;
 	IF(!chTag("hr")) {
 		TextGoDown(left1, top1, width1);
 		TextGoDown(left1, top1 + 10, width1);
-		IF(strcmp(#parametr, "color=") == 0) hr_color = StrToCol(#options);
+		IF(strcmp(#parametr, "color=") == 0) hr_color = GetColor(#options);
 		ELSE hr_color = 0x999999;
 		IF(stroka > 0) DrawBar(left1, top1 + 14, width1 - 8, 1, hr_color);
+	}
 			IF(!strcmp(#options, "dos")) || (!strcmp(#options, "cp-866"))
+			{
 				ReadHtml(DONT_LOAD);
+			}
+		}
-		IF(tagparam[0] <>'')
+		IF(tagparam)
+		{
 			GetNextParam();
 			goto META;
+		}
 		return;

Subversion Repositories Kolibri OS

(root)/programs/network/htmlv/browser/TWB.h-- @ 2238 – Rev 2228 → 2238