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

 char header[2048];
+struct TWebBrowser {
-struct TWebBrowser {
+	llist list;
-	llist list;
+	dword draw_line_height, draw_line_width, draw_list_height;
 	DrawBufer DrawBuf;
 	void Prepare();
 	void Parse();
 //=======================================================================
 void TWebBrowser::DrawPage()
+{
-	int start_x, start_y, line_length, stolbec_len, magrin_left=5;
+	int start_x, start_y, zstart_x, zstart_y, line_length, zline_length, stolbec_len, magrin_left=5;
 	if (!header)
 	if (stroka >= 0) && (stroka - 2 < list.visible) && (line) && (!anchor)
+	{
 		start_x = stolbec * 6 + list.x + magrin_left;
+		start_y = stroka * list.line_h + list.y + magrin_left;
+		zstart_x = stolbec * 6 + magrin_left * DrawBuf.zoomf + list.x;
-		start_y = stroka * list.line_h + list.y + magrin_left;
+		zstart_y = stroka * list.line_h * DrawBuf.zoomf + magrin_left + list.y;
 		stolbec_len = strlen(#line);
+		line_length = stolbec_len * 6;
-		line_length = stolbec_len * 6;
+		zline_length = stolbec_len * 6 * DrawBuf.zoomf;
 		WriteBufText(start_x, 0, 0x88, text_colors[text_color_index], #line, buf_data);
-		IF (b_text)	WriteBufText(start_x+1, 0, 0x88, text_colors[text_color_index], #line, buf_data);
+		if (b_text)	WriteBufText(start_x+1, 0, 0x88, text_colors[text_color_index], #line, buf_data);
-		IF (i_text) { stolbec++; DrawBuf.Skew(start_x, 0, line_length, list.line_h); }
+		if (i_text) { stolbec++; DrawBuf.Skew(start_x, 0, line_length, list.line_h); }
-		IF (s_text) DrawBuf.DrawBar(start_x, 4, line_length, 1, text_colors[text_color_index]);
+		if (s_text) DrawBuf.DrawBar(start_x, 4, line_length, 1, text_colors[text_color_index]);
-		IF (u_text) DrawBuf.DrawBar(start_x, 8, line_length, 1, text_colors[text_color_index]);
-		IF (link) {
+		if (u_text) DrawBuf.DrawBar(start_x, 8, line_length, 1, text_colors[text_color_index]);
+		if (link) {
-			UnsafeDefineButton(start_x-2, start_y-1, line_length + 3, 10, PageLinks.count + 400 + BT_HIDE, 0xB5BFC9);
+			DrawBuf.DrawBar(start_x, 8, line_length, 1, text_colors[text_color_index]);
-			DrawBuf.DrawBar(start_x, 8, line_length, 1, text_colors[text_color_index]);
+			UnsafeDefineButton(zstart_x-2, zstart_y-1, zline_length + 3, DrawBuf.zoomf * 10, PageLinks.count + 400 + BT_HIDE, 0xB5BFC9);
-			PageLinks.AddText(#line, line_length, list.line_h, UNDERLINE);
+			PageLinks.AddText(#line, zline_length, draw_line_height, UNDERLINE);
+		}
 		stolbec += stolbec_len;
+	}
 	strcpy(#header, #version);
 	stroka = -list.first;
 	stolbec = 0;
 	line = 0;
+	draw_line_height = list.line_h * DrawBuf.zoomf;
+	draw_line_width = list.w * DrawBuf.zoomf;
+	draw_list_height = list.h * DrawBuf.zoomf;
 	if (pre_text<>2)
+	{
 		pre_text=0;
 		if (!strcmp(#URL + strlen(#URL) - 4, ".txt")) pre_text = 1;
 			if (tagparam) GetNextParam();
 			if (stolbec + strlen(#line) > list.column_max) Perenos();
 			DrawPage();
 			line = NULL;
-			if (tag) SetTextStyle(list.x + 5, stroka * list.line_h + list.y + 5); //îáðàáîòêà òåãîâ
+			if (tag) SetTextStyle(WB1.DrawBuf.zoomf * 5 + list.x, stroka * draw_line_height + list.y + 5); //îáðàáîòêà òåãîâ
 			tag = parametr = tagparam = ignor_param = NULL;
 			break;
 		default:
 			DEFAULT_MARK:
 			if (stolbec + line_len > list.column_max) Perenos();
+		}
+	}
 	DrawPage();
 	NewLine();
-	DrawBar(list.x, stroka * list.line_h + list.y + 5, list.w, -stroka * list.line_h + list.h - 5, bg_color);
+	DrawBar(list.x, stroka * draw_line_height + list.y + 5, draw_line_width, -stroka * draw_line_height + draw_list_height - 5, bg_color);
-	DrawBar(list.x, list.visible * list.line_h + list.y + 4, list.w, -list.visible * list.line_h + list.h - 4, bg_color);
+	DrawBar(list.x, list.visible * draw_line_height + list.y + 4, draw_line_width, -list.visible * draw_line_height + draw_list_height - 4, bg_color);
 	if (list.first == 0) list.count = stroka;
 	if (anchor) //åñëè ïîñðåäè òåêñòà ïîÿâèòñÿ íîâûé ÿêîðü - áóäåò áåñêîíå÷íûé öèêë
+	{
 		anchor=NULL;
 		list.first=anchor_line_num;
 					text_color_index++;
 					text_colors[text_color_index] = text_colors[text_color_index-1];
 					link = 1;
 					text_colors[text_color_index] = link_color_inactive;
-					PageLinks.AddLink(#options, stolbec*6+left1, top1-2);
+					PageLinks.AddLink(#options, DrawBuf.zoomf * stolbec*6+left1, top1-2);
+				}
 				if (anchor) && (!strcmp(#parametr, "name="))
+				{
 					if (!strcmp(#anchor, #options))
+	{
 		li_text = opened;
 		if (opened)
+		{
 			NewLine();
-			if (stroka > -1) && (stroka - 2 < list.visible) DrawBuf.DrawBar(li_tab * 5 * 6 + left1 - 5, list.line_h/2-2, 2, 2, 0x555555);
+			if (stroka > -1) && (stroka - 2 < list.visible) DrawBuf.DrawBar(li_tab * 5 * 6 + list.x, list.line_h/2-2, 2, 2, 0x555555);
+		}
 		return;
+	}
 	if (isTag("u")) || (isTag("ins")) u_text = opened;
 	if (isTag("s")) || (isTag("strike")) || (isTag("del")) s_text = opened;
 	scroll_wv.position = list.first;
-	scroll_wv.all_redraw=0;
+	scroll_wv.all_redraw = 0;
 	scroll_wv.start_x = list.x + list.w;
+	scroll_wv.start_y = list.y;
-	scroll_wv.start_y = list.y;
+	scroll_wv.size_y = list.h * DrawBuf.zoomf;
-	scroll_wv.size_y=list.h;
+	scroll_wv.start_x = list.w * DrawBuf.zoomf + list.x;
 	scrollbar_v_draw(#scroll_wv);
+}
 void TWebBrowser::NewLine()
 void TWebBrowser::NewLine()
+{
-	int onleft;
+	int onleft, ontop, zontop;
 	int ontop;
 	onleft = list.x + 5;
-	onleft = list.x + 5;
+	ontop = stroka * list.line_h + list.y + 5;
-	ontop = stroka * list.line_h + list.y + 5;
+	zontop = stroka * list.line_h * DrawBuf.zoomf + list.y + 5;
-	if (!stroka) DrawBar(list.x, list.y, list.w, 5, bg_color);
+	if (!stroka) DrawBar(list.x, list.y, draw_line_width, 5, bg_color);
 	if (t_html) && (!t_body) return;
+	if (ontop>=list.y) && ( ontop < list.h+list.y-10)  && (!anchor)
 	if (ontop>=list.y) && ( ontop < list.h+list.y-10)  && (!anchor)
 		if (text_align == ALIGN_CENTER) DrawBuf.AlignCenter(onleft,ontop,list.w,list.line_h,stolbec * 6);
-		if (text_align == ALIGN_CENTER) DrawBuf.AlignCenter(onleft,ontop,list.w,list.line_h,stolbec * 6);
+		if (text_align == ALIGN_RIGHT) DrawBuf.AlignRight(onleft,ontop,list.w,list.line_h,stolbec * 6);
-		if (text_align == ALIGN_RIGHT) DrawBuf.AlignRight(onleft,ontop,list.w,list.line_h,stolbec * 6);
+		DrawBuf.bufy = ontop;
-		DrawBuf.bufy = ontop;
+		DrawBuf.zbufy = zontop;

Subversion Repositories Kolibri OS

(root)/programs/cmm/TWB/TWB.c – Rev 5493 → 5519