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

 	blink;
 char download_path[]="/rd/1/.download";
 char search_path[]="http://nigma.ru/index.php?s=";
-char version[]=" Text-based Browser 0.95";
+char version[]=" Text-based Browser 0.96b";
 struct TWebBrowser {
 char line[500],
 	tag[100],
 	tagparam[10000],
 	parametr[1200],
-	options[1000];
+	options[4096];
 #include "include\history.h"
 #include "include\colors.h"
 #include "include\unicode_tags.h"
 		GetNewUrl();
 		if (!strcmp(#URL + strlen(#URL) - 4, ".gif")) || (!strcmp(#URL + strlen(#URL) - 4, ".png")) || (!strcmp(#URL + strlen(#URL) - 4, ".jpg"))
+		{
 			//if (strstr(#URL,"http:"))
 			RunProgram("/sys/media/kiv", #URL);
 			strcpy(#editURL, BrowserHistory.CurrentUrl());
 			strcpy(#URL, BrowserHistory.CurrentUrl());
 			return;
+		}
+		if (!strcmpn(#URL,"mailto:", 7))
+		{
+			RunProgram("@notify", #URL);
+			strcpy(#editURL, BrowserHistory.CurrentUrl());
+			strcpy(#URL, BrowserHistory.CurrentUrl());
+			return;
+		}
 		OpenPage();
 			break;
 		case 021: //Ctrl+U
 			ReadHtml(_UTF);
 			break;
-		case BACK:
+		case 004: //Ctrl+D
+			ReadHtml(_DOS);
+			break;
+		case 001:
+			if (!pre_text) pre_text=2;
+				else pre_text=0;
+			break;
+		case BACK:
 			if (!BrowserHistory.GoBack()) return;
 			OpenPage();
 			return;
 		case FORWARD:
 			if (!BrowserHistory.GoForward()) return;
 	ParseHTML(buf);
+}
+char *ABSOLUTE_LINKS[]={ "http:", "mailto:", "ftp:", "/sys/", "/rd/", "/fd/", "/bd/", "/hd/", "/cd/", "/tmp/", 0};
+//dword TWebBrowser::GetNewUrl(dword CUR_URL, NEW_URL){
+void TWebBrowser::GetNewUrl(){
+	int i;
+	for (i=0; ABSOLUTE_LINKS[i]; i++)
+		if (!strcmpn(#URL, ABSOLUTE_LINKS[i], strlen(ABSOLUTE_LINKS[i]))) return;
-void TWebBrowser::GetNewUrl(){
-	IF (!strcmp(get_URL_part(2),"./")) strcpy(#URL, #URL+2); //èãíîðèì :)
-	if (URL[0] <> '/')
+	IF (!strcmpn(#URL,"./", 2)) strcpy(#URL, #URL+2); //èãíîðèì :)
-	&& (strcmp(get_URL_part(5),"http:")<>0)	&& (strcmp(get_URL_part(5),"mailt")<>0)	&& (strcmp(get_URL_part(5),"ftp:/")<>0)
+	if (URL[0] == '/') strcpy(#URL, #URL+1);
-	{
-		strcpy(#editURL, BrowserHistory.CurrentUrl()); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
+	strcpy(#editURL, BrowserHistory.CurrentUrl()); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
-		_CUT_ST_LEVEL_MARK:
+	_CUT_ST_LEVEL_MARK:
 			goto _CUT_ST_LEVEL_MARK;
+		}
 		if (editURL[strlen(#editURL)-1]<>'/') strcat(#editURL, "/");
 		strcat(#editURL, #URL); //êëåèì íîâûé àäðåñ
 		strcpy(#URL, #editURL);
+}
-}
 	KillProcess(downloader_id);
 	strcpy(#editURL, #URL);
 	BrowserHistory.AddUrl();
 	strcpy(#header, #version);
-	if (!strcmp(get_URL_part(5),"http:")))
+	pre_text =0;
+	if (!strcmp(get_URL_part(5),"http:")))
+	{
 		KillProcess(downloader_id); //óáèâàåì ñòàðûé ïðîöåññ
 		DeleteFile(#download_path);
 		IF (URL[strlen(#URL)-1]=='/') URL[strlen(#URL)-1]='';
 		downloader_id = RunProgram("/sys/network/downloader", #URL);
 void TWebBrowser::ShowPage()
+{
+	edit1.size = edit1.pos = strlen(#editURL);
-	edit1.size = edit1.pos = strlen(#editURL);
+	edit1.offset=0;
 	edit_box_draw stdcall(#edit1); //ðèñóåì ñòðîêó àäðåñà
 	if (!filesize)
 	for (j = 400; j < blink + 1; j++;) DeleteButton(j);
 	blink = 400;
-	b_text = i_text = u_text = s_text = pre_text = blq_text = first_line_drawed =
+	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 = '';
 	strcpy(#page_links,"|");
+	strcpy(#header, #version);
+	if (pre_text<>2)
 	strcpy(#header, #version);
 		pre_text=0;
-	if (!strcmp(#URL + strlen(#URL) - 4, ".txt")) pre_text = 1;
+		if (!strcmp(#URL + strlen(#URL) - 4, ".txt")) pre_text = 1;
-	if (!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
 		if (!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
 	debug("Start parsing");
 	for ( ; buf+filesize > bword; bword++;)
 		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); //çàêðàøèâàåì âñ¸ äî êîíöà
 	if (lines.first == 0) lines.all = stroka;
-	debug ("Pre end - anchor");
+	if (anchor)
-	if (anchor)
+	{
 		//åñëè ïîñðåäè òåêñòà ïîÿâèòñÿ íîâûé ÿêîðü - áóäåò áåñêîíå÷íûé öèêë
 		anchor='';
 		lines.first=anchor_line_num;
 		ParseHTML(buf);
+	}
 	debug("End parsing");
 	DrawScroller();
+}
+		{
 			//line = 123456789
 			//header = 1234
 			//line = 56789
-			debug("too long header");
+			strcpy(#temp, #line);
-			strcpy(#temp, #line);
 			temp[sizeof(header)-strlen(#version)-2]=0;
 			strcpy(#header, #temp);
 			strcpy(#line, #line+strlen(#temp));
+		}
 		else
+		{
-			debug("normal header");
+			strcpy(#header, #line);
-			strcpy(#header, #line);
 			line=0;
+		}
 		strcat(#header, " -");
 	if (!chTag("a"))
+	{
 		if (rez)
+		{
-			text_color_index++;
-			text_colors[text_color_index] = text_colors[text_color_index-1];
+			if (link) IF(text_color_index > 0) text_color_index--; //åñëè ïðåäûäóùèé òåã à íå áûë çàêðûò
 			_A_MARK:
 			if (!strcmp(#parametr, "href="))
+			{
+				if (stroka - 1 > lines.visible) || (stroka < -2) return;
-				if (stroka - 1 > lines.visible) || (stroka < -2) return;
+				text_color_index++;
+				text_colors[text_color_index] = text_colors[text_color_index-1];
 				if (link) && (text_color_index > 0) text_color_index--; //åñëè íå çàêðûò òýã
 				link = 1;
 				blink++;
 				text_colors[text_color_index] = link_color;
 				strcat(#page_links, #options);
 		//if (GetFileInfo(#libimg)<>0) return;  //åñëè áèáëèîòåêè íåò
 		IMG_TAG:
 			if (!strcmp(#parametr,"src="))   //íàäî îáúåäèíèòü ñ GetNewUrl()
+			{
-				strcpy(#temp, BrowserHistory.CurrentUrl()); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
+				if (!strcmpn(#URL, "http:", 5)) || (!strcmpn(#options, "http:", 5)) return;
+				strcpy(#temp, BrowserHistory.CurrentUrl()); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
 				temp[strrchr(#temp, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
 				strcat(#temp, #options);
 				image=load_image(#temp);
 				w=DSWORD[image+4];
 				h=DSWORD[image+8];

Subversion Repositories Kolibri OS

(root)/programs/network/htmlv/browser/TWB.h – Rev 2844 → 2874