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

 	void SetStyle();
 	void DrawStyle();
 	void DrawPage();
 	void DrawScroller();
-	void LoadInternalPage();
+	void NewLine();
-	void NewLine();
-	void Perenos();
+	bool CheckForLineBreak();
 	void BufEncode();
 } WB1;
 		stolbec_len = strlen(#line) * zoom;
 		line_length = stolbec_len * list.font_w;
 		if (debug_mode) {
-			DrawBuf.DrawBar(start_x, draw_y, line_length, list.item_h-1, 0xDDDddd);
+			DrawBuf.DrawBar(start_x, draw_y, line_length, list.item_h, 0xDDDddd);
+		}
 		if (style.bg_color!=page_bg) {
-			DrawBuf.DrawBar(start_x, draw_y, line_length, list.item_h-1, style.bg_color);
+			DrawBuf.DrawBar(start_x, draw_y, line_length, list.item_h, style.bg_color);
+		}
 		if (style.image) {
 		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) {
 			if (line[0]==' ') && (line[1]==NULL) {} else {
-				DrawBuf.DrawBar(start_x, draw_y + list.item_h - calc(zoom*2), line_length, zoom, text_colors[text_color_index]);
+				DrawBuf.DrawBar(start_x, draw_y + list.item_h - calc(zoom*2), line_length, zoom, link_color_inactive);
 				PageLinks.AddText(start_x, draw_y + list.y, line_length, list.item_h - calc(zoom*2), UNDERLINE, zoom);
+			}
+		}
 		stolbec += stolbec_len;
 		if (debug_mode) debug(#line);
+		line = NULL;
+	}
+}
 //============================================================================================
-void TWebBrowser::LoadInternalPage(dword bufpos, in_filesize){
+void TWebBrowser::SetPageDefaults()
-	bufsize = in_filesize;
-	bufpointer = bufpos;
-	Prepare();
-}
-//============================================================================================
-void TWebBrowser::SetPageDefaults()
+{
 	style.b = style.u = style.s = style.h = style.blq = t_html = t_body = style.pre =
 	style.li = link = text_color_index = text_colors[0] = style.li_tab = false;
 	style.align = ALIGN_LEFT;
 	link_color_inactive = 0x0000FF;
 		case 0x0a:
 			if (style.pre)
+			{
 				DrawStyle();
-				line = NULL;
+				NewLine();
-				NewLine();
 				break;
+			}
 			goto DEFAULT_MARK;
 		case '\9':
 			if (style.pre) //otherwise go to 0x0d
 				chrcat(#tag, bukva);
+			}
 			if (bukva = GetUnicodeSymbol(#tag)) {
 				bufpos += j;
-			} else {
+				CheckForLineBreak();
+			} else {
 				bukva = '&';
 				goto DEFAULT_MARK;
-			goto DEFAULT_MARK;
 			break;
+			break;
 		case '<':
 			bufpos++;
 			if (!strncmp(bufpos,"!--",3))
+			{
 				bufpos+=3;
 				else
+				{
 					ignor_param = true;
 					if (strlen(#tagparam)+1
 					//	chrncat(#tagparam, bukva, sizeof(tagparam)-1);
+				}
 				bufpos++;
+			}
 			strlwr(#tag);
+			}
 			else opened = 1;
 			if (tag) && (!istag("span")) && (!istag("i")) && (!istag("svg")) {
-				Perenos();
+				CheckForLineBreak();
 				DrawStyle();
-				line = NULL;
 				if (tag) SetStyle();
+			}
-			strlcpy(#oldtag, #tag, sizeof(oldtag));
+			strlcpy(#oldtag, #tag, sizeof(oldtag)-1);
 			tag = attr = tagparam = ignor_param = NULL;
 			break;
 		default:
 			DEFAULT_MARK:
 			if (bukva<=15) bukva=' ';
 				if (line[line_len-1]==' ') break; //no double spaces
 				if (!stolbec) && (!line) break; //no paces at the beginning of the line
+			}
 			if (line_len < sizeof(line)) chrcat(#line, bukva);
-			Perenos();
+			CheckForLineBreak();
 		}
+	}
 	DrawStyle();
 	NewLine();
 	if (list.first == 0) list.count = draw_y;
 	DrawPage();
+}
 //============================================================================================
-void TWebBrowser::Perenos()
+bool TWebBrowser::CheckForLineBreak()
 {
-	int perenos_num;
+	int line_break_pos;
 	char new_line_text[4096];
-	if (strlen(#line)*zoom + stolbec < list.column_max) return;
+	if (strlen(#line)*zoom + stolbec < list.column_max) return false;
-	perenos_num = strrchr(#line, ' ');
+	line_break_pos = strrchr(#line, ' ');
-	if (!perenos_num) && (strlen(#line)*zoom>list.column_max) {
+	if (line_break_pos*zoom + stolbec > list.column_max) {
+		line_break_pos = list.column_max/zoom - stolbec;
+		while(line_break_pos) && (line[line_break_pos]!=' ') line_break_pos--;
+	}
+	if (!line_break_pos) && (strlen(#line)*zoom>list.column_max) {
-		perenos_num=list.column_max/zoom;
+		line_break_pos=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);
+	strcpy(#new_line_text, #line + line_break_pos);
-	line[perenos_num] = 0x00;
+	line[line_break_pos] = 0x00;
 	DrawStyle();
 	strcpy(#line, #new_line_text);
 	NewLine();
 	//if (strlen(#line)*zoom + stolbec > list.column_max)CheckForLineBreak();
+	return true;
+}
 //============================================================================================
 void TWebBrowser::SetStyle() {
 	char img_path[4096]=0;
 	int left1 = body_magrin + list.x;
 	int meta_encoding;
+	}
 	IF(istag("q"))
+	{
+		if (opened)	{
+			meta_encoding = strlen(#line);
+			if (line[meta_encoding-1] != ' ') chrcat(#line, ' ');
-		if (opened)	strcat(#line, " \"");
+			chrcat(#line, '\"');
+		}
 		if (!opened) strcat(#line, "\" ");
 		return;
+	}
 	if (isattr("id=")) || (isattr("name=")) { // TO FIX: works only if the param is the last
 		anchors.add(#val, draw_y);
 	if (istag("blockquote")) { style.blq = opened; return; }
 	if (istag("pre")) || (istag("code")) { style.pre = opened; return; }
 	if (istag("img")) {
 		do{
-			if (isattr("src=")) strncpy(#img_path, #val, sizeof(img_path)-1);
+			if (isattr("src=")) strlcpy(#img_path, #val, sizeof(img_path)-1);
 			if (isattr("title=")) && (strlen(#val)
 			if (isattr("alt=")) && (strlen(#val)
 		} while(GetNextParam());
-		if (!img_path) return;
+		if (!img_path) { line=0; return; }
 		style.image = true;
 		text_color_index++;
 		text_colors[text_color_index] = 0x9A6F29;
 		if (!line) {
 			if (!strncmp(#img_path, "data:", 5)) img_path=0;
 			replace_char(#img_path, '?', NULL, strlen(#img_path));
 			sprintf(#line, "[%s]", #img_path+strrchr(#img_path, '/'));
 			line[50]= NULL;
+		}
-		if (strlen(#line) + stolbec > list.column_max) Perenos();
+		while (CheckForLineBreak()) {};
 		DrawStyle();
-		line=0;
+		text_color_index--;
-		text_color_index--;
 		style.image = false;
 		//ImgCache.Images( left1, draw_y, WB1.list.w);
 		return;
+	}
 	if (istag("h1")) || (istag("h2")) || (istag("h3")) || (istag("caption")) {
 	if (t_html) && (!t_body) return;
 	draw_y += list.item_h;
 	if (style.blq) stolbec = 6; else stolbec = 0;
 	if (style.li) stolbec = style.li_tab * 5;
 	if (debug_mode) debugln(NULL);
+}
 //============================================================================================
 bool istag(dword text) { if (!strcmp(#tag,text)) return true; else return false; }
 bool isattr(dword text) { if (!strcmp(#attr,text)) return true; else return false; }
 bool isval(dword text) { if (!strcmp(#val,text)) return true; else return false; }
 //============================================================================================

Subversion Repositories Kolibri OS

(root)/programs/cmm/TWB/TWB.c – Rev 7749 → 7750