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

 //http://jsbeautifier.org/
 //Web-component, Leency & Veliant 2007-2009
 //lev
-//èäåÿ - ëåâûå ôàéëû îòêðûâàòü ñîîòâåòñòâóþùèìè ïðîãàìè
-//	wintodos(buf); -> â ïàðñå õòìë êàê è âñå êîäèðîâêè
+//èäåÿ - ëåâûå ôàéëû îòêðûâàòü ñîîòâåòñòâóþùèìè ïðîãàìè
-//ol - öèôåðêè
 //wintodos(buf); -> â ïàðñå õòìë êàê è âñå êîäèðîâêè
-//óñêîðåíà çàãðóçêà ñòðàíèöû, ñîäåðæàùåé èçîáðàæåíèÿ
+//ol - öèôåðêè
 //óìåíüøåíî êîëè÷åñòâî ïåðåðèñîâîê çàãîëîâêà îêíà ïðè çàãðóçêå ñòðàíèöû
 dword j,
 	buf,
 	filesize,
 	blink = 400;
  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[]=" HTML Viewer v0.63";
+ char version[]=" Text-based Browser 23.67";
 		ReadHtml();
 		break;
 	case BACK:
 		BrowserHistory.GoBack();
 		return;
-	/*case FORWARD:
+	case FORWARD:
-		WriteDebug(#UrlHistory);
+		//RunProgram("@notify", "Forward button is not realized yet");
-		return;*/
+		return;
 	case 054: //F5
 		IF(edit1.flags == 66) break;
   case REFRESH:
 		copystr(#URL, #editURL);
 		Draw_Window();
 		return;
+	case 014: //Ctrl+N íîâîå îêíî
+	case 020: //Ctrl+T íîâàÿ âêëàäêà
+	case NEWTAB:
+		MoveSize(190,80,OLD,OLD);
+		RunProgram(#program_path, #URL);
+		return;
 	case HOME:
 		copystr("/sys/index.htm", #editURL);
 	case GOTOURL:
 	case 0x0D: //enter
 		copystr(#editURL, #URL);
 byte rez, b_text, i_text, u_text, s_text, w_title, pre_text, blq_text, li_text, link, ignor_text, li_tab;
 dword text_colors[10],
 	text_color_index = 0,
 	link_color;
 int stroka,
-	stolbec;
+	stolbec,
+	tab_len;
 	byte line[330],
 	tag[100],
 	tagparam[10000],
 	parametr[1200],
 	options[1000];
 				bukva = '';
 				temp = '';
 				goto NEXT_MARK;
+			}
 		CASE '\9':
+			if (pre_text == 1) //èíà÷å èä¸ì íà 0x0d
-		CASE 0x0d:
+			{
+				tab_len=strlen(#line)/8;
+				tab_len=tab_len*8;
+				tab_len=8+tab_len-strlen(#line);
-			//IF(pre_text == 1) {copystr("   ", #line + strlen(#line)); break;} ELSE
+				for (i=0; i
+				break;
+			}
+		case 0x0d:
 			bukva = ' ';
 			goto DEFAULT_MARK;
-		CASE '<':
+		case '<':
 			bword++; //ïðîìîòàåì ñèìâîë <
 			IF(ESBYTE[bword] == '!') //ôèëüòðàöèÿ âíóòðè , äåðçêî
+			{
 				bword++;
 				IF(ESBYTE[bword] == '-') {
 			copystr(#bukva, #temp + strlen(#temp));
 			bukva=Hex2Symb(#temp);
 			IF (bukva) goto DEFAULT_MARK;
-			break;
-		/*case '\\': //ïîääåðæêà RTF, http://dev.rembish.ru/rtf.phps
-			IF(strcmp(#URL + strlen(#URL) - 4, ".rtf")<>0) goto DEFAULT_MARK;
-			rtf_text='';
-			//
-               bword++;
-			j = 0;
-			IF (ESBYTE[bword]=='\'')
-			{
-				bword++;
-				bukva=ESBYTE[bword];
-				copystr(#bukva, #rtf_text);
-				bword++;
-				bukva=ESBYTE[bword];
-				copystr(#bukva, #rtf_text + strlen(#rtf_text));
-				bukva=Hex2Symb(#rtf_text);
-				IF (bukva) goto DEFAULT_MARK;
-			}
-			WHILE ((ESBYTE[bword] <>' ') && (j < 25) && (ESBYTE[bword] <>'\\') && (ESBYTE[bword] <>0x0d)) {
-				bukva = ESBYTE[bword];
-				copystr(#bukva, #rtf_text + strlen(#rtf_text));
-				bword++;
-				j++;
-			}
-			IF (strcmp(#rtf_text,"par")==0) goto NEXT_MARK;
-			break;*/
+			break;
 		case '&':
 			IF(ignor_text) break;
 			bword++;
 			j = 0;
+}
 char oldtag[100];
-void TWebBrowser::WhatTextStyle(word left1, top1, width1) {
+void TWebBrowser::WhatTextStyle(int left1, top1, width1) {
 	dword hr_color;
 			GOTO IMG_TAG;
+		}
         if (image)
+        {
+			stroka+=h/10;
+			if (top1+hWB1.top+WB1.height-10) //åñëè ÂÑ¨ èçîáðàæåíèå óøëî ÂÅÐÕ èëè ÂÍÈÇ
+				return;
+			if (top1
-        {
+			{
+				h=h-WB1.top+top1;
+				top1=WB1.top-5;
+			}
+			if (top1>WB1.top+WB1.height-h-10) //åñëè ÷àñòü èçîáðàæåíèÿ ñíèçó     IF (stroka - 2 < max_kolvo_strok)
+			{
-			IF (width1
+				//WriteDebug(IntToStr(top1));
+				//WriteDebug(IntToStr(WB1.top));
-			IF (WB1.height
+				//WriteDebug(IntToStr(h));
+				h=WB1.top+WB1.height-top1-10;
+			}
-		IF (top1
-		TextGoDown2(left1+w,top1,width1-w,h);
+			img_draw stdcall (image,left1-5,top1+10,w, h,0,0);
-        IF (stroka - 2 < max_kolvo_strok) img_draw stdcall (image,left1-5,top1+10,w,-stroka * 10 + WB1.height -15 + h,0,0);
+			DrawBar(left1+w - 5, top1 + 10, width1-w + 5, h, 0xFFFFFF);
-        }
         //else WriteDebug(#options);
+	}
 	if (!chTag("meta")) {
 		META:
 		if (!strcmp(#parametr, "charset=")) || (!strcmp(#parametr, "content="))
 		{
 			copystr(#options[find_symbol(#options, '=')],#options); //ïîèñê â content=
-      IF (!strcmp(#options,"utf-8"))
+      IF (!strcmp(#options,"utf-8")) || (!strcmp(#options,"utf8"))
+			{
 				ReadHtml(DONT_LOAD);
 	IF(blq_text == 1) stolbec = 8;
 	ELSE stolbec = 0;
 	IF(li_text == 1) stolbec = li_tab * 5;
 	IF(stroka >= 0) && (stroka - 2 < max_kolvo_strok) DrawBar(left1 - 5, top1 + 10, width1 + 5, 10, 0xFFFFFF);
+}
-void TextGoDown2(int left1,top1,width1,height1)//ASPER: Íàäî çàìåíèòü ýòó ôóíêöèþ áîëåå ïðàâèëüíîé.
-{
-  stroka+=height1/10;
-  IF (blq_text==1) stolbec=8; ELSE stolbec=0;
-  IF (li_text==1) stolbec=5;
-  IF (stroka>=0) && (stroka-2
-}
+>

Subversion Repositories Kolibri OS

(root)/programs/network/htmlv/browser/TWB.h-- – Rev 1978 → 2085