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

 #ifndef AUTOBUILD
 	#include "lang.h--"
 #endif
 //libraries
-#define MEMSIZE 1024 * 800
+#define MEMSIZE 1024 * 850
 #include "..\lib\gui.h"
 #include "..\lib\draw_buf.h"
 #include "..\lib\list_box.h"
 #include "..\lib\cursor.h"
 #include "..\lib\patterns\history.h"
 #include "..\lib\patterns\http_downloader.h"
 #include "..\lib\patterns\simple_open_dialog.h"
 #ifdef LANG_RUS
-char version[]="¥ªáâ®¢ë© ¡à ã§¥à 2.0 beta1";
-#define T_LOADING " £àã§ª  áâà ¨æë..."
-#define T_RENDERING "¥¤¥à¨£..."
+char version[]="¥ªáâ®¢ë© ¡à ã§¥à 2.0 beta2";
 char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0";
 char homepage[] = FROM "html\\homepage_ru.htm""\0";
 char help[] = FROM "html\\help_ru.htm""\0";
 char accept_language[]= "Accept-Language: ru\n";
 ¥¥¤¦¥à § £àã§®ª";
 char link_menu[] =
 "®¯¨à®¢ âì ááë«ªã
 ª ç âì á®¤¥à¦¨¬®¥ ááë«ª¨";
 #else
-char version[]="Text-based Browser 2.0 beta1";
+char version[]="Text-based Browser 2.0 beta2";
-#define T_LOADING "Loading..."
-#define T_RENDERING "Rendering..."
 char page_not_found[] = FROM "html\\page_not_found_en.htm""\0";
 char homepage[] = FROM "html\\homepage_en.htm""\0";
 char help[] = FROM "html\\help_en.htm""\0";
 char accept_language[]= "Accept-Language: en\n";
 char rmb_menu[] =
 #define URL_SIZE 4000;
 dword col_bg = 0xE3E2E2;
 dword panel_color  = 0xE3E2E2;
-dword border_color = 0x8C8C8C;
 dword border_color = 0x787878;
 bool debug_mode = false;
-bool open_in_a_new_window = false;
+bool debug_mode = false;
 #define URL_SERVICE_HISTORY "WebView:history"
 #define URL_SERVICE_HOMEPAGE "WebView:home"
+#define URL_SERVICE_HELP "WebView:help"
 #define URL_SERVICE_HELP "WebView:help"
 #define TOOLBAR_GAPS 10
 dword TOOLBAR_H = 40;
 };
 char default_dir[] = "/rd/1";
 od_filter filter2 = { 16, "TXT\0HTM\0HTML\0\0" };
-char URL[URL_SIZE];
+char editURL[URL_SIZE+1];
-char editURL[URL_SIZE];
+edit_box address_box = {NULL,TOOLBAR_GAPS+TOOLBAR_GAPS+51,10,0xffffff,0x94AECE,0xffffff,
-edit_box address_box = {250,60,30,0xffffff,0x94AECE,0xffffff,0xffffff,0x10000000,URL_SIZE-2,#editURL,0,NULL,19,19};
+xffffff,0x10000000,URL_SIZE-2,#editURL,0,NULL,19,19};
 			strcpy(#downloader_edit, #param+3);
 			CreateThread(#Downloader,#downloader_stak+4092);
 			ExitProcess();
 		} else if (!strncmp(#param, "-s ", 3)) {
 			source_mode = true;
-			strcpy(#URL, #param + 3);
+			history.add(#param + 3);
 		} else {
-			strcpy(#URL, #param);
+			history.add(#param);
+		}
 	} else {
-		strcpy(#URL, URL_SERVICE_HOMEPAGE);
+		history.add(URL_SERVICE_HOMEPAGE);
+	}
+}
 void main()
+	{
 		case evMouse:
 			edit_box_mouse stdcall (#address_box);
 			mouse.get();
 			if (PageLinks.HoverAndProceed(mouse.x, WB1.list.first + mouse.y))
-			&& (bufsize) && (mouse.pkm) && (mouse.up) {
+			&& (mouse.pkm) && (mouse.up) {
 				if (WB1.list.MouseOver(mouse.x, mouse.y)) EventShowPageMenu(mouse.x, mouse.y);
 				break;
+			}
 			if (WB1.list.MouseScroll(mouse.vert)) WB1.DrawPage();
 			scrollbar_v_mouse (#scroll_wv);
 		case evReDraw:
 			if (menu.cur_y) {
 				ProcessEvent(menu.cur_y);
 				menu.cur_y = 0;
+			}
+			DefineAndDrawWindow(GetScreenWidth()-800/2-random(80),
-			DefineAndDrawWindow(GetScreenWidth()-800/2-random(80),GetScreenHeight()-700/2-random(80),800,700,0x73,0,0,0);
+				GetScreenHeight()-700/2-random(80),800,700,0x73,0,0,0);
 			GetProcessInfo(#Form, SelfInfo);
 			system.color.get();
 			col_bg = system.color.work;
 			if (Form.status_window>2) { DrawTitle(#header); break; }
 			if (Form.height<120) { MoveSize(OLD,OLD,OLD,120); break; }
 		case evNetwork:
 			if (http.transfer > 0) {
 				http.receive();
-				EventUpdateProgressBar();
-				DrawStatusBar(T_LOADING);
+				EventUpdateProgressBar();
 				if (http.receive_result == 0) {
 					// Handle redirects
 					if (http.status_code >= 300) && (http.status_code < 400)
+					{
 							http.handle_redirect();
 							http.free();
 							GetAbsoluteURL(#http.redirect_url);
 							debug("Redirect: "); debugln(#http.redirect_url);
 							history.back();
-							strcpy(#URL, #http.redirect_url);
+							OpenPage(#http.redirect_url);
-							strcpy(#editURL, #URL);
-							DrawOmnibox();
-							OpenPage();
-							//ProcessLink(history.current());
+						}
 						break;
+					}
 					redirect_count = 0;
 					// Loading the page is complete, free resources
-					history.add(#URL);
-					bufpointer = http.content_pointer;
-					bufsize = http.content_received;
 					http.free();
-					DrawStatusBar(T_RENDERING);
+					LoadInternalPage(http.content_pointer, http.content_received);
-					ShowPage();
-					DrawStatusBar(NULL);
+				}
+			}
+	}
+}
 void SetElementSizes()
+{
 	address_box.top = TOOLBAR_H/2-10;
 	basic_line_h = calc(WB1.list.font_h * 130) / 100;
-	address_box.width = Form.cwidth - address_box.left - 50;
+	address_box.width = Form.cwidth - address_box.left - 55;
 	WB1.list.SetSizes(0, TOOLBAR_H, Form.width - 10 - scroll_wv.size_x,
 		Form.cheight - TOOLBAR_H - STATUSBAR_H, basic_line_h);
 	WB1.list.wheel_size = 7 * basic_line_h;
 	WB1.list.column_max = WB1.list.w - scroll_wv.size_x / WB1.list.font_w + 1;
 	WB1.list.visible = WB1.list.h;
 	if (WB1.list.w!=WB1.DrawBuf.bufw) {
 		WB1.DrawBuf.Init(WB1.list.x, WB1.list.y, WB1.list.w, 800*20);
-		ProcessEvent(REFRESH_BUTTON);
+		OpenPage(history.current());
+	}
+{
 	DrawBar(0,0, Form.cwidth,TOOLBAR_H-2, panel_color);
 	DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, 0xD7D0D3);
 	DrawBar(0,TOOLBAR_H-1, Form.cwidth,1, border_color);
 	SetElementSizes();
-	DrawRectangle(address_box.left-3, address_box.top-3, address_box.width+5, 25,border_color);
-	DefineButton(address_box.left-52, address_box.top-2, 24, skin.h-2, BACK_BUTTON+BT_HIDE, 0);
+	DefineHiddenButton(TOOLBAR_GAPS, address_box.top-2, 24, skin.h-2, BACK_BUTTON);
-	DefineButton(address_box.left-27, address_box.top-2, 24, skin.h-2, FORWARD_BUTTON+BT_HIDE, 0);
+	DefineHiddenButton(TOOLBAR_GAPS+25, address_box.top-2, 24, skin.h-2, FORWARD_BUTTON);
-	img_draw stdcall(skin.image, address_box.left-53, address_box.top-3, 51, skin.h, 0, SKIN_Y);
+	img_draw stdcall(skin.image, TOOLBAR_GAPS-1, address_box.top-3, 51, skin.h, 0, SKIN_Y);
-	DefineButton(address_box.left+address_box.width+1, address_box.top-3, 16, skin.h-1, REFRESH_BUTTON+BT_HIDE+BT_NOFRAME, 0);
+	DefineHiddenButton(address_box.left+address_box.width-4, address_box.top-2, 20, skin.h-3, REFRESH_BUTTON);
-	DefineButton(Form.cwidth-27, address_box.top-3, 23, skin.h-1, SANDWICH_BUTTON+BT_HIDE, 0);
+	DefineHiddenButton(Form.cwidth-31, address_box.top-3, 24, skin.h-1, SANDWICH_BUTTON);
-	img_draw stdcall(skin.image, Form.cwidth-24, address_box.top-3, 17, skin.h, 102, SKIN_Y);
+	img_draw stdcall(skin.image, Form.cwidth-27, address_box.top+1, 17, 18, 51, SKIN_Y);
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,STATUSBAR_H, col_bg);
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color);
 	if (!header) {
-		OpenPage();
+		OpenPage(history.current());
 		WB1.DrawScroller();
+	}
 	else {
 		WB1.DrawPage();
 		DrawOmnibox();
+	}
-	DrawRectangle(scroll_wv.start_x, scroll_wv.start_y, scroll_wv.size_x, scroll_wv.size_y-1, scroll_wv.bckg_col);
+	DrawRectangle(scroll_wv.start_x, scroll_wv.start_y, scroll_wv.size_x,
+		scroll_wv.size_y-1, scroll_wv.bckg_col);
 	DrawProgress();
+}
 			ExitProcess();
 			return;
 		case SCAN_CODE_BS:
 		case BACK_BUTTON:
 			if (history.back()) {
-				strcpy(#URL, history.current());
+				OpenPage(history.current());
-				OpenPage();
+			}
 			return;
 		case FORWARD_BUTTON:
 			if (history.forward()) {
-				strcpy(#URL, history.current());
+				OpenPage(history.current());
-				OpenPage();
+			}
 			return;
 		case GOTOURL_BUTTON:
 		case SCAN_CODE_ENTER:
 			EventSubmitOmnibox();
 			return;
 		case REFRESH_BUTTON:
-			if (http.transfer > 0)
+			if (http.transfer > 0) {
-			{
 				StopLoading();
 				draw_window();
+			} else {
+				OpenPage(history.current());
+			}
-			else OpenPage();
 			return;
 		case SANDWICH_BUTTON:
 			EventShowPageMenu(Form.cwidth - 215, TOOLBAR_H-6);
 			return;
 		case VIEW_SOURCE:
 			EventViewSource();
 			break;
 		case EDIT_SOURCE:
-			if (check_is_the_adress_local(#URL)) {
+			if (check_is_the_adress_local(history.current())) {
-				RunProgram("/rd/1/tinypad", #URL);
+				RunProgram("/rd/1/tinypad", history.current());
 			} else {
 				CreateFile(bufsize, bufpointer, "/tmp0/1/WebView_tmp.htm");
 				if (!EAX) RunProgram("/rd/1/tinypad", "/tmp0/1/WebView_tmp.htm");
+			}
 			return;
 		case VIEW_HISTORY:
-			strcpy(#URL, URL_SERVICE_HISTORY);
+			OpenPage(URL_SERVICE_HISTORY);
-			OpenPage();
 			return;
 		case DOWNLOAD_MANAGER:
 			if (!downloader_opened) {
 				downloader_edit = NULL;
 				CreateThread(#Downloader,#downloader_stak+4092);
 		$push	EAX							// save it on the stack
 		http_free stdcall (http.transfer);	// abort connection
 		$pop	EAX
 		free(EAX);						// free data
 		http.transfer=0;
-		bufsize = 0;
-		bufpointer = free(bufpointer);
 		pause(10);
+	}
 	wv_progress_bar.value = 0;
 	DrawOmnibox();
+}
 /*
 void ReplaceSpaceInUrl() {
+	int i;
-	int i;
+	char new_url[URL_SIZE];
-	strcpy(#editURL, #URL);
+	strcpy(#new_url, history.current());
-	while (i = strchr(#URL, ' '))
+	while (i = strchr(#new_url, ' '))
 	{
-		i -= #URL;
+		i -= #new_url;
-		strlcpy(#URL+i+3, #editURL+i+1, sizeof(URL)-i-4);
+		strlcpy(#new_url+i+3, #new_url+i+1, URL_SIZE);
 		URL[i] = '%';
 		URL[i+1] = '2';
 		URL[i+2] = '0';
 	}
-	strcpy(#editURL, #URL);
+	strcpy(#editURL, #new_url);
+}
+//bool strrpl(dword dst, from, to, dst_len); !!!!!!!!
-}
+*/
-void OpenPage()
+bool GetLocalFileData(dword _path)
-{
-	char getUrl[sizeof(URL)];
+{
-	StopLoading();
+	dword data, size;
-	strcpy(#editURL, #URL);
+	file_size stdcall (_path);
-	history.add(#URL);
+	if (!EBX) {
-	if (!strncmp(#URL,"WebView:",8))
+		return false;
-	{
+	} else {
-		if (!strcmp(#URL, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#homepage, sizeof(homepage));
+		size = EBX;
-		else if (!strcmp(#URL, URL_SERVICE_HELP)) LoadInternalPage(#help, sizeof(help));
+		data = malloc(size);
-		else if (!strcmp(#URL, URL_SERVICE_HISTORY)) ShowHistory();
+		ReadFile(0, size, data, _path);
-		else {bufsize=0; ShowPage();} //page not found
+		LoadInternalPage(data, size);
-		DrawOmnibox();
+		free(data);
-		return;
-	}
-	if (!strncmp(#URL,"http:",5)) || (!strncmp(#URL,"https://",8))
-	{
-		ReplaceSpaceInUrl();
-		img_draw stdcall(skin.image, address_box.left+address_box.width+1, address_box.top-3, 17, skin.h, 68, SKIN_Y);
-		if (!strncmp(#URL,"http:",5)) {
-			http.get(#URL);
-		} else if (!strncmp(#URL,"https://",8)) {
-			sprintf(#getUrl, "http://gate.aspero.pro/?site=%s", #URL);
+		return true;
-			http.get(#getUrl);
+	}
+}
+void OpenPage(dword _open_URL)
+{
+	char new_url[URL_SIZE+1];
-		if (!http.transfer)
+	StopLoading();
-		{
+	strcpy(#editURL, _open_URL);
+	DrawOmnibox();
+	strncpy(#new_url, _open_URL, URL_SIZE);
+	//Exclude # from the URL to the load page
+	//We will bring it back when we get the buffer
+	if (strrchr(#new_url, '#')) anchors.take_anchor_from(#new_url);
+	history.add(#new_url);
+	if (!strncmp(#new_url,"WebView:",8)) {
+		//INTERNAL PAGE
+		if (!strcmp(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#homepage, sizeof(homepage));
+		else if (!strcmp(#new_url, URL_SERVICE_HELP)) LoadInternalPage(#help, sizeof(help));
+		else if (!strcmp(#new_url, URL_SERVICE_HISTORY)) ShowHistory();
+		else LoadInternalPage(#page_not_found, sizeof(page_not_found));
+	} else if (!strncmp(#new_url,"http:",5)) || (!strncmp(#new_url,"https:",6)) {
+		//WEB PAGE
+		//ReplaceSpaceInUrl(); !!!!!!!!
+		img_draw stdcall(skin.image, address_box.left+address_box.width+1,
-			StopLoading();
+			address_box.top-3, 17, skin.h, 85, SKIN_Y);
+		if (!strncmp(#new_url,"http:",5)) {
+			http.get(#new_url);
-			bufsize = 0;
+		} else if (!strncmp(#new_url,"https://",8)) {
-			bufpointer = free(bufpointer);
+			strcpy(#new_url, "http://gate.aspero.pro/?site=");
+			strncat(#new_url, _open_URL, URL_SIZE);
+			http.get(#new_url);
+		}
-			ShowPage();
+		if (!http.transfer) {
-			return;
-		}
-	}
-	else
-	{
-		file_size stdcall (#URL);
-		if (EBX) {
-			bufsize = EBX;
-			free(bufpointer);
+			StopLoading();
+			LoadInternalPage(#page_not_found, sizeof(page_not_found));
-			bufpointer = malloc(bufsize);
+		}
+	} else {
-			ReadFile(0, bufsize, bufpointer, #URL);
+		//LOCAL PAGE
-		} else {
-			bufsize = bufpointer = 0;
+		if (!GetLocalFileData(#new_url)) {
 			LoadInternalPage(#page_not_found, sizeof(page_not_found));
-		ShowPage();
+		}
+	}
 }
-void ProcessAnchor()
-{
-	char anchor[256];
-	dword anchor_pos;
-	anchor_pos = strrchr(#URL, '#')-1;
+void EventClickLink(dword _click_URL)
-	strlcpy(#anchor, #URL+anchor_pos, sizeof(anchor)-1);
+{
-	URL[anchor_pos] = 0x00;
+	char new_url[URL_SIZE];
-	if (URL[0] == NULL) {
-		//case when URL consists of anchor only
-		if (anchors.get_pos_by_name(#anchor+1)!=-1) WB1.list.first = anchors.get_pos_by_name(#anchor+1);
 		strcpy(#URL, history.current());
-	} else {
-		GetAbsoluteURL(#URL);
-		OpenPage();
+	if (ESBYTE[_click_URL]=='#') {
-		if (anchors.get_pos_by_name(#anchor+1)!=-1) WB1.list.first = anchors.get_pos_by_name(#anchor+1);
+		if (anchors.get_pos_by_name(_click_URL+1)!=-1) {
 			WB1.list.first = anchors.get_pos_by_name(_click_URL+1);
+			WB1.list.CheckDoesValuesOkey();
+		}
 		strcpy(#editURL, history.current());
-	WB1.DrawPage();
-	strcpy(#editURL, #URL);
-	strcat(#editURL, #anchor);
-	DrawOmnibox();
-}
+		strcat(#editURL, _click_URL);
-void EventSubmitOmnibox()
+		DrawOmnibox();
-{
-	if (!editURL[0]) return;
-	if (!strncmp(#editURL,"http:",5)) || (editURL[0]=='/')
-	|| (!strncmp(#editURL,"https:",6)) || (!strncmp(#editURL,"WebView:",8))
-	{
-		strcpy(#URL, #editURL);
-	}
-	else
-	{
-		strlcpy(#URL,"http://",7);
-		strcat(#URL, #editURL);
-	}
-	OpenPage();
-}
+		WB1.DrawPage();
 		return;
-void EventClickLink()
-{
-	strcpy(#URL, PageLinks.GetURL(PageLinks.active));
+	}
-	GetAbsoluteURL(#URL);
 	ProcessLink();
 	if (!strncmp(_click_URL,"mailto:", 7)) || (!strncmp(_click_URL,"tel:", 4)) {
 		notify(_click_URL);
-void ProcessLink()
+		return;
-{
+	}
-	if (http.transfer > 0)
-	{
-		StopLoading();
-		history.back();
-	}
+	if (http.transfer > 0) {
-	if (strrchr(#URL, '#')!=0) {
+		StopLoading();
-		ProcessAnchor();
+		history.back();
 		return;
-	}
+	strcpy(#new_url, _click_URL);
-	if (!strncmp(#URL,"mailto:", 7)) || (!strncmp(#URL,"tel:", 4))
+	GetAbsoluteURL(#new_url);
-		notify(#URL);
+	if (strrchr(#new_url, '#')!=0) {
-		strcpy(#editURL, history.current());
+		anchors.take_anchor_from(#new_url);
-		strcpy(#URL, history.current());
+		OpenPage(#new_url);
 		return;
 	}
-	if (!strncmp(#URL,"WebView:",8)) {
+	if (!strncmp(#new_url,"WebView:",8)) {
-		OpenPage();
-		return;
+		OpenPage(#new_url);
-	}
+		return;
+	}
-	if (strncmp(#URL,"http://",7)!=0) && (strncmp(#URL,"https://",8)!=0)
-	{
 		if (UrlExtIs(".htm")!=true) && (UrlExtIs(".html")!=true)
 	if (strncmp(#new_url,"http://",7)!=0) && (strncmp(#new_url,"https://",8)!=0)
-			if (strchr(#URL, '|')) {
-				ESBYTE[strchr(#URL, '|')] = NULL;
+	{
-				RunProgram(#URL, strlen(#URL)+1+#URL);
-			}
+		if (UrlExtIs(#new_url,".htm")!=true) && (UrlExtIs(#new_url,".html")!=true)
-			else {
+		{
-				RunProgram("/sys/@open", #URL);
+			if (strchr(#new_url, '|')) {
 				ESBYTE[strchr(#new_url, '|')] = NULL;
-			strcpy(#editURL, history.current());
+				RunProgram(#new_url, strlen(#new_url)+1+#new_url);
-			strcpy(#URL, history.current());
+			} else {
-			return;
-		}
 				RunProgram("/sys/@open", #new_url);
 	else
 			return;
 		if (UrlExtIs(".png")==true) || (UrlExtIs(".gif")==true) || (UrlExtIs(".jpg")==true)
-		|| (UrlExtIs(".zip")==true) || (UrlExtIs(".kex")==true) || (UrlExtIs(".pdf")==true)
+	} else {
-		|| (UrlExtIs(".7z")==true) {
+		if (UrlExtIs(#new_url,".png")==true) || (UrlExtIs(#new_url,".jpg")==true)
-			if (!downloader_opened) {
-				strcpy(#downloader_edit, #URL);
-				CreateThread(#Downloader,#downloader_stak+4092);
-				strcpy(#editURL, history.current());
-				strcpy(#URL, history.current());
+		|| (UrlExtIs(#new_url,".zip")==true) || (UrlExtIs(#new_url,".kex")==true) || (UrlExtIs(#new_url,".pdf")==true)
-			}
+		|| (UrlExtIs(#new_url,".7z")==true) {
+			if (!downloader_opened) {
-			else notify("'WebView\nPlease, start a new download only when previous ended.'Et");
+				strcpy(#downloader_edit, #new_url);
+				CreateThread(#Downloader,#downloader_stak+4092);
+			}
+			else notify("'WebView\nPlease, start a new download only when previous ended.'Et");
+			return;
-			return;
+		}
+	}
+	OpenPage(#new_url);
+}
 void EventSubmitOmnibox()
-	}
 	if (open_in_a_new_window)
 	char new_url[URL_SIZE+1];
-		RunProgram(#program_path, #URL);
+	if (!editURL[0]) return;
-		strcpy(#editURL, history.current());
+	if (!strncmp(#editURL,"http:",5)) || (editURL[0]=='/')
+	|| (!strncmp(#editURL,"https:",6)) || (!strncmp(#editURL,"WebView:",8)) {
+		OpenPage(#editURL);
+	} else {
-		strcpy(#URL, history.current());
+		strcpy(#new_url, "http://");
-	}
+		strncat(#new_url, #editURL, sizeof(new_url)-1);
+		OpenPage(#new_url);
 	else
+}
 		OpenPage();
-	}
+void DrawOmnibox()
-	open_in_a_new_window = false;
+{
+	int skin_x_offset;
+	DrawRectangle(address_box.left-2, address_box.top-3, address_box.width+5, 25,border_color);
+	DrawBar(address_box.left-2, address_box.top-2, address_box.width+3, 1,0xD8DCD8);
+	DrawBar(address_box.left-2, address_box.top-1, address_box.width+3, 1, address_box.color);
+	img_draw stdcall(skin.image, address_box.left-2, address_box.top-3, 2, skin.h, 102, SKIN_Y);
+	if (address_box.flags & ed_focus) address_box.flags = ed_focus; else address_box.flags = 0;
+	EditBox_UpdateText(#address_box, address_box.flags);
+	edit_box_draw stdcall(#address_box);
-void DrawOmnibox()
+	if (http.transfer > 0) skin_x_offset = 85; else skin_x_offset = 68;
-{
+	img_draw stdcall(skin.image, address_box.left+address_box.width+1,
-	int skin_x_offset;
+		address_box.top-3, 17, skin.h, skin_x_offset, SKIN_Y);
-	DrawBar(address_box.left-2, address_box.top-2, address_box.width+3, 2, address_box.color);
+}
-	DrawBar(address_box.left-2, address_box.top, 2, 22, address_box.color);
-	if (address_box.flags & ed_focus) address_box.flags = ed_focus; else address_box.flags = 0;
-	EditBox_UpdateText(#address_box, address_box.flags);
-	edit_box_draw stdcall(#address_box);
-	if (http.transfer > 0) skin_x_offset = 68; else skin_x_offset = 51;
 	img_draw stdcall(skin.image, address_box.left+address_box.width+1, address_box.top-3, 17, skin.h, skin_x_offset, SKIN_Y);
 void LoadInternalPage(dword _bufdata, _in_bufsize){
+	if (!_bufdata) || (!_in_bufsize) {
-void LoadInternalPage(dword _bufpos, _in_filesize){
+		LoadInternalPage(#page_not_found, sizeof(page_not_found));
+	} else if (source_mode) {
-	bufsize = _in_filesize;
+		source_mode = false;
-	if (bufpointer!=_bufpos) free(bufpointer);
+		//WB1.ParseHtml();
-	bufpointer = malloc(bufsize);
-	memmov(bufpointer, _bufpos, bufsize);
-	ShowPage();
+		ShowSource(_bufdata, _in_bufsize);
-}
 	} else {
-void ShowPage()
+		bufsize = _in_bufsize;
-{
+		if (bufpointer!=_bufdata) free(bufpointer);
-	WB1.list.first = 0; //scroll page to the top
+		bufpointer = malloc(bufsize);
-	DrawOmnibox();
+		memmov(bufpointer, _bufdata, bufsize);
-	if (!bufsize) || (!bufpointer) {
+		WB1.list.first = 0; //scroll page to the top
-		LoadInternalPage(#page_not_found, sizeof(page_not_found));
+		DrawOmnibox();
 		if(!strrchr(#editURL, '#')) {
-	WB1.ParseHtml();
+			strcat(#editURL, #anchors.current);
-	if (source_mode) {
+			DrawOmnibox();
 		source_mode = false;
+		WB1.ParseHtml();
-		ShowSource();
+		WB1.DrawPage();
+	}
+}
-		LoadInternalPage(bufpointer, bufsize);
+byte UrlExtIs(dword base, ext)
+{
 	if (!strcmpi(base + strlen(base) - strlen(ext), ext)) return true;
 	return false;
 byte UrlExtIs(dword ext)
+	}
+}
 void EventSeachWeb()
+{
+	char new_url[URL_SIZE+1];
-{
+	replace_char(#editURL, ' ', '_', URL_SIZE);
-	sprintf(#URL, "https://www.google.com/search?q=%s", #editURL);
+	strcpy(#new_url, "https://www.google.com/search?q=");
-	replace_char(#URL, ' ', '_', sizeof(URL));
+	strncat(#new_url, #editURL, URL_SIZE);
-	ProcessLink();
+	OpenPage(#new_url);
+}
 void EventOpenDialog()
+{
 	OpenDialog_start stdcall (#o_dialog);
-	if (o_dialog.status) {
-		strcpy(#URL, #openfile_path);
+	if (o_dialog.status) {
-		OpenPage();
+		OpenPage(#openfile_path);
+	}
+}
 void EventViewSource()
 {
-	char source_view_param[sizeof(URL)+4];
+	char source_view_param[URL_SIZE+1];
 	strcpy(#source_view_param, "-s ");
-	strcat(#source_view_param, #URL);
+	strncat(#source_view_param, history.current(), URL_SIZE);
 	RunProgram(#program_path, #source_view_param);

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c – Rev 7754 → 7755