WebSVN – Kolibri OS – Diff – /programs/network/htmlv/browser/TWB.h

 int i;
 char download_path[]="/rd/1/.download";
 char search_path[]="http://nigma.ru/index.php?s=";
-char version[]=" Text-based Browser 0.94b";
+char version[]=" Text-based Browser 0.94c";
 struct TWebBrowser {
 };
 TWebBrowser WB1;
+byte rez, b_text, i_text, u_text, s_text, pre_text, blq_text, li_text,
-byte rez, b_text, i_text, u_text, s_text, pre_text, blq_text, li_text, link, ignor_text, li_tab, body_present;
+	link, ignor_text, li_tab, first_line_drawed;
 void TWebBrowser::ParseHTML(dword bword, fsize){
 	word bukva[1];
-	int j;
+	int j, perenos_num;
 	byte ignor_param = 0;
 	char temp[768];
 	stroka = -lines.first;
 	stolbec = 0;
 	for (j = 400; j < blink + 1; j++;) DeleteButton(j);
 	blink = 400;
-	b_text = i_text = u_text = s_text = pre_text = blq_text = body_present =
+	b_text = i_text = u_text = s_text = pre_text = blq_text = first_line_drawed =
 	li_text = link = ignor_text = text_color_index = text_colors[0] = li_tab = 0; //îáíóëÿåì òåãè
-	link_color = 0x0000FF;
-	bg_color = 0xFFFFFF;
+	link_color = 0x0000FF;
-	line = '';
-	strcpy(#page_links,"|");
+	bg_color = 0xFFFFFF;
-	strcpy(#header,#version);
-	if (!strcmp(#URL + strlen(#URL) - 4, ".txt"))
+	line = '';
+	strcpy(#page_links,"|");
+	strcpy(#header,#version);
-	{
+	if (!strcmp(#URL + strlen(#URL) - 4, ".txt")) pre_text = 1;
-		DrawBar(left, top, width-15, 15, bg_color); //çàêðàøèâàåì ïåðâóþ ñòðîêó
+	if (!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
 		pre_text = 1; //çà÷¸òíîå îòîáðàæåíèå òåêñòà
 	debug("Start parsing");
-	if (!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
+	for ( ; buf+fsize > bword; bword++;) {//ESBYTE[bword]
-	for (bword = buf; buf + fsize > bword; bword++;) {
+	  bukva = ESBYTE[bword];
-	  bukva = ESBYTE[bword];
+	  switch (bukva) {
-	  switch (bukva) {
+		case 0x0a:
-		case 0x0a:
+			if (pre_text)
 			IF(pre_text == 1) {
 				bukva = '';
 				temp = '';
 				goto NEXT_MARK;
+			}
 		case '\9':
-			if (pre_text == 1) //èíà÷å èä¸ì íà 0x0d
+			if (pre_text) //èíà÷å èä¸ì íà 0x0d
 			if (ESBYTE[bword] == '!') //ôèëüòðàöèÿ âíóòðè , äåðçêî
+			{
 				bword++;
 				if (ESBYTE[bword] == '-') {
-					HH_: do {
+					HH_:
-						bword++;
+					do
+					{
+						bword++;
-						IF(bword >= buf + fsize) break 1;
+						if (bword >= buf + fsize) break 1;
-					} while (ESBYTE[bword] <>'-');
+					}
+					while (ESBYTE[bword] <>'-');
-					bword++;
+					bword++;
 					if (ESBYTE[bword] <>'-') goto HH_;
+				}
+			}
 			while (ESBYTE[bword] <>'>') && (bword < buf + fsize) //ïîëó÷àåì òåã è åãî ïàðàìåòðû
+			{
 			strcat(#line,#tag); //âûâîäèì íà ýêðàí íåîáðàáîòàííûé òåã, òàê áðàóçåðû çà÷åì-òî äåëàþò
 			break;
 		default:
 			DEFAULT_MARK:
-			IF(ignor_text) break;
+			if (ignor_text) break;
-			IF(!pre_text) && (bukva == ' ') && (!strcmp(#line + strlen(#line) - 1, " ")) continue;
+			if (!pre_text) && (bukva == ' ') && (line[strlen(#line)-1]==' ') break;
 			//
-			if (stolbec + strlen(#line) >lines.column_max)
+			if (stolbec + strlen(#line) > lines.column_max)
+			{
-				strcpy(#temp, #line + find_symbol(#line, ' ')); //ïåðåíîñ ïî ñëîâàì
+				perenos_num = find_symbol(#line, ' ');
+				strcpy(#temp, #line + perenos_num); //ïåðåíîñ ïî ñëîâàì
-				line[find_symbol(#line, ' ')] = 0x00;
+				line[perenos_num] = 0x00;
 			NEXT_MARK:
-				IF(stroka - 1 > lines.visible) && (lines.first <>0) break 1; //óõîäèì...
+				if (stroka >= lines.visible) && (lines.first <>0) break 1; //óõîäèì...
 				WhatTextStyle(left + 5, stroka * 10 + top + 5, width - 20); //âûâîä ñòðîêè
 				TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
 				strcpy(#line, #temp);
+			}
-			if (!pre_text) && (bukva == ' ') && (!stolbec) && (!line) CONTINUE;
+			if (!pre_text) && (bukva == ' ') && (!stolbec) && (!line) break;
 			strcat(#line, #bukva);
+	  }
+	}
 	if (strcmp(#URL + strlen(#URL) - 4, ".txt")<>0) && (!body_present)
-		DrawBar(left, top, width-15, 15, bg_color); //çàêðàøèâàåì ïåðâóþ ñòðîêó åñëè êàêîé-òî ðàõèò íå ñîçäàë òåã áîäè
 	if (lines.visible * 10 + 25 <= height)
 		DrawBar(left, lines.visible * 10 + top + 25, width - 15, -lines.visible * 10 + height - 25, bg_color);
 	if (stroka * 10 + 15 <= height)
 		DrawBar(left, stroka * 10 + top + 15, width - 15, -stroka * 10 + height - 15, bg_color); //çàêðàøèâàåì âñ¸ äî êîíöà
 		lines.first=anchor_line_num;
 		ParseHTML(buf, filesize);
+	}
+	debug("End parsing");
 	DrawScroller(); //ðèñóåì ñêðîëë
+}
 	//âûâîä íà ýêðàí
 	if (stroka >= 0) && (stroka - 2 < lines.visible) && (line) && (!anchor)
+	{
+		if (stroka==0) && (stolbec==0)
+		{
+			DrawBar(left, top, width-15, 15, bg_color); //çàêðàøèâàåì ïåðâóþ ñòðîêó
+			first_line_drawed=1;
+		}
 		WriteText(stolbec * 6 + left1, top1, 0x80, text_colors[text_color_index], #line, 0); //ìîæåò òóò ðèñîâàòü áåëóþ ñòðîêó?
+		//text_out stdcall (#line, -1, 16, text_colors[text_color_index], stolbec * 6 + left1, top1);
 		IF (b_text)	{ $add ebx, 1<<16   $int 0x40 }
 		IF (i_text) Skew(stolbec * 6 + left1, top1, strlen(#line)+1*6, 10); //íàêëîííûé òåêñò
 		IF (s_text) DrawBar(stolbec * 6 + left1, top1 + 4, strlen(#line) * 6, 1, text_colors[text_color_index]); //çà÷¸ðêíóòûé
 		IF (u_text) DrawBar(stolbec * 6 + left1, top1 + 8, strlen(#line) * 6, 1, text_colors[text_color_index]); //ïîä÷¸ðêíóòûé
 		IF (link) {
 			GetNextParam();
 			GOTO BODY_MARK;
+		}
-		body_present = 1; //åñëè êàëè÷ íå ñîçäàë òåã áîäè íóæíî èçâðàùàòüñÿ
-		if (rez) DrawBar(WB1.left, WB1.top, WB1.width-15, 15, bg_color); //çàêðàøèâàåì ïåðâóþ ñòðîêó
 		return;
+	}
 	//////////////////////////
 	if (!chTag("a"))
+	{
 void TextGoDown(int left1, top1, width1)
+{
+	if (!stroka) && (!stolbec) && (!first_line_drawed)
+	{
+		DrawBar(WB1.left, WB1.top, WB1.width-15, 15, bg_color); //çàêðàøèâàåì ïåðâóþ ñòðîêó
+		first_line_drawed=1;
+	}
 	stroka++;
-	IF(blq_text == 1) stolbec = 8;
+	if (blq_text) stolbec = 8;
 	ELSE stolbec = 0;
-	IF(li_text == 1) stolbec = li_tab * 5;
+	if (li_text) stolbec = li_tab * 5;
 	IF(stroka >= 0) && (stroka - 2 < lines.visible)  && (!anchor) DrawBar(left1 - 5, top1 + 10, width1 + 5, 10, bg_color);
+}
 	scroll1.start_x=Form.width-28; //left + width - 15
 	scroll1.size_y=WB1.height;
 	scrollbar_v_draw(#scroll1);
-	DefineButton(scroll1.start_x+1, scroll1.start_y+1, 16, 16, ID1+BT_HIDE, 0xE4DFE1);
-	DefineButton(scroll1.start_x+1, scroll1.start_y+scroll1.size_y-18, 16, 16, ID2+BT_HIDE, 0xE4DFE1);
+}
+>

Subversion Repositories Kolibri OS

(root)/programs/network/htmlv/browser/TWB.h – Rev 2811 → 2818