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

  int i;
  char download_path[]="/rd/1/.download";
 //char search_path[]="http://nova.rambler.ru/search?words=";
  char search_path[]="http://nigma.ru/index.php?s=";
- char version[]=" Text-based Browser 23.69";
+ char version[]=" Text-based Browser 23.70";
 TWebBrowser WB1;
+#include "include\history.h--"
-#include "include\history.h--"
+#include "include\colors.h--"
-#include "include\colors.h--"
+#include "include\unicode_tags.h--"
 void TWebBrowser::Scan(dword id) {
 	IF(kolichestvo < max_kolvo_strok) SWITCH(id) {
 		CASE 183: CASE 184: CASE 180: CASE 181: return;
 	} //åñëè ìàëî ñòðîê èãíîðèðóåì íåêîòîðûå êíîïêè
 	switch (id) {
 	case 011:
-	case 004:
 		ReadHtml();
 		break;
 	case BACK:
 		BrowserHistory.GoBack();
 		return;
+		{
 			DeleteFile(#download_path);
 			IF (URL[strlen(#URL)-1]=='/') URL[strlen(#URL)-1]='';
 			downloader_id = RunProgram("/sys/network/downloader", #URL);
 			IF (downloader_id<0) RunProgram("@notify", "Error running Downloader. Internet unavilable.");
+			RunProgram("/sys/network/downloader", #URL);
 			RETURN;
+		}
 		file_size stdcall (#download_path);
+	}
 	ELSE file_size stdcall (#URL);
+	filesize = EBX;
-	filesize = EBX;
+	IF (!filesize) return; //Lee 22.09
 	mem_Free(buf);
 	buf = mem_Alloc(filesize);
 	ReadFile(0, filesize, buf, #URL);
+	}
 	edit1.size = edit1.pos = strlen(#editURL);
 	edit_box_draw stdcall(#edit1); //ðèñóåì ñòðîêó àäðåñà
+	ReadHtml(LETS_LOAD);
+	IF (!filesize) return; //Lee 22.09
 	ReadHtml(LETS_LOAD);
 	wintodos(buf);
 	ParseHTML(buf, filesize);
 	IF(!strlen(buf)) {
 		IF (strcmp(get_URL_part(5),"http:")==0)
 	link_color = 0x0000FF;
 	blink = 400;
 	line = '';
 	copystr("|", #page_links);
 	IF(!strcmp(#URL + strlen(#URL) - 4, ".txt")) pre_text = 1; //çà÷¸òíîå îòîáðàæåíèå òåêñòà
+	//IF(!strcmp(#URL + strlen(#URL) - 4, ".rtf")) pre_text = 1;
 	IF(!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
 	IF(za_kadrom == 0) || (WindowRePaint) DrawBar(left, top, width - 15, 15, 0xFFFFFF); //çàêðàøèâàåì ïåðâóþ ñòðîêó
 	for (; buf + fsize > bword; bword++;) {
 	  bukva = ESBYTE[bword];
 	  switch (bukva) {
 			copystr(#bukva, #temp + strlen(#temp));
 			bukva=Hex2Symb(#temp);
 			IF (bukva) goto DEFAULT_MARK;
+			break;
+		/*case '\\': //ïîääåðæêà rtf
+			IF(strcmp(#URL + strlen(#URL) - 4, ".rtf")<>0) goto DEFAULT_MARK;
-			break;
+			bword++;
+			IF (ESBYTE[bword] =='\'')
+			{
+				bword++;
-		case '&':
+				bukva=ESBYTE[bword];
+				copystr(#bukva, #temp);
 			IF(ignor_text) break;
+				bword++;
+				bukva=ESBYTE[bword];
+				copystr(#bukva, #temp + strlen(#temp));
+				bukva=Hex2Symb(#temp);
+				IF (bukva) goto DEFAULT_MARK;
-			bword++;
+			}
+			else
-			j = 0;
+			{
+				FOR (j=0;   (ESBYTE[bword] <>'\\') && (buf + fsize < bword);     j++; bword++;)
 			WHILE(ESBYTE[bword] <>';') && (j < 7) {
-				bukva = ESBYTE[bword];
+					bukva = ESBYTE[bword];
+					copystr(#bukva, #tag + strlen(#tag));
+				}
+				IF ((!strcmp(#tag, "par\0x0a")) || (!strcmp(#tag, "par\0x0b"))) stroka++;
+				tag='';
+				bword--;
+			}
+			break;*/
+		case '&': //îáðàáîòêà òåãîâ òèïà
-				copystr(#bukva, #tag + strlen(#tag));
+			IF(ignor_text) break;
+			bword++;
+			tag='';
+			FOR (j=0;   (ESBYTE[bword] <>';') && (j < 7);     j++; bword++;)
+			{
+				bukva = ESBYTE[bword];
+				copystr(#bukva, #tag + strlen(#tag));
+			}
+			FOR (j=0; unicode_tags[j]!=0; j+=2;)
+			{
-				bword++;
+				IF(!strcmp(#tag, unicode_tags[j]))
+				{
+					copystr(unicode_tags[j+1], #line + strlen(#line));
-				j++;
+					break 1;
-			}
-			bukva = ''; //âñþ ýòó õðåíü íàäî çàëàáàòü ÷åðåç ìàñèâ
-			IF(!strcmp("nbsp", #tag)) copystr(" ", #line + strlen(#line));
-			IF(!strcmp("copy", #tag)) || (!strcmp("#169", #tag)) copystr("(c)", #line + strlen(#line));
+				}
+			}
 			IF(!strcmp("reg", #tag)) || (!strcmp("#174", #tag)) copystr("(r)", #line + strlen(#line));
 			rez = StrToInt(#tag + 1) - 1040;
+			IF(tag[1] == '1') && (rez>1040) && (rez<1118) && (strlen(#tag) == 5)
-			IF(tag[1] == '1') && (strlen(#tag) == 5) bukva = utf100tmmv_mas[rez];
+				{
-			IF(!strcmp("bdquo", #tag)) copystr(",,", #line + strlen(#line));
+					bukva = utf100tmmv_mas[rez];
-			IF(!strcmp("amp", #tag)) || (!strcmp("#38", #tag)) bukva = '&';
+					copystr(#bukva, #line + strlen(#line));
+					break;
+				}
-			IF(!strcmp("lt", #tag)) || (!strcmp("#60", #tag)) bukva = '<';
-			IF(!strcmp("gt", #tag)) || (!strcmp("#62", #tag)) bukva = '>';
-			IF(!strcmp("minus", #tag)) || (!strcmp("#8722", #tag)) bukva = '-';
-			IF(!strcmp("#151", #tag)) || (!strcmp("#149", #tag)) || (!strcmp("ndash", #tag)) bukva = '-';
+			WriteDebug("Unknown tag");
-			IF(!strcmp("#39", #tag)) || (!strcmp("#96", #tag)) bukva = '\'';
+			WriteDebug(#tag);
-			IF(!strcmp("quot", #tag)) || (!strcmp("#34", #tag)) || (!strcmp("ldquo", #tag)) || (!strcmp("rdquo", #tag)) bukva = '"';
-			tag = '';
+			copystr(#tag, #line + strlen(#line)); //âûâîäèì íà ýêðàí íåîáðàáîòàííûé òåã, òàê áðàóçåðû çà÷åì-òî äåëàþò
-			//break;
+			break;
 		default:
 			DEFAULT_MARK:
 			IF(ignor_text) break;
 			IF(pre_text == 0) && (bukva == ' ') && (strcmp(#line + strlen(#line) - 1, " ") == 0) continue;
 			//
+			if (stolbec + strlen(#line) > max_kolvo_stolbcov) && (w_title == 0)
 			if (stolbec + strlen(#line) > max_kolvo_stolbcov) && (w_title == 0) {
 				copystr(#line + find_symbol(#line, ' '), #temp); //ïåðåíîñ ïî ñëîâàì
 				line[find_symbol(#line, ' ')] = 0x00;
 				NEXT_MARK: IF(stroka - 1 > max_kolvo_strok) && (za_kadrom <>0) break 1; //óõîäèì...
 				WhatTextStyle(left + 5, stroka * 10 + top + 5, width - 20); //âûâîä ñòðîêè
-				TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñòðîêó âêîíöå
+				TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
 				copystr(#temp, #line);
+			}
 			IF(pre_text == 0) && (bukva == ' ') && (stolbec == 0) && (strlen(#line) == 0) CONTINUE;
 			copystr(#bukva, #line + strlen(#line));

Subversion Repositories Kolibri OS

(root)/programs/network/htmlv/browser/TWB.h-- – Rev 2184 → 2228