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

 #include "..\lib\patterns\http_downloader.h"
 #include "..\lib\patterns\simple_open_dialog.h"
 #include "..\lib\patterns\toolbar_button.h"
 #include "..\lib\patterns\restart_process.h"
+char editbox_icons[] = FROM "res/editbox_icons.raw";
 #define URL_SIZE 4000
-char version[]="WebView 2.65b";
+char version[]="WebView 2.66";
-#include "texts.h"
-#include "cache.h"
+#include "texts.h"
-#include "show_src.h"
+#include "cache.h"
-#include "download_manager.h"
+#include "show_src.h"
 char editURL[URL_SIZE+1];
 edit_box address_box = {, PADDING+TSZE*2+PADDING+6, PADDING+3, 0xffffff,
-x94AECE, 0xffffff, 0xffffff,0x10000000,URL_SIZE-2,#editURL,0,,19,19};
-char editbox_icons[] = FROM "editbox_icons.raw";
+x94AECE, 0xffffff, 0xffffff,0x10000000,URL_SIZE-2,#editURL,0,,19,19};
 dword shared_url;
 	OpenDialog_init stdcall (#o_dialog);
+}
 void HandleParam()
 {
-	if (param) {
-		if (!strncmp(#param, "-download_and_exit ", 19)) {
-			download_and_exit = true;
-			strcpy(#downloader_edit, #param+19);
-			Downloader();
-			ExitProcess();
-		} else if (!strncmp(#param, "-download ", 10)) {
+	if (!param) {
-			strcpy(#downloader_edit, #param+10);
+		history.add(URL_SERVICE_HOMEPAGE);
-			Downloader();
-			ExitProcess();
+	} else {
-		} else if (!strncmp(#param, "-source ", 8)) {
+		if (!strncmp(#param, "-source ", 8)) {
 			source_mode = true;
 			history.add(#param + 8);
 		} else if (!strncmp(#param, "-new ", 5)) {
 			history.add(#param + 5);
 				shared_url = memopen(#webview_shared, URL_SIZE+1, SHM_OPEN + SHM_WRITE);
 				strncpy(shared_url, #param, URL_SIZE);
 				ExitProcess();
+			}
+		}
-	} else {
-		history.add(URL_SERVICE_HOMEPAGE);
+	}
 	shared_url = memopen(#webview_shared, URL_SIZE+1, SHM_CREATE + SHM_WRITE);
 	ESDWORD[shared_url] = '\0';
+}
 void main()
+{
 	int i, redirect_count=0;
-	LoadLibraries();
-	CreateDir("/tmp0/1/Downloads");
+	LoadLibraries();
 	//CreateDir("/tmp0/1/WebView_Cache");
 	HandleParam();
 	WB1.list.SetFont(8, 14, 10011000b);
 	WB1.list.no_selection = true;
 			return;
 		case VIEW_HISTORY:
 			OpenPage(URL_SERVICE_HISTORY);
 			return;
 		case DOWNLOAD_MANAGER:
-			if (!downloader_opened) {
+			EventOpenDownloader("");
-				downloader_edit = NULL;
-				CreateThread(#Downloader,#downloader_stak+4092);
-			}
 			return;
 		case UPDATE_BROWSER:
 			EventUpdateBrowser();
 			return;
 		case CLEAR_CACHE:
 		case COPY_LINK_URL:
 			Clipboard__CopyText(GetAbsoluteActiveURL());
 			notify("'URL copied to clipboard'O");
 			return;
 		case DOWNLOAD_LINK_CONTENTS:
-			if (!downloader_opened) {
-				id__ = GetAbsoluteActiveURL();
+			EventOpenDownloader( GetAbsoluteActiveURL() );
-				strcpy(#downloader_edit, id__);
-				CreateThread(#Downloader,#downloader_stak+4092);
-			}
 			return;
 		case OPEN_FILE:
 			EventOpenDialog();
 			return;
 		case SCAN_CODE_F12:
 		//CACHED PAGE
 		LoadInternalPage(cache.current_buf, cache.current_size);
 	} else if (!strncmp(#new_url,"WebView:",8)) {
 		//INTERNAL PAGE
-		if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buidin_page_home, sizeof(buidin_page_home));
+		if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buildin_page_home, sizeof(buildin_page_home));
-		else if (streq(#new_url, URL_SERVICE_HELP)) LoadInternalPage(#buidin_page_help, sizeof(buidin_page_help));
+		else if (streq(#new_url, URL_SERVICE_HELP)) LoadInternalPage(#buildin_page_help, sizeof(buildin_page_help));
 		else if (streq(#new_url, URL_SERVICE_HISTORY)) ShowHistory();
-		else LoadInternalPage(#buidin_page_error, sizeof(buidin_page_error));
+		else LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
 	} else if (!strncmp(#new_url,"http:",5)) || (!strncmp(#new_url,"https:",6)) {
 		//WEB PAGE
 		DrawOmnibox();
 		if (!http.transfer) {
 			StopLoading();
-			LoadInternalPage(#buidin_page_error, sizeof(buidin_page_error));
+			LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
+		}
 	} else {
 		//LOCAL PAGE
 			unz_id = RunProgram("/sys/unz", sprintf(#param, "-o \"/tmp0/1/temp\" -h \"%s\"", #new_url));
 			while (GetProcessSlot(unz_id)) pause(2);
 			strcpy(#new_url, "/tmp0/1/temp/word/document.xml");
+		}
 		if (!GetLocalFileData(#new_url)) {
-			LoadInternalPage(#buidin_page_error, sizeof(buidin_page_error));
+			LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
+		}
+	}
+}
+dword EventOpenDownloader(dword _url)
+{
+	//char download_params[URL_SIZE+50];
+	return RunProgram("/sys/network/dl", _url);
+}
 bool EventClickAnchor()
+		}
 	} else {
 		if (UrlExtIs(#new_url,".png")==true) || (UrlExtIs(#new_url,".jpg")==true)
 		|| (UrlExtIs(#new_url,".zip")==true) || (UrlExtIs(#new_url,".kex")==true) || (UrlExtIs(#new_url,".pdf")==true)
 		|| (UrlExtIs(#new_url,".7z")==true) {
-			if (!downloader_opened) {
-				strcpy(#downloader_edit, #new_url);
+			EventOpenDownloader(#new_url);
-				CreateThread(#Downloader,#downloader_stak+4092);
-			}
-			else notify("'WebView\nPlease, start a new download only when previous ended.'Et");
 			return;
+		}
+	}
 	OpenPage(#new_url);
+}
+	}
+}
 void LoadInternalPage(dword _bufdata, _in_bufsize){
 	if (!_bufdata) || (!_in_bufsize) {
-		LoadInternalPage(#buidin_page_error, sizeof(buidin_page_error));
+		LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
 	} else {
 		WB1.list.first = 0; //scroll page to the top
 		DrawOmnibox();
 		if(!strrchr(#editURL, '#')) {
 	dword new_size;
 	int error;
 	draw_window();
-	downloader_id = RunProgram(#program_path, #update_param);
+	downloader_id = EventOpenDownloader(#update_param);
 	do {
 		slot_n = GetProcessSlot(downloader_id);

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c – Rev 8020 → 8278