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

 	if (!strcmp(get_URL_part(5),"http:")))
+	{
 		KillProcess(downloader_id); //óáèâàåì ñòàðûé ïðîöåññ
 		DeleteFile(#download_path);
-		IF (URL[strlen(#URL)-1]=='/') URL[strlen(#URL)-1]='';
+		IF (URL[strlen(#URL)-1]=='/') URL[strlen(#URL)-1]=NULL;
 		downloader_id = RunProgram("/sys/network/downloader", #URL);
 		//Browser Hack v2.0
 		Pause(60);
 		if (GetProcessSlot(downloader_id)<>0)
+		{
 			debug("Browser Hack v2.0: Killing downloader and trying to run it one more!");
 	b_text = i_text = u_text = s_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;
-	line = '';
+	line = NULL;
 	strcpy(#page_links,"|");
 	strcpy(#header, #version);
 	if (pre_text<>2)
+		{
 		case 0x0a:
 			if (pre_text)
+			{
-				bukva = temp = '';
+				bukva = temp = NULL;
 				goto NEXT_MARK;
+			}
 		case '\9':
 			if (pre_text) //èíà÷å èä¸ì íà 0x0d
+			{
 				tab_len=strlen(#line)/8;
 				bukva = ESBYTE[bword];
 				strcat(#tag, #bukva);
+			}
-			for (j=0; unicode_tags[j]!=0; j+=2;)
-			{
-				if (!strcmp(#tag, unicode_tags[j]))
-				{
-					strcat(#line, unicode_tags[j+1]);
-					break 1;
-				}
-			}
-			rez = atoi(#tag + 1) - 1040;
-			if (tag[1] == '1') && (rez>=0) && (rez<=72) && (strlen(#tag) == 5)
-			{
-				bukva = unicode_chars[rez];
+			bukva = GetUnicodeSymbol();
-				//GOTO DEFAULT_MARK; //îáðàáàòûâàåì áóêâó ëó÷øå íàâåðíî strcat(#line, unicode_tags[j+1]); è break 1;
-				strcat(#line, #bukva);
+			if (bukva) goto DEFAULT_MARK;
-				break;
-			}
-			strcat(#line,#tag); //âûâîäèì íà ýêðàí íåîáðàáîòàííûé òåã, òàê áðàóçåðû çà÷åì-òî äåëàþò
 			break;
 		case '<':
 			bword++; //ïðîìîòàåì ñèìâîë <
 			tag = parametr = tagparam = ignor_param = NULL;
 			if (ESBYTE[bword] == '!') //ôèëüòðàöèÿ âíóòðè , äåðçêî
 	if (lines.first == 0) lines.all = stroka;
 	if (anchor)
+	{
 		//åñëè ïîñðåäè òåêñòà ïîÿâèòñÿ íîâûé ÿêîðü - áóäåò áåñêîíå÷íûé öèêë
-		anchor='';
+		anchor=NULL;
 		lines.first=anchor_line_num;
 		ParseHTML(buf);
+	}
 	DrawScroller();
+	{
-		rez = 0;
+		 rez = 0;
-		strcpy(#tag, #tag+1);
+		 strcpy(#tag, #tag+1);
+	}
-	else
+	else rez = 1;
-		rez = 1;
-	if (!chTag("html")) {
+	if (!chTag("html"))
+	{
 		IF(!strcmp(#URL + strlen(#URL) - 4, ".mht")) IF (rez==0) ignor_text = 1; ELSE ignor_text = 0;
 		return;
+	}
 	if (!chTag("script")) || (!chTag("style")) || (!chTag("binary")) ignor_text = rez;
-	if(!chTag("title"))
-	{
-		if (rez)
+	if(!chTag("title"))
-		{
-			header=0;
+	{
-		}
-		else //òåã çàêðûëñÿ - âûâåëè ñòðîêó
-		{
-			if (stroka==0) DrawTitle(#header);
+		if (rez) header=NULL;
 		else if (!stroka) DrawTitle(#header); //òåã çàêðûëñÿ - âûâåëè ñòðîêó
 		return;
 	if (anchor) && (!strcmp(#parametr, "id=")) //î÷åíü ïëîõî!!! ïîòîìó ÷òî åñëè íå ïîñëåäíèé òåã, ðàáîòàòü íå áóäåò
-	{
-		if (!strcmp(#anchor, #options))
-		{
+	{
-			anchor_line_num=lines.first+stroka;
 		if (!strcmp(#anchor, #options))	anchor_line_num=lines.first+stroka;
+	}
 	if (!chTag("body"))
-	{
-		BODY_MARK:
+	{
-		if (!strcmp(#parametr, "link="))
-			link_color = GetColor(#options);
+		do{
-		if (!strcmp(#parametr, "text="))
-			text_colors[0]=GetColor(#options);
+			if (!strcmp(#parametr, "link=")) link_color = GetColor(#options);
-		if (!strcmp(#parametr, "bgcolor="))
-			bg_color=GetColor(#options);
-		IF(tagparam)
+			if (!strcmp(#parametr, "text=")) text_colors[0]=GetColor(#options);
-		{
-			GetNextParam();
-			GOTO BODY_MARK;
+			if (!strcmp(#parametr, "bgcolor=")) bg_color=GetColor(#options);
 		} while(GetNextParam());
 		return;
+	}
-	if (!chTag("a"))
 	if (!chTag("a"))
-		if (rez)
+	{
 		if (rez)
+		{
 			if (link) IF(text_color_index > 0) text_color_index--; //åñëè ïðåäûäóùèé òåã à íå áûë çàêðûò
+					{
-					anchor_line_num=lines.first+stroka;
+						anchor_line_num=lines.first+stroka;
+					}
+				}
-			if (tagparam)
+			} while(GetNextParam());
-			{
-				GetNextParam();
-				GOTO _A_MARK;
+		}
-			}
-		}
 		else {
 			link = 0;
 			IF(text_color_index > 0) text_color_index--;
+		}
 		return;
+		{
 			text_color_index++;
 			text_colors[text_color_index] = text_colors[text_color_index-1];
-			COL_MARK:
+			do{
-			if (strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
+				if (strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
+				{
-				text_colors[text_color_index] = GetColor(#options);
+					text_colors[text_color_index] = GetColor(#options);
+				}
-			IF(tagparam) {
-				GetNextParam();
+			} while(GetNextParam());
-				GOTO COL_MARK;
-			}
+		}
 		else
 			if (text_color_index > 0) text_color_index--;
 		return;
+	}
 		strcpy(#oldtag, #tag);
 		return;
+	}
 	else
-		oldtag='';
+		oldtag=NULL;
 	if (!chTag("b")) || (!chTag("strong")) || (!chTag("big")) {
 		b_text = rez;
 		return;
+	}
 	if (!chTag("img"))
+	{
 		if (GetFileInfo(libimg)<>0) return;  //åñëè áèáëèîòåêè íåò
-		IMG_TAG:
+		do{
 			if (!strcmp(#parametr,"src="))   //íàäî îáúåäèíèòü ñ GetNewUrl()
+			{
 				if (downloader_id) strcpy(#temp, #history_list[history_current-1].Item);
 					else strcpy(#temp, BrowserHistory.CurrentUrl()); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
 				if (strcmpn(#temp, "http:", 5)!=0) || (strcmpn(#options, "http:", 5)!=0)
 				strcat(#alt, #options);
 				strcat(#alt, "]");
+			}
-		IF(tagparam)
-		{
-			GetNextParam();
+		} while(GetNextParam());
-			GOTO IMG_TAG;
-		}
 		if (!image)
+		{
 			if (alt) && (link) strcat(#line, #alt);
+	}
 	if (!chTag("meta")) || (!chTag("?xml"))
+	{
-		META:
+		do{
-		if (!strcmp(#parametr, "charset=")) || (!strcmp(#parametr, "content=")) || (!strcmp(#parametr, "encoding="))
+			if (!strcmp(#parametr, "charset=")) || (!strcmp(#parametr, "content=")) || (!strcmp(#parametr, "encoding="))
+			{
-			strcpy(#options, #options[strrchr(#options, '=')]); //ïîèñê â content=
+				strcpy(#options, #options[strrchr(#options, '=')]); //ïîèñê â content=
-			if (!strcmp(#options,"utf-8"))   || (!strcmp(#options,"utf8"))      ReadHtml(_UTF);
+				if (!strcmp(#options,"utf-8"))   || (!strcmp(#options,"utf8"))      ReadHtml(_UTF);
-			if (!strcmp(#options, "koi8-r")) || (!strcmp(#options, "koi8-u"))   ReadHtml(_KOI);
+				if (!strcmp(#options, "koi8-r")) || (!strcmp(#options, "koi8-u"))   ReadHtml(_KOI);
-			if (!strcmp(#options, "dos"))    || (!strcmp(#options, "cp-866"))   ReadHtml(_DOS);
+				if (!strcmp(#options, "dos"))    || (!strcmp(#options, "cp-866"))   ReadHtml(_DOS);
-		}
-		if (tagparam)
-		{
+			}
-			GetNextParam();
-			goto META;
 		} while(GetNextParam());
 		return;
+	}

Subversion Repositories Kolibri OS

(root)/programs/network/htmlv/browser/TWB.h @ 3061 – Rev 3060 → 3061