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

 #include "..\lib\obj\libio.h"
 #include "..\lib\obj\libimg.h"
 #include "..\lib\obj\http.h"
 #include "..\lib\obj\iconv.h"
 #include "..\lib\obj\proc_lib.h"
+#include "..\lib\obj\netcode.h"
 //useful patterns
 #include "..\lib\patterns\history.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";
-char version[]="WebView 2.7e";
+char version[]="WebView 2.8 ALPHA PREVIEW";
+#include "texts.h"
-#include "texts.h"
+#include "cache.h"
-#include "cache.h"
+#include "show_src.h"
 #include "show_src.h"
 bool debug_mode = false;
 _history history;
 enum { TARGET_SAME_TAB, TARGET_NEW_WINDOW, TARGET_NEW_TAB };
 _http http = 0;
 bool source_mode = false;
-progress_bar wv_progress_bar;
+progress_bar prbar;
-	load_dll(boxlib,    #box_lib_init,0);
+	load_dll(boxlib,      #box_lib_init,0);
-	load_dll(libio,     #libio_init,1);
+	load_dll(libio,       #libio_init,1);
-	load_dll(libimg,    #libimg_init,1);
+	load_dll(libimg,      #libimg_init,1);
-	load_dll(libHTTP,   #http_lib_init,1);
+	load_dll(libHTTP,     #http_lib_init,1);
-	load_dll(iconv_lib, #iconv_open,0);
+	load_dll(iconv_lib,   #iconv_open,0);
+	load_dll(netcode_lib, #base64_encode,0);
-	load_dll(Proc_lib,  #OpenDialog_init,0);
+	load_dll(Proc_lib,    #OpenDialog_init,0);
 	OpenDialog_init stdcall (#o_dialog);
+}
 			mouse.get();
 			if (WB1.list.MouseScroll(mouse.vert)) WB1.DrawPage();
 			scrollbar_v_mouse (#scroll_wv);
-			if (scroll_wv.delta) {
+			if (scroll_wv.delta2) {
 				WB1.list.first = scroll_wv.position;
 				WB1.DrawPage();
 				break;
+			}
 			if (links.hover(WB1.list.y, WB1.list.first))
+			{
-				if (mouse.mkm) {
+				if (mouse.key&MOUSE_MIDDLE) && (mouse.up) {
 					if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) {
 						EventClickLink(TARGET_NEW_WINDOW);
 					} else {
 						EventClickLink(TARGET_NEW_TAB);
+					}
+				}
-				if (mouse.lkm) {
+				if (mouse.key&MOUSE_LEFT) && (mouse.up) {
 					CursorPointer.Restore();
 					EventClickLink(TARGET_SAME_TAB);
+				}
-				if (mouse.pkm) {
+				if (mouse.key&MOUSE_RIGHT) && (mouse.up) {
 					CursorPointer.Restore();
 					EventShowLinkMenu();
 				}
 			} else {
 				CursorPointer.Restore();
-				if (mouse.pkm) && (WB1.list.MouseOver(mouse.x, mouse.y)) {
+				if (mouse.key&MOUSE_RIGHT) && (mouse.up) && (WB1.list.MouseOver(mouse.x, mouse.y)) {
 					EventShowPageMenu();
 					cache.add(history.current(), http.content_pointer, http.content_received, PAGE);
 					LoadInternalPage(http.content_pointer, http.content_received);
+				}
 				else if (http_get_type==IMG) {
 					cache.add(WB1.page_img.current_url(), http.content_pointer, http.content_received, IMG);
-					WB1.page_img.set_size(http.content_pointer, http.content_received);
+					WB1.page_img.set_size(WB1.page_img.getid, http.content_pointer, http.content_received);
 					GetImg();
+				}
+			}
 			break;
 		default:
 		case IN_NEW_WINDOW:    EventClickLink(TARGET_NEW_WINDOW); return;
 		case COPY_LINK_URL:    EventCopyLinkToClipboard(); return;
 		case DOWNLOAD_LINK_CT: EventOpenDownloader( GetAbsoluteActiveURL() ); return;
 		case OPEN_FILE:        EventOpenDialog(); return;
 		case SCAN_CODE_F12:    EventToggleDebugMode(); return;
+		case SCAN_CODE_F11:    show_images^=1; return;
+	}
+}
 void EventToggleDebugMode()
+}
 void EventEditSource()
+{
 	if (check_is_the_adress_local(history.current())) {
-		RunProgram("/rd/1/tinypad", history.current());
+		RunProgram("/rd/1/quark", history.current());
 	} else {
 		CreateFile(WB1.bufsize, WB1.bufpointer, "/tmp0/1/WebView_tmp.htm");
-		if (!EAX) RunProgram("/rd/1/tinypad", "/tmp0/1/WebView_tmp.htm");
+		if (!EAX) RunProgram("/rd/1/quark", "/tmp0/1/WebView_tmp.htm");
+	}
+}
+}
 void StopLoading()
+{
 	if (http.stop()) pause(10);
-	wv_progress_bar.value = 0;
+	prbar.value = 0;
 	DrawOmnibox();
+}
+	}
 	free(data);
 	return true;
+}
+void GetUrl(dword _http_url)
+{
+	char new_url_full[URL_SIZE+1];
+	if (!strncmp(_http_url,"http:",5)) {
+		http.get(_http_url);
+	} else if (!strncmp(_http_url,"https://",8)) {
+		strcpy(#new_url_full, "http://gate.aspero.pro/?site=");
+		strncat(#new_url_full, _http_url, URL_SIZE);
+		http.get(#new_url_full);
+	}
+}
 void OpenPage(dword _open_URL)
+{
-	char new_url[URL_SIZE+1];
-	char new_url_full[URL_SIZE+1];
+	char new_url[URL_SIZE+1];
 	int unz_id;
 		if (ReplaceSpaceInUrl(#new_url, URL_SIZE)) {
 			strcpy(#editURL, #new_url);
+		}
-		http_get_type = PAGE;
-		if (!strncmp(#new_url,"http:",5)) {
+		http_get_type = PAGE;
-			http.get(#new_url);
-		} else if (!strncmp(#new_url,"https://",8)) {
-			strcpy(#new_url_full, "http://gate.aspero.pro/?site=");
-			strncat(#new_url_full, #new_url, URL_SIZE);
-			http.get(#new_url_full);
 		GetUrl(#new_url);
 		DrawOmnibox();
 			WB1.custom_encoding = CH_CP866;
 			ShowSource(WB1.bufpointer, _in_bufsize);
 		} else {
 			WB1.DrawPage();
+		}
-		//GetImg();
+		GetImg();
+	}
+}
 bool UrlExtIs(dword base, ext)
 	return false;
+}
 void DrawProgress()
 {
-	dword persent;
+	dword pct;
-	if (http.transfer == 0) return;
+	if (!http.transfer) return;
-	if (wv_progress_bar.max) {
+	if (http_get_type==PAGE) && (prbar.max) pct = prbar.value*30/prbar.max; else pct = 10;
-		persent = wv_progress_bar.value*100/wv_progress_bar.max;
-	} else {
-		persent = 10;
-	}
+	if (http_get_type==IMG) pct = WB1.page_img.getid * 70 / WB1.page_img.url.count + 30;
-	DrawBar(address_box.left-1, address_box.top+20, persent*address_box.width+16/100, 2, 0x72B7EB);
+	DrawBar(address_box.left-1, address_box.top+20, pct*address_box.width+16/100, 2, 0x72B7EB);
+}
 void EventShowPageMenu()
+	}
+}
 void EventUpdateProgressBar()
 {
-	wv_progress_bar.max = http.content_length;
+	prbar.max = http.content_length;
-	if (wv_progress_bar.value != http.content_received)
+	if (prbar.value != http.content_received)
 	{
-		wv_progress_bar.value = http.content_received;
+		prbar.value = http.content_received;
 		DrawProgress();
+	}
+}
 void HandleRedirect()
+{
 	char redirect_url[URL_SIZE];
 	http.header_field("location", #redirect_url, URL_SIZE);
 	get_absolute_url(#redirect_url, history.current());
-	history.back();
+	if (http_get_type==PAGE) history.back();
 	http.hfree();
 	if (http_get_type==PAGE) OpenPage(#redirect_url);
-	else if (http_get_type==IMG) http.get(#redirect_url);
+	else if (http_get_type==IMG) GetUrl(#redirect_url);
+}
 dword GetImg()
+{
 	if (!show_images) return;
+	while (WB1.page_img.next_url()) {
-	while (WB1.page_img.next_url()) {
+		DrawProgress();
 		if (cache.has(WB1.page_img.current_url())) continue;
 		http_get_type = IMG;
-		http.get(WB1.page_img.current_url());
+		GetUrl(WB1.page_img.current_url());
 		return;
+	}
+	DrawOmnibox();
-	DrawOmnibox();
+	WB1.ParseHtml(WB1.o_bufpointer, WB1.bufsize);
 	WB1.DrawPage();
+}

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c – Rev 8320 → 8330