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

- int i;
+int i;
 char download_path[]="/rd/1/.download";
 char search_path[]="http://nigma.ru/index.php?s=";
-char version[]=" Text-based Browser 0.94";
+char version[]=" Text-based Browser 0.94b";
+struct TWebBrowser {
+	int left, top, width, height;
-struct TWebBrowser {
+	void Scan(int);
-	int left, top, width, height;
+	void OpenPage();
-	void DrawScroller();
+	void ReadHtml(byte);
-	void ShowPage();
-	void ParseHTML(dword, dword);
+	void ShowPage();
+	void ParseHTML(dword, dword);
-	void Scan(int);
+	void WhatTextStyle(int left1, top1, width1);
-	void WhatTextStyle(int left1, top1, width1);
+	void DrawScroller();
 };
 			strcpy(#anchor, #URL+find_symbol(#URL, '#'));
 			strcpy(#URL, BrowserHistory.CurrentUrl());
-			lines_first=lines_all-lines_visible;
+			lines.first=lines.all-lines.visible;
-			ShowPage(#URL);
+			ShowPage();
 			return;
+		}
 		//liner.ru#1
 		if (find_symbol(#URL, '#')<>-1)
 		OpenPage();
 		return;
+	}
-	IF(lines_all < lines_visible) SWITCH(id) //åñëè ìàëî ñòðîê èãíîðèðóåì íåêîòîðûå êíîïêè
+	IF(lines.all < lines.visible) SWITCH(id) //åñëè ìàëî ñòðîê èãíîðèðóåì íåêîòîðûå êíîïêè
 	{ CASE 183: CASE 184: CASE 180: CASE 181: return; }
 	switch (id)
 	{
-		case 011: //Ctrk+K
-			ReadHtml();
+		case 011: //Ctrk+K
-			koitodos(buf);
+			ReadHtml(_KOI);
 			break;
-		case 021: //Ctrl+U
-			ReadHtml();
+		case 021: //Ctrl+U
-			utf8rutodos(buf);
+			ReadHtml(_UTF);
 			break;
 		case BACK:
 			if (!BrowserHistory.GoBack()) return;
 				Pause(20);
 				Draw_Window();
 				return;
+			}
-			anchor_line_num=lines_first; //âåñ¸ëûé êîñòûëü :Ð
+			anchor_line_num=lines.first; //âåñ¸ëûé êîñòûëü :Ð
 			anchor[0]='|';
 			OpenPage();
 			return;
 		case 014: //Ctrl+N íîâîå îêíî
 		case 020: //Ctrl+T íîâàÿ âêëàäêà
 		case NEWTAB:
 			OpenPage();
 			return;
 		case ID1: //ìîòàåì ââåðõ
-			IF(lines_first <= 0) return;
+			IF(lines.first <= 0) return;
-			lines_first--;
+			lines.first--;
 			break;
 		case ID2: //ìîòàåì âíèç
-			IF(lines_visible + lines_first >= lines_all) return;
+			IF(lines.visible + lines.first >= lines.all) return;
-			lines_first++;
+			lines.first++;
 			break;
 		case 183: //PgDown
-			IF(lines_first == lines_all - lines_visible) return;
+			IF(lines.first == lines.all - lines.visible) return;
-			lines_first += lines_visible + 2;
+			lines.first += lines.visible + 2;
-			IF(lines_visible + lines_first > lines_all) lines_first = lines_all - lines_visible;
+			IF(lines.visible + lines.first > lines.all) lines.first = lines.all - lines.visible;
 			BREAK;
 		case 184: //PgUp
-			IF(lines_first == 0) RETURN;
+			IF(lines.first == 0) RETURN;
-			lines_first -= lines_visible - 2;
+			lines.first -= lines.visible - 2;
-			IF(lines_first < 0) lines_first = 0;
+			IF(lines.first < 0) lines.first = 0;
 			BREAK;
 		case 180: //home
-			IF(lines_first == 0) RETURN;
+			IF(lines.first == 0) RETURN;
-			lines_first = 0;
+			lines.first = 0;
 			BREAK;
 		case 181: //end
-			IF (lines_first == lines_all - lines_visible) RETURN;
+			IF (lines.first == lines.all - lines.visible) RETURN;
-			lines_first = lines_all - lines_visible;
+			lines.first = lines.all - lines.visible;
 			BREAK;
 		default:
 			RETURN;
+	}
 	ParseHTML(buf, filesize);
+}
-void ReadHtml()
+void TWebBrowser::ReadHtml(byte dest)
+{
 	if (!strcmp(get_URL_part(5),"http:")))
 		file_size stdcall (#download_path);
 	if (!strcmp(get_URL_part(5),"http:")))
 		ReadFile(0, filesize, buf, #download_path);
 	else
 		ReadFile(0, filesize, buf, #URL);
+	if (dest==_WIN) wintodos(buf);
+	if (dest==_UTF) utf8rutodos(buf);
+	if (dest==_KOI) koitodos(buf);
+}
-void OpenPage()
+void TWebBrowser::OpenPage()
+{
 	if (GetProcessSlot(downloader_id)<>0) PutPaletteImage(#toolbar,200,42,0,0,8,#toolbar_pal);
 	KillProcess(downloader_id);
 	strcpy(#editURL, #URL);
 		IF (downloader_id<0) RunProgram("@notify", "Error running Downloader. Internet unavilable.");
 		Draw_Window();
 		return;
+	}
-	lines_first = lines_all = 0;
+	lines.first = lines.all = 0;
-	ReadHtml();
+	ReadHtml(_WIN);
-	if (filesize) wintodos(buf);
+	WB1.ShowPage();
-	WB1.ShowPage(#URL);
 }
-void TWebBrowser::ShowPage(dword adress)
+void TWebBrowser::ShowPage()
+{
 	edit1.size = edit1.pos = strlen(#editURL);
 	edit_box_draw stdcall(#edit1); //ðèñóåì ñòðîêó àäðåñà
 	int j;
 	byte ignor_param = 0;
 	char temp[768];
-	stroka = -lines_first;
+	stroka = -lines.first;
 	stolbec = 0;
 	for (j = 400; j < blink + 1; j++;) DeleteButton(j);
 			DEFAULT_MARK:
 			IF(ignor_text) break;
 			IF(!pre_text) && (bukva == ' ') && (!strcmp(#line + strlen(#line) - 1, " ")) continue;
 			//
-			if (stolbec + strlen(#line) >lines_column_max)
+			if (stolbec + strlen(#line) >lines.column_max)
 			{
 				strcpy(#temp, #line + find_symbol(#line, ' ')); //ïåðåíîñ ïî ñëîâàì
 				line[find_symbol(#line, ' ')] = 0x00;
 			NEXT_MARK:
-				IF(stroka - 1 > lines_visible) && (lines_first <>0) break 1; //óõîäèì...
+				IF(stroka - 1 > lines.visible) && (lines.first <>0) break 1; //óõîäèì...
 				WhatTextStyle(left + 5, stroka * 10 + top + 5, width - 20); //âûâîä ñòðîêè
 				TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
 				strcpy(#line, #temp);
+			}
 			if (!pre_text) && (bukva == ' ') && (!stolbec) && (!line) CONTINUE;
 			strcat(#line, #bukva);
+	}
 	if (strcmp(#URL + strlen(#URL) - 4, ".txt")<>0) && (!body_present)
 		DrawBar(left, top, width-15, 15, bg_color); //çàêðàøèâàåì ïåðâóþ ñòðîêó åñëè êàêîé-òî ðàõèò íå ñîçäàë òåã áîäè
-	if (lines_visible * 10 + 25 <= height)
+	if (lines.visible * 10 + 25 <= height)
-		DrawBar(left, lines_visible * 10 + top + 25, width - 15, -lines_visible * 10 + height - 25, bg_color);
+		DrawBar(left, lines.visible * 10 + top + 25, width - 15, -lines.visible * 10 + height - 25, bg_color);
 	if (stroka * 10 + 15 <= height)
 		DrawBar(left, stroka * 10 + top + 15, width - 15, -stroka * 10 + height - 15, bg_color); //çàêðàøèâàåì âñ¸ äî êîíöà
-	if (lines_first == 0) lines_all = stroka;
+	if (lines.first == 0) lines.all = stroka;
 	if (anchor)
+	{
 		anchor='';
-		lines_first=anchor_line_num;
+		lines.first=anchor_line_num;
 		ParseHTML(buf, filesize);
+	}
 	//
 	IF(!chTag("q")) strcat(#line, "\"");
 	//âûâîä íà ýêðàí
-	if (stroka >= 0) && (stroka - 2 < lines_visible) && (line) && (!anchor)
+	if (stroka >= 0) && (stroka - 2 < lines.visible) && (line) && (!anchor)
+	{
 		WriteText(stolbec * 6 + left1, top1, 0x80, text_colors[text_color_index], #line, 0); //ìîæåò òóò ðèñîâàòü áåëóþ ñòðîêó?
 		IF (b_text)	{ $add ebx, 1<<16   $int 0x40 }
 		IF (i_text) Skew(stolbec * 6 + left1, top1, strlen(#line)+1*6, 10); //íàêëîííûé òåêñò
 	if (anchor) && (!strcmp(#parametr, "id=")) //î÷åíü ïëîõî!!! ïîòîìó ÷òî åñëè íå ïîñëåäíèé òåã, ðàáîòàòü íå áóäåò
+	{
 		if (!strcmp(#anchor, #options))
+		{
-			anchor_line_num=lines_first+stroka;
+			anchor_line_num=lines.first+stroka;
+		}
+	}
 	if (!chTag("body"))
+		{
 			_A_MARK:
 			if (!strcmp(#parametr, "href="))
+			{
-				if (stroka - 1 > lines_visible) || (stroka < -2) return;
+				if (stroka - 1 > lines.visible) || (stroka < -2) return;
 				if (link == 1) text_color_index--; //åñëè êàêîé-òî äîëáî¸á íå çàêðûë òýã
 				link = 1;
 				blink++;
 				text_color_index++;
 				text_colors[text_color_index] = link_color;
 				strcat(#page_links, #options);
 			if (anchor) && (!strcmp(#parametr, "name="))
+			{
 				if (!strcmp(#anchor, #options))
+				{
-					anchor_line_num=lines_first+stroka;
+					anchor_line_num=lines.first+stroka;
 				}
+			}
 			if (tagparam)
+			{
 				GetNextParam();
 				GOTO _A_MARK;
+	}
 	/////////////////////////
 	if (!chTag("font"))
+	{
-		IF (stroka - 1 > lines_visible) return;
+		IF (stroka - 1 > lines.visible) return;
 		COL_MARK:
 		if (strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
+		{
 			text_color_index++;
 			text_colors[text_color_index] = GetColor(#options);
+		}
+	{
 		li_text = rez;
 		IF(rez == 0) return;
 		TextGoDown(left1, top1, width1);
-		IF(stroka > -1) && (stroka - 2 < lines_visible) DrawBar(li_tab * 5 * 6 + left1 - 5, top1 + 12, 2, 2, 0);
+		IF(stroka > -1) && (stroka - 2 < lines.visible) DrawBar(li_tab * 5 * 6 + left1 - 5, top1 + 12, 2, 2, 0);
 		return;
+	}
 	////////////////////////////
 	IF(!chTag("u")) || (!chTag("ins")) u_text = rez;
 	IF(!chTag("s")) || (!chTag("strike")) || (!chTag("del")) s_text = rez;
 	IF(!chTag("ul")) || (!chTag("ol")) IF(!rez) {
 				h=h-img_lines_first;
 				top1=WB1.top;
+			}
-			if (top1>WB1.top+WB1.height-h-15) //åñëè ÷àñòü èçîáðàæåíèÿ ñíèçó     IF (stroka - 2 < lines_visible)
+			if (top1>WB1.top+WB1.height-h-15) //åñëè ÷àñòü èçîáðàæåíèÿ ñíèçó     IF (stroka - 2 < lines.visible)
+			{
 				h=WB1.top+WB1.height-top1-15;
+			}
 		if (!strcmp(#parametr, "charset=")) || (!strcmp(#parametr, "content=")) || (!strcmp(#parametr, "encoding="))
+		{
 			strcpy(#options, #options[find_symbol(#options, '=')]); //ïîèñê â content=
-			IF (!strcmp(#options,"utf-8")) || (!strcmp(#options,"utf8"))
+			if (!strcmp(#options,"utf-8")) || (!strcmp(#options,"utf8"))		ReadHtml(_UTF);
-			{
-				ReadHtml();
-				utf8rutodos(buf);
-			}
-			IF(!strcmp(#options, "koi8-r")) || (!strcmp(#options, "koi8-u"))
+			if (!strcmp(#options, "koi8-r")) || (!strcmp(#options, "koi8-u"))	ReadHtml(_KOI);
-			{
-				ReadHtml();
-				koitodos(buf);
-			}
-			IF(!strcmp(#options, "dos")) || (!strcmp(#options, "cp-866"))
+			if (!strcmp(#options, "dos")) || (!strcmp(#options, "cp-866"))		ReadHtml(_DOS);
-			{
-				ReadHtml();
-			}
+		}
 		if (tagparam)
+		{
 			GetNextParam();
 			goto META;
 	stroka++;
 	IF(blq_text == 1) stolbec = 8;
 	ELSE stolbec = 0;
 	IF(li_text == 1) stolbec = li_tab * 5;
-	IF(stroka >= 0) && (stroka - 2 < lines_visible)  && (!anchor) DrawBar(left1 - 5, top1 + 10, width1 + 5, 10, bg_color);
+	IF(stroka >= 0) && (stroka - 2 < lines.visible)  && (!anchor) DrawBar(left1 - 5, top1 + 10, width1 + 5, 10, bg_color);
 }
 //ñêðîëë
 void TWebBrowser::DrawScroller() //íå îïòèìàëüíàÿ îòðèñîâêà, íî çàòî â îäíîì ìåñòå
 {
-	scroll1.max_area = lines_all;
+	scroll1.max_area = lines.all;
-	scroll1.cur_area = lines_visible;
+	scroll1.cur_area = lines.visible;
-	scroll1.position = lines_first;
+	scroll1.position = lines.first;
 	scroll1.all_redraw=1;

Subversion Repositories Kolibri OS

(root)/programs/network/htmlv/browser/TWB.h – Rev 2810 → 2811