WebSVN – Kolibri OS – Diff – /programs/cmm/browser/WebView.c

 //images
 #include "img\toolbar_icons.c"
 #include "img\URLgoto.txt";
 #ifdef LANG_RUS
-	char version[]=" ’ҐЄбв®ўл© Ўа г§Ґа 0.99.3";
+	char version[]=" ¥ªáâ®¢ë© ¡à ã§¥à 0.99.31";
-	?define IMAGES_CACHE_CLEARED "Љни Є авЁ®Є ®зЁйҐ"
+	?define IMAGES_CACHE_CLEARED "íè ª àâ¨®ª ®ç¨é¥"
 #else
-	char version[]=" Text-based Browser 0.99.3";
+	char version[]=" Text-based Browser 0.99.31";
 	?define IMAGES_CACHE_CLEARED "Images cache cleared"
-#endif
-#define URL param
-char fontlol[64];
-char editURL[sizeof(URL)],
-	page_links[12000],
-	header[2048];
-int	mouse_dd;
-edit_box address_box= {250,207,16,0xffffff,0x94AECE,0xffffff,0xffffff,0,sizeof(editURL),#editURL,#mouse_dd,2,19,19};
-scroll_bar scroll1 = { 18,200,398, 44,18,0,115,15,0,0xeeeeee,0xD2CED0,0x555555,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
 #endif
 proc_info Form;
+#define WIN_W 640
-#define WIN_W 640
+#define WIN_H 480
 #define WIN_H 480
 char search_path[]="http://nigma.ru/index.php?s=";
-char stak[4096];
+char stak[4096];
 mouse m;
 int action_buf;
 int action_buf;
 	strcpy(#editURL, #URL);
 	Form.width=WIN_W;
 	Form.height=WIN_H;
 	SetElementSizes();
-	WB1.OpenPage();
+	OpenPage();
 	SetEventMask(0x27);
 	loop()
+	{
 		WaitEventTimeout(2);
 		switch(EAX & 0xFF)
+		{
 			CASE evMouse:
 				/*
 				//not work well, so we are use custom way of processing scroll
-				scrollbar_v_mouse (#scroll1);
+				scrollbar_v_mouse (#scroll_wv);
-				if (WB1.list.first <> scroll1.position)
+				if (WB1.list.first <> scroll_wv.position)
+				{
-					WB1.list.first = scroll1.position;
+					WB1.list.first = scroll_wv.position;
 					WB1.ParseHTML(buf, filesize);
 				};
+				{
 					if (WB1.list.MouseScroll(m.vert)) WB1.ParseHTML(buf);
+				}
 				if (!m.lkm) scroll_used=0;
-				if (m.x>=scroll1.start_x) && (m.x<=scroll1.start_x+scroll1.size_x)
+				if (m.x>=scroll_wv.start_x) && (m.x<=scroll_wv.start_x+scroll_wv.size_x)
-				&& (m.y>=scroll1.start_y+scroll1.btn_height) && (-scroll1.btn_height+scroll1.start_y+scroll1.size_y>m.y)
+				&& (m.y>=scroll_wv.start_y+scroll_wv.btn_height) && (-scroll_wv.btn_height+scroll_wv.start_y+scroll_wv.size_y>m.y)
 				&& (WB1.list.count>WB1.list.visible) && (m.lkm)
+				{
 					scroll_used=1;
+				}
 				if (scroll_used)
 				{
 					half_scroll_size = WB1.list.h - 16 * WB1.list.visible / WB1.list.count - 3 /2;
-					if (half_scroll_size+WB1.list.y>m.y) || (m.y<0) || (m.y>4000) m.y=half_scroll_size+WB1.list.y; //åñëè êóðñîð íàä îêíîì
+					if (half_scroll_size+WB1.list.y>m.y) || (m.y<0) || (m.y>4000) m.y=half_scroll_size+WB1.list.y;
-					btn=WB1.list.first; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
+					btn=WB1.list.first;
 					WB1.list.first = m.y -half_scroll_size -WB1.list.y * WB1.list.count / WB1.list.h;
 					if (WB1.list.visible+WB1.list.first>WB1.list.count) WB1.list.first=WB1.list.count-WB1.list.visible;
-					if (btn<>WB1.list.first) WB1.ParseHTML(buf); //÷òîá ëèøíèé ðàç íå ïåðåðèñîâûâàòü
+					if (btn<>WB1.list.first) WB1.ParseHTML(buf);
+				}
+				}
 				break;
 			case evKey:
 				key = GetKey();
-				if (address_box.flags & 0b10) SWITCH(key) //åñëè àêòèâíà ñòðîêà àäðåñà èãíîðèðóåì íåêîòîðûå êíîïêè
+				if (address_box.flags & 0b10) SWITCH(key)
 					{ CASE 52: CASE 53: CASE 54: goto _EDIT_MARK; }
 				Scan(key);
 				_EDIT_MARK:
-				if (key<>0x0d) && (key<>183) && (key<>184) {EAX=key<<8; edit_box_key stdcall(#address_box);} //àäðåñíàÿ ñòðîêà
+				if (key<>0x0d) && (key<>183) && (key<>184) {EAX=key<<8; edit_box_key stdcall(#address_box);}
 				break;
 			case evReDraw:
+}
 void SetElementSizes()
+{
-	address_box.width = Form.width-266;
+	address_box.width = Form.width - 266;
-	WB1.list.SetSizes(0, 44, Form.width - 10 - scroll1.size_x, Form.cheight - 44, 0, 10);
+	WB1.list.SetSizes(0, 44, Form.width - 10 - scroll_wv.size_x, Form.cheight - 44, 0, 10);
 	WB1.list.column_max = WB1.list.w - 30 / 6;
 	WB1.list.visible = WB1.list.h - 3 / WB1.list.line_h - 2;
 	DrawBufInit();
 	DrawRectangle(206,15,Form.cwidth-205-50,16,0xE4ECF3);
 	SetElementSizes();
 	WB1.ShowPage();
-	DefineButton(scroll1.start_x+1, scroll1.start_y+1, 16, 16, BTN_UP+BT_HIDE, 0xE4DFE1);
+	DefineButton(scroll_wv.start_x+1, scroll_wv.start_y+1, 16, 16, BTN_UP+BT_HIDE, 0xE4DFE1);
-	DefineButton(scroll1.start_x+1, scroll1.start_y+scroll1.size_y-18, 16, 16, BTN_DOWN+BT_HIDE, 0xE4DFE1);
+	DefineButton(scroll_wv.start_x+1, scroll_wv.start_y+scroll_wv.size_y-18, 16, 16, BTN_DOWN+BT_HIDE, 0xE4DFE1);
+}
 			WB1.ParseHTML(buf);
 			return;
 		case 002: //free img cache
+			FreeImgCache();
-			FreeImgCache();
+			notify(IMAGES_CACHE_CLEARED);
 			WB1.ParseHTML(buf);
 			return;
 		case BACK:
 			if (!BrowserHistory.GoBack()) return;
-			WB1.OpenPage();
+			OpenPage();
 			return;
 		case FORWARD:
 			if (!BrowserHistory.GoForward()) return;
-			WB1.OpenPage();
+			OpenPage();
 			return;
 		case 052:  //F3
 			if (strcmp(get_URL_part(5),"http:")<>0) RunProgram("/rd/1/tinypad", #URL);
 				Draw_Window();
 				return;
+			}
 			anchor_line_num=WB1.list.first;
 			anchor[0]='|';
-			WB1.OpenPage();
+			OpenPage();
 			return;
 		case 014:
 		case 020:
 		case NEWTAB:
 			MoveSize(190,80,OLD,OLD);
 			strcpy(#editURL, "http://kolibrios.org/en/index.htm");
 		case GOTOURL:
 		case 0x0D: //enter
 			if ((strstr(#editURL,"ttp://")==0) && (editURL[0]!='/')) strcpy(#URL,"http://"); else URL[0] = 0;
 			strcat(#URL, #editURL);
-			WB1.OpenPage();
+			OpenPage();
 			return;
 		case SEARCHWEB:
 			strcpy(#URL, #search_path);
 			strcat(#URL, #editURL);
-			WB1.OpenPage();
+			OpenPage();
 			return;
 		case 183: //PgDown
 			if (WB1.list.count < WB1.list.visible) return;
 			IF(WB1.list.first < 0) WB1.list.first = 0;
 			WB1.ParseHTML(buf);
 			return;
 		case 178:
-		case BTN_UP: //мотаем вверх
+		case BTN_UP: //ìîòàåì ââåðõ
-			IF(WB1.list.first <= 0) return;
+			if (WB1.list.first <= 0) return;
 			WB1.list.first--;
 			WB1.ParseHTML(buf);
 			return;
 		case 177:
-		case BTN_DOWN: //мотаем вниз
+		case BTN_DOWN: //ìîòàåì âíèç
-			IF(WB1.list.visible + WB1.list.first >= WB1.list.count) return;
+			if (WB1.list.visible + WB1.list.first >= WB1.list.count) return;
 			WB1.list.first++;
 			WB1.ParseHTML(buf);
+	}
 	//liner.ru#1
 	if (strrchr(#URL, '#')<>-1)
+	{
 		strcpy(#anchor, #URL+strrchr(#URL, '#'));
-		URL[strrchr(#URL, '#')-1] = 0x00; //çàãëóøêà
+		URL[strrchr(#URL, '#')-1] = 0x00;
+	}
 	WB1.GetNewUrl();
 		strcpy(#editURL, BrowserHistory.CurrentUrl());
 		strcpy(#URL, BrowserHistory.CurrentUrl());
 		return;
+	}
-	WB1.OpenPage();
+	OpenPage();
 	return;
+}
-}
+void OpenPage()
+{
+	if (GetProcessSlot(downloader_id)<>0) PutPaletteImage(#toolbar,200,42,0,0,8,#toolbar_pal);
+	KillProcess(downloader_id);
+	strcpy(#editURL, #URL);
+	BrowserHistory.AddUrl();
+	strcpy(#header, #version);
+	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]=NULL;
+		downloader_id = RunProgram("/sys/network/downloader", #URL);
+		IF (downloader_id<0) notify("Error running Downloader. Internet unavilable.");
+		Draw_Window();
+		return;
+	}
+	WB1.list.first = WB1.list.count =0;
+	WB1.ReadHtml(_WIN);
 	WB1.ShowPage();

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c @ 7049 – Rev 4415 → 4416