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

 	blink;
 char download_path[]="/rd/1/.download";
+char search_path[]="http://nigma.ru/index.php?s=";
+struct lines{
-char search_path[]="http://nigma.ru/index.php?s=";
+	int visible, all, first, column_max;
 };
 struct TWebBrowser {
-	int left, top, width, height, line_h;
+struct TWebBrowser {
 	llist list;
 	void GetNewUrl();
 		return;
+	}
 	if (stroka >= 0) && (stroka - 2 < lines.visible) && (line) && (!anchor)
 	{
-		start_x = stolbec * 6 + left + magrin_left;
+		start_x = stolbec * 6 + list.x + magrin_left;
-		start_y = stroka * 10 + top + magrin_left;
+		start_y = stroka * 10 + list.y + magrin_left;
 		line_length = strlen(#line) * 6;
 		WriteBufText(start_x, 0, 0x88, text_colors[text_color_index], #line, drawbuf);
 		IF (b_text)	WriteBufText(start_x+1, 0, 0x88, text_colors[text_color_index], #line, drawbuf);
-		IF (i_text) DrawBufSkew(start_x, 0, line_length, line_h);
+		IF (i_text) DrawBufSkew(start_x, 0, line_length, list.line_h);
 		IF (s_text) DrawBufBar(start_x, 4, line_length, 1, text_colors[text_color_index]);
 		IF (u_text) DrawBufBar(start_x, 8, line_length, 1, text_colors[text_color_index]);
 		IF (link) {
 	address_box.offset=0;
 	edit_box_draw stdcall(#address_box);
 	if (!filesize)
 	{
-		DrawBar(left, top, width+scroll1.size_x+1, height, 0xFFFFFF); //fill all
+		DrawBar(list.x, list.y, list.w+scroll1.size_x+1, list.h, 0xFFFFFF); //fill all
-		if (GetProcessSlot(downloader_id)<>0) WriteText(left + 10, top + 18, 0x80, 0, "Loading...");
+		if (GetProcessSlot(downloader_id)<>0) WriteText(list.x + 10, list.y + 18, 0x80, 0, "Loading...");
 		else
 		{
-			WriteText(left + 10, top + 18, 0x80, 0, "Page not found. May be, URL contains some errors.");
+			WriteText(list.x + 10, list.y + 18, 0x80, 0, "Page not found. May be, URL contains some errors.");
-			if (!strcmp(get_URL_part(5),"http:"))) WriteText(left + 10, top + 32, 0x80, 0, "Or Internet unavilable for your configuration.");
+			if (!strcmp(get_URL_part(5),"http:"))) WriteText(list.x + 10, list.y + 32, 0x80, 0, "Or Internet unavilable for your configuration.");
+		}
 		//return;
+	}
 	else
 				strcpy(#temp, #line + perenos_num); //ïåðåíîñ ïî ñëîâàì
 				line[perenos_num] = 0x00;
 				if (stroka-1 > lines.visible) && (lines.first <>0) break 1; //óõîäèì...
 				DrawPage();
 				strcpy(#line, #temp);
-				TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
+				TextGoDown(list.x + 5, stroka * 10 + list.y + 5, list.w - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
+			}
 			DrawPage();
 			line=NULL;
-			if (tag) WhatTextStyle(left + 5, stroka * 10 + top + 5, width - 20); //îáðàáîòêà òåãîâ
+			if (tag) WhatTextStyle(list.x + 5, stroka * 10 + list.y + 5, list.w - 20); //îáðàáîòêà òåãîâ
 			tag = parametr = tagparam = ignor_param = NULL;
 			break;
 				strcpy(#temp, #line + perenos_num); //ïåðåíîñ ïî ñëîâàì
 				line[perenos_num] = 0x00;
 				if (stroka-1 > lines.visible) && (lines.first <>0) break 1; //óõîäèì...
 				DrawPage();
 				strcpy(#line, #temp);
-				TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
+				TextGoDown(list.x + 5, stroka * 10 + list.y + 5, list.w - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
+			}
+		}
+	}
 	DrawPage(); //ðèñóåò ïîñëåäíþþ ñòðîêó, ïîòîì ýòî íàäî óáðàòü, îïòèìèçèðîâàâ êîä
-	TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
+	TextGoDown(list.x + 5, stroka * 10 + list.y + 5, list.w - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
-	if (lines.visible * 10 + 25 <= height)
+	if (lines.visible * 10 + 25 <= list.h)
-		DrawBar(left, lines.visible * 10 + top + 25, width, -lines.visible * 10 + height - 25, bg_color);
+		DrawBar(list.x, lines.visible * 10 + list.y + 25, list.w, -lines.visible * 10 + list.h - 25, bg_color);
-	if (stroka * 10 + 5 <= height)
+	if (stroka * 10 + 5 <= list.h)
-		DrawBar(left, stroka * 10 + top + 5, width, -stroka * 10 + height - 5, bg_color); //çàêðàøèâàåì âñ¸ äî êîíöà
+		DrawBar(list.x, stroka * 10 + list.y + 5, list.w, -stroka * 10 + list.h - 5, bg_color); //çàêðàøèâàåì âñ¸ äî êîíöà
 	if (lines.first == 0) lines.all = stroka;
 	if (anchor) //åñëè ïîñðåäè òåêñòà ïîÿâèòñÿ íîâûé ÿêîðü - áóäåò áåñêîíå÷íûé öèêë
+	{
+	{
 		li_text = rez;
 		if (rez)
+		{
 			TextGoDown(left1, top1, width1);
-			if (stroka > -1) && (stroka - 2 < lines.visible) DrawBufBar(li_tab * 5 * 6 + left1 - 5, line_h/2-3, 2, 2, 0x555555);
+			if (stroka > -1) && (stroka - 2 < lines.visible) DrawBufBar(li_tab * 5 * 6 + left1 - 5, list.line_h/2-3, 2, 2, 0x555555);
+		}
 		return;
+	}
 	if (!chTag("u")) || (!chTag("ins")) u_text = rez;
 	if (!chTag("s")) || (!chTag("strike")) || (!chTag("del")) s_text = rez;
 			stroka+=2;
 			return;
+		}
 		if (strcmp(#parametr, "color=") == 0) hr_color = GetColor(#options); else hr_color = 0x999999;
 		TextGoDown(left1, top1, width1);
-		DrawBufBar(5, WB1.line_h/2, WB1.width-10, 1, hr_color);
+		DrawBufBar(5, WB1.list.line_h/2, WB1.list.w-10, 1, hr_color);
-		TextGoDown(left1, top1+WB1.line_h, width1);
+		TextGoDown(left1, top1+WB1.list.line_h, width1);
+	}
 	if (!chTag("img"))
+	{
 		Images( left1, top1, width1);
 		return;
 	scroll1.max_area = lines.all;
 	scroll1.cur_area = lines.visible;
 	scroll1.position = lines.first;
 	scroll1.all_redraw=1;
-	scroll1.start_x = WB1.left + WB1.width;
+	scroll1.start_x = WB1.list.x + WB1.list.w;
-	scroll1.size_y=WB1.height;
+	scroll1.size_y=WB1.list.h;

Subversion Repositories Kolibri OS

(root)/programs/cmm/TWB/TWB.c – Rev 4413 → 4414