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.94e";
+char version[]=" Text-based Browser 0.94u";
 struct TWebBrowser {
 byte rez, b_text, i_text, u_text, s_text, pre_text, blq_text, li_text,
 	link, ignor_text, li_tab, first_line_drawed;
-dword text_colors[30],
+dword text_colors[300],
 	text_color_index,
 	link_color,
 	bg_color;
+int stroka,
+	stolbec,
+	tab_len;
 int stroka,
-	stolbec,
+char anchor[256];
-	tab_len;
+int anchor_line_num;
 char line[500],
-	tag[100],
-	tagparam[10000],
-	parametr[1200],
-	options[1000];
+	tag[100],
 	tagparam[10000],
-char anchor[256];
+	parametr[1200],
-int anchor_line_num;
+	options[1000];
 		//#1
 		if (URL[0] == '#')
+		{
-			strcpy(#anchor, #URL+find_symbol(#URL, '#'));
+			strcpy(#anchor, #URL+strrchr(#URL, '#'));
 			strcpy(#URL, BrowserHistory.CurrentUrl());
 			lines.first=lines.all-lines.visible;
 			ShowPage();
 			return;
 		}
 		//liner.ru#1
-		if (find_symbol(#URL, '#')<>-1)
+		if (strrchr(#URL, '#')<>-1)
 		{
-			strcpy(#anchor, #URL+find_symbol(#URL, '#'));
+			strcpy(#anchor, #URL+strrchr(#URL, '#'));
-			URL[find_symbol(#URL, '#')-1] = 0x00; //çàãëóøêà
+			URL[strrchr(#URL, '#')-1] = 0x00; //çàãëóøêà
+		}
 		strcpy(#editURL, BrowserHistory.CurrentUrl()); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
 		_CUT_ST_LEVEL_MARK:
-		if (editURL[find_symbol(#editURL, '/')-2]<>'/')  // åñëè íå http://pagename.ua <-- íàõðåíà ýòà ñòðîêà???
+		if (editURL[strrchr(#editURL, '/')-2]<>'/')  // åñëè íå http://pagename.ua <-- íàõðåíà ýòà ñòðîêà???
 		{
-			editURL[find_symbol(#editURL, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
+			editURL[strrchr(#editURL, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
+		}
 		IF (!strcmp(get_URL_part(3),"../")) //íà óðîâåíü ââåðõ
 		{
 			strcpy(#URL,#URL+3);
-			editURL[find_symbol(#editURL, '/')-1] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
+			editURL[strrchr(#editURL, '/')-1] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
 			goto _CUT_ST_LEVEL_MARK;
+		}
 	if (!strcmp(#URL + strlen(#URL) - 4, ".txt")) pre_text = 1;
 	if (!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
 	#ifdef DEBUG_ON
-		debug("Start parsing");
-	#endif
+	debug("Start parsing");
 	for ( ; buf+filesize > bword; bword++;) {//ESBYTE[bword]
 	  bukva = ESBYTE[bword];
 			if (!pre_text) && (bukva == ' ') && (line[strlen(#line)-1]==' ') break;
 			//
 			if (stolbec + strlen(#line) > lines.column_max)
+			{
-				perenos_num = find_symbol(#line, ' ');
+				perenos_num = strrchr(#line, ' ');
 				strcpy(#temp, #line + perenos_num); //ïåðåíîñ ïî ñëîâàì
 				line[perenos_num] = 0x00;
 			NEXT_MARK:
 				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); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
 		lines.first=anchor_line_num;
 		ParseHTML(buf);
+	}
-	#ifdef DEBUG_ON
-		debug("End parsing");
+	debug("End parsing");
-	#endif
 	DrawScroller(); //ðèñóåì ñêðîëë
+}
 	if (!chTag("a"))
+	{
 		if (rez)
+		{
-			_A_MARK:
+			text_color_index++;
+			text_colors[text_color_index] = text_colors[text_color_index-1];
+			_A_MARK:
 			if (!strcmp(#parametr, "href="))
+			{
 				if (stroka - 1 > lines.visible) || (stroka < -2) return;
-				if (link == 1) text_color_index--; //åñëè êàêîé-òî äîëáî¸á íå çàêðûë òýã
+				if (link) && (text_color_index > 0) text_color_index--; //åñëè íå çàêðûò òýã
 				link = 1;
 				blink++;
-				text_color_index++;
+				text_colors[text_color_index] = link_color;
-				text_colors[text_color_index] = link_color;
 				strcat(#page_links, #options);
 				strcat(#page_links, "|");
+			}
 			if (anchor) && (!strcmp(#parametr, "name="))
+			{
+	}
 	/////////////////////////
 	if (!chTag("font"))
+	{
-		IF (stroka - 1 > lines.visible) return;
+		if (rez)
+		{
+			text_color_index++;
+			text_colors[text_color_index] = text_colors[text_color_index-1];
-		COL_MARK:
+			COL_MARK:
-		if (strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
+			if (strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
+			{
-			text_color_index++;
+				text_colors[text_color_index] = GetColor(#options);
-			text_colors[text_color_index] = GetColor(#options);
+			}
-		IF(tagparam) {
+			IF(tagparam) {
-			GetNextParam();
+				GetNextParam();
-			GOTO COL_MARK;
+				GOTO COL_MARK;
+			}
 		IF(!rez) && (text_color_index > 0) text_color_index--;
+		else
+			if (text_color_index > 0) text_color_index--;
 		return;
+	}
 	//////////////////////////
 	if(!chTag("tr")) || (!chTag("br")) {
 		TextGoDown(left1, top1, width1);
 		return;
 		IMG_TAG:
 			if (!strcmp(#parametr,"src="))   //íàäî îáúåäèíèòü ñ GetNewUrl()
+			{
 				strcpy(#temp, BrowserHistory.CurrentUrl()); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
-				temp[find_symbol(#temp, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
+				temp[strrchr(#temp, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
 				strcat(#temp, #options);
 				image=load_image(#temp);
 				w=DSWORD[image+4];
 				h=DSWORD[image+8];
+			}
-  			if (!strcmp(#parametr,"alt="))
+  			/*if (!strcmp(#parametr,"alt="))
 			{
 				strcpy(#tag, "[Image: ");
 				strcat(#tag, #options);
 				strcat(#tag, "]");
 			}*/
 		IF(tagparam)
+		{
 			GetNextParam();
 			GOTO IMG_TAG;
+	{
 		META:
 		if (!strcmp(#parametr, "charset=")) || (!strcmp(#parametr, "content=")) || (!strcmp(#parametr, "encoding="))
+		{
-			strcpy(#options, #options[find_symbol(#options, '=')]); //ïîèñê â content=
+			strcpy(#options, #options[strrchr(#options, '=')]); //ïîèñê â content=
 			if (!strcmp(#options,"utf-8")) || (!strcmp(#options,"utf8"))		ReadHtml(_UTF);
 			if (!strcmp(#options, "koi8-r")) || (!strcmp(#options, "koi8-u"))	ReadHtml(_KOI);
 			if (!strcmp(#options, "dos")) || (!strcmp(#options, "cp-866"))		ReadHtml(_DOS);
+		}

Subversion Repositories Kolibri OS

(root)/programs/network/htmlv/browser/TWB.h – Rev 2825 → 2839