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

+}
 struct TWebBrowser {
 	llist list;
 	STYLE style;
-	dword draw_y, stolbec;
-	int zoom;
+	dword draw_y, draw_x;
 	dword o_bufpointer;
 	int cur_encoding, custom_encoding;
 	bool link, t_html, t_body;
 	dword bufpointer;
 void TWebBrowser::Paint()
+{
 	unsigned px; //paint x coordinate
 	unsigned pw; //paint y coordinate
 	   dword pc; //paint color
+	   int zoom;
 	if (style.title)
+	{
 		strncpy(#header, #line, sizeof(TWebBrowser.header)-1);
 		return;
+	}
 	if (line)
-	{
-		px = stolbec * list.font_w + BODY_MARGIN + list.x;
+	{
-		pw = strlen(#line) * zoom * list.font_w;
+		pw = strlen(#line) * list.font_w;
-		stolbec += strlen(#line) * zoom;
+		zoom = list.font_w / BASIC_CHAR_W;
 		style.cur_line_h = math.max(style.cur_line_h, list.item_h);
 		if (bg_colors.get_last() - bg_colors.get(0)) {
-			canvas.DrawBar(px, draw_y, pw, list.item_h, bg_colors.get_last());
+			canvas.DrawBar(draw_x, draw_y, pw, list.item_h, bg_colors.get_last());
+		}
 		if (style.image) {
-			canvas.DrawBar(px, draw_y, pw, list.item_h-1, 0xF9DBCB);
+			canvas.DrawBar(draw_x, draw_y, pw, list.item_h-1, 0xF9DBCB);
+		}
 		if (style.button) {
-			canvas.DrawBar(px, draw_y, pw, list.item_h - calc(zoom*2), 0xCCCccc);
+			canvas.DrawBar(draw_x, draw_y, pw, list.item_h - calc(zoom*2), 0xCCCccc);
-			canvas.DrawBar(px, draw_y + list.item_h - calc(zoom*2), pw, zoom, 0x999999);
+			canvas.DrawBar(draw_x, draw_y + list.item_h - calc(zoom*2), pw, zoom, 0x999999);
 		}
 		pc = text_colors.get_last();
 		if (link) && (pc == text_colors.get(0)) pc = link_color_default;
-		canvas.WriteText(px, draw_y, list.font_type, pc, #line, NULL);
+		canvas.WriteText(draw_x, draw_y, list.font_type, pc, #line, NULL);
-		if (style.b) canvas.WriteText(px+1, draw_y, list.font_type, pc, #line, NULL);
+		if (style.b) canvas.WriteText(draw_x+1, draw_y, list.font_type, pc, #line, NULL);
-		if (style.s) canvas.DrawBar(px, list.item_h / 2 - zoom + draw_y, pw, zoom, pc);
+		if (style.s) canvas.DrawBar(draw_x, list.item_h / 2 - zoom + draw_y, pw, zoom, pc);
-		if (style.u) canvas.DrawBar(px, list.item_h - zoom - zoom + draw_y, pw, zoom, pc);
+		if (style.u) canvas.DrawBar(draw_x, list.item_h - zoom - zoom + draw_y, pw, zoom, pc);
+		if (link) {
-		if (link) {
+			if (line[0]==' ') && (line[1]==NULL) {} else {
-			if (line[0]==' ') && (line[1]==NULL) {} else {
+				canvas.DrawBar(draw_x, draw_y + list.item_h - calc(zoom*2)-1, pw, zoom, link_color_default);
-				canvas.DrawBar(px, draw_y + list.item_h - calc(zoom*2)-1, pw, zoom, link_color_default);
+				links.add_text(draw_x, draw_y + list.y, pw, list.item_h - calc(zoom*2)-1, zoom);
 				links.add_text(px, draw_y + list.y, pw, list.item_h - calc(zoom*2)-1, zoom);
+		}
 	bg_colors.add(DEFAULT_BG_COL);
 	canvas.Fill(0, DEFAULT_BG_COL);
 	header = NULL;
 	cur_encoding = CH_CP866;
 	draw_y = BODY_MARGIN;
-	stolbec = 0;
+	draw_x = BODY_MARGIN;
 	line = 0;
-	zoom = 1;
 	redirect = '\0';
 	//hold original buffer
 	if (o_bufpointer) o_bufpointer=free(o_bufpointer);
 	o_bufpointer = malloc(bufsize);
 	memmov(o_bufpointer, bufpointer, bufsize);
 	dword j;
 	int tab_len;
 	dword bufpos;
 	bufsize = _bufsize;
+	if (list.w!=canvas.bufw) canvas.Init(list.x, list.y, list.w, 400*20);
 	if (bufpointer != _bufpointer) {
 		bufpointer = malloc(bufsize);
 		memmov(bufpointer, _bufpointer, bufsize);
 	} else {
 				AddCharToTheLine(0x0a);
+			}
 			break;
 		case 0x09:
 			if (style.pre) {
-				tab_len = strlen(#line) + stolbec % 4;
+				tab_len = draw_x - BODY_MARGIN / list.font_w + strlen(#line) % 4;
 				if (!tab_len) tab_len = 4; else tab_len = 4 - tab_len;
 				for (j=0; j
 			} else {
 				AddCharToTheLine(0x09);
+			}
 	if (_char<=15) _char=' ';
 	line_len = strlen(#line);
 	if (!style.pre) && (_char == ' ')
+	{
 		if (line[line_len-1]==' ') return; //no double spaces
-		if (!stolbec) && (!line) return; //no paces at the beginning of the line
+		if (draw_x==BODY_MARGIN) && (!line) return; //no paces at the beginning of the line
 		if (link) && (line_len==0) return;
+	}
 	if (line_len < sizeof(line)) chrcat(#line, _char);
 	CheckForLineBreak();
+}
 //============================================================================================
 bool TWebBrowser::CheckForLineBreak()
+{
-	int line_break_pos;
+	int break_pos;
-	char new_line_text[4096];
+	char next_line[4096];
+	int zoom = list.font_w / BASIC_CHAR_W;
 	//Do we need a line break?
-	if (strlen(#line)*zoom + stolbec < list.column_max) return false;
+	if (strlen(#line) * list.font_w + draw_x < list.w) return false;
 	//Yes, we do. Lets calculate where...
-	line_break_pos = strrchr(#line, ' ');
+	break_pos = strrchr(#line, ' ');
 	//Is a new line fits in the current line?
-	if (line_break_pos*zoom + stolbec > list.column_max) {
+	if (break_pos * list.font_w + draw_x > list.w) {
-		line_break_pos = list.column_max/zoom - stolbec;
+		break_pos = list.w - draw_x /list.font_w;
-		while(line_break_pos) && (line[line_break_pos]!=' ') line_break_pos--;
+		while(break_pos) && (line[break_pos]!=' ') break_pos--;
+	}
 	//Maybe a new line is too big for the whole new line? Then we have to split it
-	if (!line_break_pos) && (style.tag_list.level*5 + strlen(#line) * zoom >= list.column_max) {
+	if (!break_pos) && (style.tag_list.level*5 + strlen(#line) * zoom >= list.column_max) {
-		line_break_pos = list.column_max/zoom - stolbec;
+		break_pos = list.w  - draw_x / list.font_w;
+	}
-	strcpy(#new_line_text, #line + line_break_pos);
+	strcpy(#next_line, #line + break_pos);
-	line[line_break_pos] = 0x00;
+	line[break_pos] = 0x00;
 	Paint();
-	strcpy(#line, #new_line_text);
+	strcpy(#line, #next_line);
 	NewLine();
 	return true;
+}
 //============================================================================================
 void TWebBrowser::NewLine()
 {
+	static bool empty_line = true;
-	static int empty_line=0;
+	if (draw_x==BODY_MARGIN) && (draw_y==BODY_MARGIN) return;
-	if (!stolbec) && (draw_y==BODY_MARGIN) return;
-	if (style.tag_list.level) && (stolbec == style.tag_list.level * 5) {
-		if (empty_line<1) empty_line++;
-		else return;
+	if (t_html) && (!t_body) return;
-	} else if (!stolbec) {
-		if (empty_line<1) empty_line++;
+	if (draw_x == style.tag_list.level * 5 * list.font_w + BODY_MARGIN) {
-		else return;
-	} else {
+		if (!empty_line) empty_line=true; else return;
-		empty_line=0;
+	} else {
-	}
+		empty_line = false;
+	}
 	if (t_html) && (!t_body) return;
 	draw_y += style.cur_line_h;
 	style.cur_line_h = list.item_h;
-	if (style.blq) stolbec = 6; else stolbec = 0;
+	if (style.blq) draw_x = 6 * list.font_w; else draw_x = 0;
-	stolbec += style.tag_list.level * 5;
+	draw_x += style.tag_list.level * 5 * list.font_w + BODY_MARGIN;
 { 15,NULL,NULL,NULL,0,2,NULL,
 ,0,0xeeeeee,0xBBBbbb,0xeeeeee};
 void TWebBrowser::DrawPage()
+{
+	if (list.w!=canvas.bufw) {
+		ParseHtml(bufpointer, bufsize);
+	}
+	canvas.Show(list.first, list.h);
 	scroll_wv.max_area = list.count;
 	scroll_wv.cur_area = list.visible;
 	scroll_wv.position = list.first;
 	scroll_wv.all_redraw = 0;
 	scroll_wv.start_x = list.x + list.w;
 	scroll_wv.start_y = list.y;
 	scroll_wv.size_y = list.h;
-	scrollbar_v_draw(#scroll_wv);
 	scrollbar_v_draw(#scroll_wv);
 	canvas.Show(list.first, list.h);

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/TWB/TWB.c – Rev 8454 → 8457