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

 #include "..\lib\figures.h"
 #include "..\lib\encoding.h"
 #include "..\lib\file_system.h"
 #include "..\lib\mem.h"
 #include "..\lib\dll.h"
+#include "..\lib\list_box.h"
 //*.obj libraries
 #include "..\lib\lib.obj\box_lib.h"
 #include "..\lib\lib.obj\libio_lib.h"
 #include "..\lib\lib.obj\libimg_lib.h"
 //images
 #include "img\toolbar_icons.c"
 #include "img\URLgoto.txt";
 #ifdef LANG_RUS
-	char version[]=" ¥ªáâ®¢ë© ¡à ã§¥à 0.99.11";
+	char version[]=" ’ҐЄбв®ўл© Ўа г§Ґа 0.99.3";
-	?define IMAGES_CACHE_CLEARED "íè ª àâ¨®ª ®ç¨é¥"
+	?define IMAGES_CACHE_CLEARED "Љни Є авЁ®Є ®зЁйҐ"
 #else
-	char version[]=" Text-based Browser 0.99.11";
+	char version[]=" Text-based Browser 0.99.3";
 	?define IMAGES_CACHE_CLEARED "Images cache cleared"
 #endif
 	int half_scroll_size;
 	int scroll_used=0, show_menu;
 	mem_Init();
 	if (load_dll2(boxlib, #box_lib_init,0)!=0) {notify("System Error: library doesn't exists /rd/1/lib/box_lib.obj"); ExitProcess();}
-	if (load_dll2(libio, #libio_init,1)!=0) debug("Error: library doesn't exists - libio"w);
+	if (load_dll2(libio, #libio_init,1)!=0) debug("Error: library doesn't exists - libio");
-	if (load_dll2(libimg, #libimg_init,1)!=0) debug("Error: library doesn't exists - libimg"w);
+	if (load_dll2(libimg, #libimg_init,1)!=0) debug("Error: library doesn't exists - libimg");
 	if (!URL) strcpy(#URL, "/sys/index.htm");
+		{
 			CASE evMouse:
 				/*
 				//not work well, so we are use custom way of processing scroll
 				scrollbar_v_mouse (#scroll1);
-				if (lines.first <> scroll1.position)
+				if (WB1.list.first <> scroll1.position)
+				{
-					lines.first = scroll1.position;
+					WB1.list.first = scroll1.position;
 					WB1.ParseHTML(buf, filesize);
 				};
 				*/
 						CreateThread(#menu_rmb,#stak+4092);
 						break;
+					}
+				}
-				if (m.vert==65535)
+				if (m.vert)
-				{
-					if (lines.first==0) break;
+				{
-					if (lines.first>3) lines.first-=2; ELSE lines.first=1;
-					Scan(ID1);
-					break;
-				}
-				if (m.vert==1)
-				{
-					if(lines.visible+lines.first+3>=lines.all) Scan(181);
-					else
-					{
-						lines.first+=2;
-						Scan(ID2);
-					}
-					break;
+					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)
 				&& (m.y>=scroll1.start_y+scroll1.btn_height) && (-scroll1.btn_height+scroll1.start_y+scroll1.size_y>m.y)
-				&& (lines.all>lines.visible) && (m.lkm)
+				&& (WB1.list.count>WB1.list.visible) && (m.lkm)
+				{
 					scroll_used=1;
+				}
 				if (scroll_used)
 				{
-					half_scroll_size = WB1.list.h - 16 * lines.visible / lines.all - 3 /2;
+					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; //åñëè êóðñîð íàä îêíîì
-					btn=lines.first; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
+					btn=WB1.list.first; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
-					lines.first = m.y -half_scroll_size -WB1.list.y * lines.all / WB1.list.h;
+					WB1.list.first = m.y -half_scroll_size -WB1.list.y * WB1.list.count / WB1.list.h;
-					if (lines.visible+lines.first>lines.all) lines.first=lines.all-lines.visible;
+					if (WB1.list.visible+WB1.list.first>WB1.list.count) WB1.list.first=WB1.list.count-WB1.list.visible;
-					if (btn<>lines.first) WB1.ParseHTML(buf); //÷òîá ëèøíèé ðàç íå ïåðåðèñîâûâàòü
+					if (btn<>WB1.list.first) WB1.ParseHTML(buf); //÷òîá ëèøíèé ðàç íå ïåðåðèñîâûâàòü
+				}
+				}
 				break;
 			case evKey:
 				key = GetKey();
 				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);} //àäðåñíàÿ ñòðîêà
 				break;
 			case evReDraw:
 				if (action_buf) { Scan(action_buf); action_buf=0;}
 				Draw_Window();
 				break;
 			default:
 				if (downloader_id<>0)
 				{
 					if (GetProcessSlot(downloader_id)<>0) break;
 					downloader_id=0;
-					lines.first = lines.all = 0;
+					WB1.list.first = WB1.list.count = 0;
 					WB1.ReadHtml(_WIN);
 					Draw_Window();
 void SetElementSizes()
+{
 	address_box.width = Form.width-266;
 	WB1.list.SetSizes(0, 44, Form.width - 10 - scroll1.size_x, Form.cheight - 44, 0, 10);
-	lines.column_max = WB1.list.w - 30 / 6;
+	WB1.list.column_max = WB1.list.w - 30 / 6;
-	lines.visible = WB1.list.h - 3 / WB1.list.line_h - 2;
+	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, ID1+BT_HIDE, 0xE4DFE1);
+	DefineButton(scroll1.start_x+1, scroll1.start_y+1, 16, 16, BTN_UP+BT_HIDE, 0xE4DFE1);
-	DefineButton(scroll1.start_x+1, scroll1.start_y+scroll1.size_y-18, 16, 16, ID2+BT_HIDE, 0xE4DFE1);
+	DefineButton(scroll1.start_x+1, scroll1.start_y+scroll1.size_y-18, 16, 16, BTN_DOWN+BT_HIDE, 0xE4DFE1);
+}
-void Scan(int id)
-{
-	if (id >= 400)
-	{
-		GetURLfromPageLinks(id);
-		//#1
-		if (URL[0] == '#')
-		{
-			strcpy(#anchor, #URL+strrchr(#URL, '#'));
-			strcpy(#URL, BrowserHistory.CurrentUrl());
-			lines.first=lines.all-lines.visible;
-			WB1.ShowPage();
-			return;
-		}
-		//liner.ru#1
-		if (strrchr(#URL, '#')<>-1)
-		{
-			strcpy(#anchor, #URL+strrchr(#URL, '#'));
-			URL[strrchr(#URL, '#')-1] = 0x00; //çàãëóøêà
-		}
-		WB1.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;
-		}
-		WB1.OpenPage();
-		return;
 void Scan(int id)
 	IF(lines.all < lines.visible) SWITCH(id) //åñëè ìàëî ñòðîê èãíîðèðóåì íåêîòîðûå êíîïêè
-	{ CASE 183: CASE 184: CASE 180: CASE 181: return; }
+	if (id >= 400) ProcessLinks(id);
+	switch (id)
+	{
-	switch (id)
+		case 011: //Ctrk+K
 			WB1.ReadHtml(_KOI);
+			WB1.ParseHTML(buf);
-		case 011: //Ctrk+K
+			return;
-			WB1.ReadHtml(_KOI);
+		case 021: //Ctrl+U
-			break;
+			WB1.ReadHtml(_UTF);
+			WB1.ParseHTML(buf);
-		case 021: //Ctrl+U
+			return;
-			WB1.ReadHtml(_UTF);
+		case 004: //Ctrl+D
-			break;
+			WB1.ReadHtml(_DOS);
+			WB1.ParseHTML(buf);
-		case 004: //Ctrl+D
+			return;
-			WB1.ReadHtml(_DOS);
+		case 002: //free img cache
-			break;
+			FreeImgCache();
-		case 002: //free img cache
+			WB1.ParseHTML(buf);
-			FreeImgCache();
+			return;
 			break;
 		case BACK:
 			if (!BrowserHistory.GoBack()) return;
 			WB1.OpenPage();
 			return;
 		case FORWARD:
+			if (!BrowserHistory.GoForward()) return;
-			if (!BrowserHistory.GoForward()) return;
+			WB1.OpenPage();
-			WB1.OpenPage();
+			return;
-			return;
+		case 052:  //F3
+			if (strcmp(get_URL_part(5),"http:")<>0) RunProgram("/rd/1/tinypad", #URL);
+			else RunProgram("/rd/1/tinypad", #download_path);
-		case 052:  //F3
+			return;
-			if (strcmp(get_URL_part(5),"http:")<>0) RunProgram("/rd/1/tinypad", #URL); else RunProgram("/rd/1/tinypad", #download_path);
+		case 054: //F5
-			return;
+			IF(address_box.flags & 0b10) WB1.ParseHTML(buf);
-		case 054: //F5
+			return;
 			IF(address_box.flags & 0b10) break;
 		case REFRESH:
 			if (GetProcessSlot(downloader_id)<>0)
+			{
 				KillProcess(downloader_id);
 				pause(20);
 				Draw_Window();
 				return;
 			}
-			anchor_line_num=lines.first; //âåñ¸ëûé êîñòûëü :Ð
+			anchor_line_num=WB1.list.first;
 			anchor[0]='|';
 			WB1.OpenPage();
 			return;
-		case 014: //Ctrl+N íîâîå îêíî
+		case 014:
-		case 020: //Ctrl+T íîâàÿ âêëàäêà
+		case 020:
 		case NEWTAB:
 			MoveSize(190,80,OLD,OLD);
 			RunProgram(#program_path, #URL);
-			return;
-		case HOME:
+			return;
 			strcpy(#editURL, "http://kolibrios.org/en/index.htm");
-		case GOTOURL:
+		case HOME:
-		case 0x0D: //enter
+			strcpy(#editURL, "http://kolibrios.org/en/index.htm");
-			//ïî÷åìó ttp://? Ãîñïîäà, îòëè÷íûé âîïðîñ. Äåëî â òîì, ÷òî ýòî õàê.
+		case GOTOURL:
-			//strstr() åñëè íå íàøëî âîçâðàùàåò 0 è â ñëó÷àå óñïåõà âîçâðàùàåò 0. Òàê ÷òî ýòî õàê.
+		case 0x0D: //enter
 			if ((strstr(#editURL,"ttp://")==0) && (editURL[0]!='/')) strcpy(#URL,"http://"); else URL[0] = 0;
 			strcat(#URL, #editURL);
 			WB1.OpenPage();
-			return;
-		case SEARCHWEB:
-			strcpy(#URL, #search_path);
-			strcat(#URL, #editURL);
-			WB1.OpenPage();
-			return;
-		case ID1: //ìîòàåì ââåðõ
-			IF(lines.first <= 0) return;
+			return;
+		case SEARCHWEB:
-			lines.first--;
+			strcpy(#URL, #search_path);
-			break;
+			strcat(#URL, #editURL);
-		case ID2: //ìîòàåì âíèç
+			WB1.OpenPage();
+			return;
-			IF(lines.visible + lines.first >= lines.all) return;
+		case 183: //PgDown
-			lines.first++;
+			if (WB1.list.count < WB1.list.visible) return;
+			IF(WB1.list.first == WB1.list.count - WB1.list.visible) return;
-			break;
+			WB1.list.first += WB1.list.visible + 2;
-		case 183: //PgDown
+			IF(WB1.list.visible + WB1.list.first > WB1.list.count) WB1.list.first = WB1.list.count - WB1.list.visible;
-			IF(lines.first == lines.all - lines.visible) return;
+			WB1.ParseHTML(buf);
+			return;
+		case 184: //PgUp
+			if (WB1.list.count < WB1.list.visible) return;
+			IF(WB1.list.first == 0) return;
+			WB1.list.first -= WB1.list.visible - 2;
+			IF(WB1.list.first < 0) WB1.list.first = 0;
+			WB1.ParseHTML(buf);
+			return;
+		case 178:
+		case BTN_UP: //мотаем вверх
+			IF(WB1.list.first <= 0) return;
+			WB1.list.first--;
+			WB1.ParseHTML(buf);
-			lines.first += lines.visible + 2;
+			return;
-			IF(lines.visible + lines.first > lines.all) lines.first = lines.all - lines.visible;
+		case 177:
-			break;
+		case BTN_DOWN: //мотаем вниз
-		case 184: //PgUp
-			IF(lines.first == 0) return;
+			IF(WB1.list.visible + WB1.list.first >= WB1.list.count) return;
+			WB1.list.first++;
-			lines.first -= lines.visible - 2;
+			WB1.ParseHTML(buf);
-			IF(lines.first < 0) lines.first = 0;
+			return;
-			break;
-		case 180: //home
-			IF(lines.first == 0) return;
-			lines.first = 0;
+		case 180: //home
-			break;
+			if (WB1.list.KeyHome()) WB1.ParseHTML(buf);
-		case 181: //end
-			IF (lines.first == lines.all - lines.visible) return;
+			return;
+		case 181: //end
+			if (WB1.list.count < WB1.list.visible) return;
+			if (WB1.list.KeyEnd()) WB1.ParseHTML(buf);
+			return;
+	}
+}
+void ProcessLinks(int id)
+{
+	GetURLfromPageLinks(id);
+	//#1
+	if (URL[0] == '#')
+	{
+		strcpy(#anchor, #URL+strrchr(#URL, '#'));
+		strcpy(#URL, BrowserHistory.CurrentUrl());
+		WB1.list.first=WB1.list.count-WB1.list.visible;
+		WB1.ShowPage();
+		return;
+	}
+	//liner.ru#1
+	if (strrchr(#URL, '#')<>-1)
+	{
+		strcpy(#anchor, #URL+strrchr(#URL, '#'));
+		URL[strrchr(#URL, '#')-1] = 0x00; //çàãëóøêà
+	}
+	WB1.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))
+	{
+		notify(#URL);
+		strcpy(#editURL, BrowserHistory.CurrentUrl());
+		strcpy(#URL, BrowserHistory.CurrentUrl());
-			lines.first = lines.all - lines.visible;
+		return;

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c @ 8444 – Rev 4414 → 4415