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

 //Copyright 2007-2020 by Veliant & Leency
 //Asper, lev, Lrz, Barsuk, Nable, hidnplayr...
-//Licence restriction: compiling this app for WIN32 is forbidden.
 #ifndef AUTOBUILD
 	#include "lang.h--"
 #endif
 #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"
+#define URL_SIZE 4000
+char version[]="WebView 2.65";
 #include "texts.h"
 #include "cache.h"
 #include "show_src.h"
 	DOWNLOAD_LINK_CONTENTS,
 	TAB_ID,
 	TAB_CLOSE_ID = 900
 };
+_history history;
 enum { TARGET_SAME_TAB, TARGET_NEW_WINDOW, TARGET_NEW_TAB };
-#include "..\TWB\TWB.c" //HTML Parser, a core component
 #include "..\TWB\TWB.c" //HTML Parser, a core component
 TWebBrowser WB1;
-_history history;
+TWebBrowser WB1;
 #include "history.h"
-#define PADDING 9
-#define TSZE 25
-#define STATUSBAR_H 15
-#define TAB_H 20
-dword TOOLBAR_H = PADDING+TSZE+PADDING+2;
+#define PADDING 9
 #define TSZE 25
-#define URL_SIZE 4000
+#define STATUSBAR_H 15
 char editbox_icons[] = FROM "editbox_icons.raw";
+dword shared_url;
-dword shared_url;
+dword http_get_type;
 void LoadLibraries()
+{
+				}
+			}
 			break;
 		case evButton:
-			ProcessEvent( GetButtonID() );
+			ProcessEvent( @GetButtonID() );
 			break;
 					redirect_count++;
 					http.handle_redirect();
 					http.free();
 					GetAbsoluteURL(#http.redirect_url, history.current());
 					history.back();
-					OpenPage(#http.redirect_url);
+					if (http_get_type==PAGE) OpenPage(#http.redirect_url);
+					else if (http_get_type==IMG) http.get(#http.redirect_url);
 				} else {
 					notify("'Too many redirects.' -E");
 					StopLoading();
 					redirect_count = 0;
+				}
 			} else {
 				// Loading the page is complete, free resources
 				redirect_count = 0;
 				http.free();
+				if (http_get_type==PAGE) {
-				pages_cache.add(history.current(), http.content_pointer, http.content_received);
+					cache.add(history.current(), http.content_pointer, http.content_received, PAGE);
-				LoadInternalPage(http.content_pointer, http.content_received);
+					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_data(cache.data.get_last(), http.content_received);
+					GetImg();
+				}
+			}
 			break;
 		default:
 			if (ESDWORD[shared_url] != '\0') {
 				EventOpenNewTab(shared_url);
 				ESDWORD[shared_url] = '\0';
 bool ProcessCtrlKeyEvent()
+{
 	if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL) switch(key_scancode)
 	{
-		case SCAN_CODE_KEY_O:
-			EventOpenDialog();
-			return true;
-		case SCAN_CODE_KEY_H:
+		case SCAN_CODE_KEY_O: EventOpenDialog(); return true;
-			ProcessEvent(VIEW_HISTORY);
-			return true;
+		case SCAN_CODE_KEY_H: ProcessEvent(VIEW_HISTORY); return true;
-		case SCAN_CODE_KEY_U:
-			EventViewSource();
-			return true;
-		case SCAN_CODE_KEY_T:
+		case SCAN_CODE_KEY_U: EventViewSource(); return true;
-			EventOpenNewTab(URL_SERVICE_HOMEPAGE);
-			return true;
-		case SCAN_CODE_KEY_N:
+		case SCAN_CODE_KEY_T: EventOpenNewTab(URL_SERVICE_HOMEPAGE); return true;
-			RunProgram(#program_path, NULL);
-			return true;
-		case SCAN_CODE_KEY_J:
+		case SCAN_CODE_KEY_N: RunProgram(#program_path, NULL); return true;
-			ProcessEvent(DOWNLOAD_MANAGER);
-			return true;
-		case SCAN_CODE_KEY_R:
+		case SCAN_CODE_KEY_J: ProcessEvent(DOWNLOAD_MANAGER); return true;
-			ProcessEvent(REFRESH_BUTTON);
-			return true;
+		case SCAN_CODE_KEY_R: ProcessEvent(REFRESH_BUTTON); return true;
-		case SCAN_CODE_ENTER:
-			EventSeachWeb();
-			return true;
-		case SCAN_CODE_LEFT:
+		case SCAN_CODE_ENTER: EventSeachWeb(); return true;
-			 ProcessEvent(BACK_BUTTON);
-			 return true;
-		case SCAN_CODE_RIGHT:
+		case SCAN_CODE_LEFT:  ProcessEvent(BACK_BUTTON); return true;
-			ProcessEvent(FORWARD_BUTTON);
-			return true;
-		case SCAN_CODE_KEY_W:
+		case SCAN_CODE_RIGHT: ProcessEvent(FORWARD_BUTTON); return true;
-			EventCloseActiveTab();
-			return true;
-		case SCAN_CODE_TAB:
+		case SCAN_CODE_KEY_W: EventCloseActiveTab(); return true;
-			EventActivateNextTab();
+		case SCAN_CODE_TAB:   EventActivateNextTab(); return true;
-			return true;
+		default: return false;
-	}
 	return false;
+}
 void SetElementSizes()
 			return;
 		case UPDATE_BROWSER:
 			EventUpdateBrowser();
 			return;
 		case CLEAR_CACHE:
-			pages_cache.clear();
+			cache.clear();
 			notify(#clear_cache_ok);
 			EventRefreshPage();
 			return;
 		case IN_NEW_TAB:
 			EventClickLink(TARGET_NEW_TAB);
 	- local file
 	So we need to detect what incoming address is
 	and then halndle it in the propper way.
 	*/
-	if (pages_cache.has(#new_url)) {
+	if (cache.has(#new_url)) {
 		//CACHED PAGE
-		LoadInternalPage(pages_cache.current_page_buf, pages_cache.current_page_size);
+		LoadInternalPage(cache.current_buf, cache.current_size);
 	} else if (!strncmp(#new_url,"WebView:",8)) {
 		//INTERNAL PAGE
 		//WEB PAGE
 		if (ReplaceSpaceInUrl(#new_url, URL_SIZE)) {
 			strcpy(#editURL, #new_url);
+		}
 		http_get_type = PAGE;
 		if (!strncmp(#new_url,"http:",5)) {
 			http.get(#new_url);
 		} else if (!strncmp(#new_url,"https://",8)) {
 			strcpy(#new_url_full, "http://gate.aspero.pro/?site=");
 			WB1.custom_encoding = CH_CP866;
 			ShowSource(WB1.bufpointer, _in_bufsize);
 		} else {
 			WB1.DrawPage();
+		}
+		//GetImg();
+	}
+}
 bool UrlExtIs(dword base, ext)
 	DrawBar(0,Form.cheight - STATUSBAR_H+1, Form.cwidth,STATUSBAR_H-1, sc.work);
 	if (links.active_url) {
 		ESI = math.min(status_w/6, strlen(links.active_url));
 		WriteText(10, status_y, 0, sc.work_text, links.active_url);
+	}
+	if (http.transfer>0) && (http_get_type==IMG) {
+		//
+	}
 	DefineHiddenButton(status_w+20, status_y-3, 60, 12, CHANGE_ENCODING);
 	WriteTextCenter(status_w+20, status_y, 60, sc.work_text, WB1.cur_encoding*10+#charsets);
+}
 		return #abs_url;
+	}
 	return 0;
+}
+dword GetImg()
+{
+	while (WB1.page_img.next_url()) {
+		if (cache.has(WB1.page_img.current_url())) continue;
+		http_get_type = IMG;
+		http.get(WB1.page_img.current_url());
+		return;
+	}
+	DrawOmnibox();
+	WB1.DrawPage();
+}
 stop:

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c @ 7606 – Rev 7987 → 8016