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

 enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT};
 struct _style {
-byte
+bool
 	b, u, s, h,
 	pre,
 	blq,
 	li,
+	li_tab,
+	button,
-	li_tab,
+	image,
 	align;
 };
 	void BufEncode();
 } WB1;
-byte
+bool
 	link,
 	ignor_text,
 	cur_encoding,
 	t_html,
 		start_x = stolbec * list.font_w + body_magrin + list.x;
 		stolbec_len = strlen(#line) * zoom;
 		line_length = stolbec_len * list.font_w;
+		if (style.image) {
+			DrawBuf.DrawBar(start_x, draw_y, line_length, list.item_h, 0xF9DBCB);
+		}
+		if (style.button) {
+			DrawBuf.DrawBar(start_x, draw_y, line_length, list.item_h - calc(zoom*2), 0xCCCccc);
+			DrawBuf.DrawBar(start_x, draw_y + list.item_h - calc(zoom*2), line_length, zoom, 0x999999);
+		}
 		DrawBuf.WriteText(start_x, draw_y, list.font_type, text_colors[text_color_index], #line);
 		if (style.b) DrawBuf.WriteText(start_x+1, draw_y, list.font_type, text_colors[text_color_index], #line);
 		if (style.s) DrawBuf.DrawBar(start_x, list.item_h / 2 - zoom + draw_y, line_length, zoom, text_colors[text_color_index]);
 		if (style.u) DrawBuf.DrawBar(start_x, list.item_h - zoom - zoom + draw_y, line_length, zoom, text_colors[text_color_index]);
 		if (link) {
 	int perenos_num;
 	char new_line_text[4096];
 	if (strlen(#line)*zoom + stolbec < list.column_max) return;
 	perenos_num = strrchr(#line, ' ');
-	if (!perenos_num) && (strlen(#line)*zoom>list.column_max) perenos_num=list.column_max/zoom;
+	if (!perenos_num) && (strlen(#line)*zoom>list.column_max) {
-	strcpy(#new_line_text, #line + perenos_num);
+		perenos_num=list.column_max/zoom;
+		if (!stolbec)&&(style.pre) draw_y-=list.item_h; //hack to fix https://prnt.sc/rk3kyt
+	}
+	strcpy(#new_line_text, #line + perenos_num);
 	line[perenos_num] = 0x00;
 	DrawStyle();
 	strcpy(#line, #new_line_text);
 	NewLine();
+}
 //============================================================================================
 void TWebBrowser::SetStyle() {
-	int left1 = body_magrin + list.x;
+	char img_path[4096];
+	int left1 = body_magrin + list.x;
-	byte opened;
+	bool opened;
-	byte meta_encoding;
+	int meta_encoding;
 	if (tag[0] == '/')
+	{
 		 opened = 0;
 		 strcpy(#tag, #tag+1);
+	}
 	else opened = 1;
 				DrawBuf.Fill(0, bg_color);
+			}
 		} while(GetNextParam());
 		if (opened) && (cur_encoding==CH_NULL) {
-			cur_encoding = CH_UTF8;
+			cur_encoding = CH_CP866;
-			debugln("Document has no information about encoding, UTF will be used");
+			//BufEncode(CH_UTF8);
+			debugln("Document has no information about encoding!");
 		}
 		if (opened) {
 			if (strcmp(#header, #version) != 0) {
 				ChangeCharset(charsets[cur_encoding], "CP866", #header);
 				sprintf(#header, "%s - %s", #header, #version);
+			}
+	}
 	if (istag("br")) { NewLine(); return; }
 	if (istag("tr")) { if (opened) NewLine(); return; }
 	if (istag("b")) || (istag("strong")) || (istag("big")) { style.b = opened; return; }
-	if (istag("u")) || (istag("ins")) { style.u=opened; return;}
+	if (istag("button")) { style.button = opened; stolbec++; return; }
+	if (istag("u")) || (istag("ins")) { style.u=opened; return;}
 	if (istag("s")) || (istag("strike")) || (istag("del")) { style.s=opened; return; }
 	if (istag("dd")) { stolbec += 5; return; }
 	if (istag("blockquote")) { style.blq = opened; return; }
 	if (istag("pre")) || (istag("code")) { style.pre = opened; return; }
-	if (istag("img")) { ImgCache.Images( left1, draw_y, WB1.list.w); return; }
+	if (istag("img")) {
+		do{
+			if (isattr("src=")) strcpy(#img_path, #val);
+			if (isattr("alt=")) sprintf(#line, "[%s]", #val);
+		} while(GetNextParam());
+		style.image = true;
+		text_color_index++;
+		text_colors[text_color_index] = 0x9A6F29;
+		if (!line) {
+			if (!strncmp(#img_path, "data:", 5)) img_path=0;
+			sprintf(#line, "[%s]", #img_path+strrchr(#img_path, '/'));
+			line[50]= NULL;
+		}
+		if (strlen(#line) + stolbec > list.column_max) Perenos();
+		DrawStyle();
+		line=0;
+		text_color_index--;
+		style.image = false;
+		//ImgCache.Images( left1, draw_y, WB1.list.w);
-	if (istag("h1")) || (istag("h2")) || (istag("h3")) || (istag("caption")) {
+		return;
+	}
+	if (istag("h1")) || (istag("h2")) || (istag("h3")) || (istag("caption")) {
 		style.h = opened;
 		if (opened)
+		{
 			NewLine();
 			draw_y += 10;
 			WB1.list.font_type |= 10011001b;
 			if (isattr("align=")) && (isval("center")) style.align = ALIGN_CENTER;
 			if (isattr("align=")) && (isval("right")) style.align = ALIGN_RIGHT;
 			list.item_h = basic_line_h * 2;
 			if (istag("h1")) style.b = true;
+		}
 		else
+		{
-			NewLine();
+			if (istag("h1")) style.b = false;
+			NewLine();
 			WB1.zoom=1;
 			WB1.list.font_type = 10011000b;
 			style.align = ALIGN_LEFT;
 			list.item_h = basic_line_h;
+		}
 		style.li = opened;
 		if (opened)
+		{
 			NewLine();
-			strcpy(#line, "\31 \0");
+			strcpy(#line, "\31 ");
-		}
+			stolbec-=2;
+		}
 		return;
+	}
 	if (istag("ul")) || (istag("ol")) {
 		if (!opened)
+		{
 	else
+	{
 		strcpy(bufpointer, o_bufpointer);
+	}
-	debugval("cur_encoding    ", cur_encoding);
+	//debugval("cur_encoding    ", cur_encoding);
-	debugval("set_new_encoding", set_new_encoding);
+	//debugval("set_new_encoding", set_new_encoding);
 	cur_encoding = set_new_encoding;
 	bufpointer = ChangeCharset(charsets[cur_encoding], "CP866", bufpointer);
+}
 //============================================================================================
 void TWebBrowser::DrawScroller()
+{
 //============================================================================================
 void TWebBrowser::NewLine()
+{
 	dword onleft, ontop;
 	static int empty_line=0;
 	if (!stolbec) && (draw_y==body_magrin) return;
+	if (!stolbec) {
+		if (empty_line<1) empty_line++;
+		else return;
+	} else {
+		empty_line=0;
+	}
 	onleft = list.x + body_magrin;
 	ontop = draw_y + list.y;
 	if (t_html) && (!t_body) return;
 	draw_y += list.item_h;

Subversion Repositories Kolibri OS

(root)/programs/cmm/TWB/TWB.c – Rev 7738 → 7742