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

 #ifndef AUTOBUILD
 	#include "lang.h--"
 #endif
 //libraries
-#define MEMSIZE 1024 * 850
+#define MEMSIZE 1024 * 1000
 #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"
 #include "..\lib\patterns\toolbar_button.h"
+#include "texts.h"
 #include "cache.h"
 #include "show_src.h"
-#include "download_manager.h"
-_history history;
+#include "download_manager.h"
 #include "history.h"
+bool debug_mode = false;
 bool debug_mode = false;
-#include "..\TWB\TWB.c" //HTML Parser, a core component
-#include "texts.h"
-#include "cache.h"
+#include "..\TWB\TWB.c" //HTML Parser, a core component
+TWebBrowser WB1;
-TWebBrowser WB1;
+_history history;
-#define URL_SIZE 4000
+#include "history.h"
+#define PADDING 9
 #define SKIN_Y 24
+#define TSZE 25
-#define PADDING 9
+#define STATUSBAR_H 15
-#define SKIN_Y 24
+#define TAB_H 20
-#define TSZE 25
+dword TOOLBAR_H = PADDING+TSZE+PADDING+2;
 progress_bar wv_progress_bar;
 char stak[4096];
 proc_info Form;
+enum {
-enum {
+	NEW_TAB=600,
-	ENCODINGS=900,
+	ENCODINGS=700,
-	BACK_BUTTON=1000,
+	BACK_BUTTON=800,
 	FORWARD_BUTTON,
 	REFRESH_BUTTON,
 	GOTOURL_BUTTON,
 	CHANGE_ENCODING,
 	DOWNLOAD_MANAGER,
 	CLEAR_CACHE,
 	UPDATE_BROWSER,
 	COPY_LINK_URL,
 	DOWNLOAD_LINK_CONTENTS,
+	TAB_ID,
+	TAB_CLOSE_ID = 900
 };
+#include "tabs.h"
 char default_dir[] = "/rd/1";
 od_filter filter2 = { 16, "TXT\0HTM\0HTML\0\0" };
 			if (1==btn) ExitProcess(); else ProcessEvent(btn);
 			break;
 		case evKey:
+			GetKeys();
+			//if (key_scancode == SCAN_CODE_F1) {DebugTabs();break;}
+			if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) {
+				if (key_scancode == SCAN_CODE_TAB) {EventActivatePreviousTab();break;}
+			}
 			GetKeys();
 			if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL) {
-				if (key_scancode == SCAN_CODE_KEY_O) {EventOpenDialog();break;}
+				if (key_scancode == SCAN_CODE_KEY_O) EventOpenDialog();
-				if (key_scancode == SCAN_CODE_KEY_H) {ProcessEvent(VIEW_HISTORY);break;}
+				else if (key_scancode == SCAN_CODE_KEY_H) ProcessEvent(VIEW_HISTORY);
-				if (key_scancode == SCAN_CODE_KEY_U) {EventViewSource();break;}
+				else if (key_scancode == SCAN_CODE_KEY_U) EventViewSource();
-				if (key_scancode == SCAN_CODE_KEY_T)
+				else if (key_scancode == SCAN_CODE_KEY_T) EventOpenNewTab(URL_SERVICE_HOMEPAGE);
-				|| (key_scancode == SCAN_CODE_KEY_N) {RunProgram(#program_path, NULL);break;}
+				else if (key_scancode == SCAN_CODE_KEY_N) RunProgram(#program_path, NULL);
-				if (key_scancode == SCAN_CODE_KEY_J) {ProcessEvent(DOWNLOAD_MANAGER);break;}
+				else if (key_scancode == SCAN_CODE_KEY_J) ProcessEvent(DOWNLOAD_MANAGER);
-				if (key_scancode == SCAN_CODE_KEY_R) {ProcessEvent(REFRESH_BUTTON);break;}
+				else if (key_scancode == SCAN_CODE_KEY_R) ProcessEvent(REFRESH_BUTTON);
-				if (key_scancode == SCAN_CODE_ENTER) {EventSeachWeb();break;}
+				else if (key_scancode == SCAN_CODE_ENTER) EventSeachWeb();
-				if (key_scancode == SCAN_CODE_LEFT)  {ProcessEvent(BACK_BUTTON);break;}
+				else if (key_scancode == SCAN_CODE_LEFT)  ProcessEvent(BACK_BUTTON);
-				if (key_scancode == SCAN_CODE_RIGHT) {ProcessEvent(FORWARD_BUTTON);break;}
+				else if (key_scancode == SCAN_CODE_RIGHT) ProcessEvent(FORWARD_BUTTON);
+				else if (key_scancode == SCAN_CODE_KEY_W) EventCloseActiveTab();
+				else if (key_scancode == SCAN_CODE_TAB)   EventActivateNextTab();
-				if (key_scancode == SCAN_CODE_KEY_W) {ExitProcess();break;}
+				break;
+			}
 			if (key_scancode == SCAN_CODE_F5) ProcessEvent(REFRESH_BUTTON);
 			if (address_box.flags & ed_focus)
-			{
-				if (key_scancode == SCAN_CODE_ENTER) {
+			{
-					ProcessEvent(key_scancode);
+				if (key_scancode == SCAN_CODE_ENTER) {
 					ProcessEvent(key_scancode);
-				else {
+				} else {
-					EAX = key_editbox;
-					edit_box_key stdcall(#address_box);
+					EAX = key_editbox;
-				}
 					edit_box_key stdcall(#address_box);
 			else
 			} else {
 				#define KEY_SCROLL_N 11
 				if (SCAN_CODE_UP   == key_scancode) for (i=0;i
 				if (SCAN_CODE_DOWN == key_scancode) for (i=0;i
 				if (key_scancode == SCAN_CODE_F6) {address_box.flags=ed_focus; DrawOmnibox();}
 				if (WB1.list.ProcessKey(key_scancode)) WB1.DrawPage();
 				else ProcessEvent(key_scancode);
 			}
 			break;
 		case evReDraw:
-			DefineAndDrawWindow(GetScreenWidth()-800/2-random(80),
+			DefineAndDrawWindow(40, //GetScreenWidth()-800/2-random(80),
 				GetScreenHeight()-700/2-random(80),800,700,0x73,0,0,0);
+}
 void SetElementSizes()
+{
 	address_box.width = Form.cwidth - address_box.left - 52 - 16;
-	WB1.list.SetSizes(0, TOOLBAR_H, Form.width - 10 - scroll_wv.size_x,
+	WB1.list.SetSizes(0, TOOLBAR_H+TAB_H, Form.width - 10 - scroll_wv.size_x,
-		Form.cheight - TOOLBAR_H - STATUSBAR_H, BASIC_LINE_H);
+		Form.cheight - TOOLBAR_H - STATUSBAR_H - TAB_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;
+	}
 	SetElementSizes();
 	DrawBar(0,0, Form.cwidth,PADDING, system.color.work);
 	DrawBar(0,PADDING+TSZE+1, Form.cwidth,PADDING-1, system.color.work);
-	DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, system.color.work_dark);
+	DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, MixColors(system.color.work_dark, system.color.work, 180));
 	DrawBar(0,TOOLBAR_H-1, Form.cwidth,1, system.color.work_graph);
 	DrawBar(0, PADDING, address_box.left-2, TSZE+1, system.color.work);
 	DrawBar(address_box.left+address_box.width+18, PADDING, Form.cwidth-address_box.left-address_box.width-18, TSZE+1, system.color.work);
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, system.color.work_graph);
 	DrawRectangle(WB1.list.x + WB1.list.w, WB1.list.y, scroll_wv.size_x,
+		WB1.list.h-1, scroll_wv.bckg_col);
+	if (!BrowserWidthChanged()) {
+		WB1.DrawPage();
+		DrawOmnibox();
+	}
+	DrawProgress();
+	DrawStatusBar(NULL);
+	DrawTabsBar();
+}
+bool BrowserWidthChanged()
-		WB1.list.h-1, scroll_wv.bckg_col);
+{
+	dword source_mode_holder;
-	if (WB1.list.w!=WB1.DrawBuf.bufw) {
+	if (WB1.list.w!=DrawBuf.bufw) {
-		WB1.DrawBuf.Init(WB1.list.x, WB1.list.y, WB1.list.w, 400*20);
+		DrawBuf.Init(WB1.list.x, WB1.list.y, WB1.list.w, 400*20);
 		if (!strncmp(history.current(),"http",4)) {
 			//nihuya ne izyashnoe reshenie, no pust' poka butet tak
-			i=source_mode;
+			source_mode_holder = source_mode;
 			LoadInternalPage(#loading_text, sizeof(loading_text));
-			source_mode=i;
+			source_mode = source_mode_holder;
-		}
-		OpenPage(history.current());
-	} else {
+		}
-		WB1.DrawPage();
+		OpenPage(history.current());
-		DrawOmnibox();
+		return true;
-	}
 	DrawProgress();
+	return false;
 	DrawStatusBar(NULL);
 void EventChangeEncodingAndLoadPage(int _new_encoding)
+{
 		case GOTOURL_BUTTON:
 		case SCAN_CODE_ENTER:
 			EventSubmitOmnibox();
 			return;
 		case REFRESH_BUTTON:
-			if (http.transfer > 0) {
+			if (http.transfer) {
 				StopLoading();
 				draw_window();
 			} else {
 				OpenPage(history.current());
+			}
 		case SCAN_CODE_F12:
 			debug_mode ^= 1;
 			if (debug_mode) notify("'Debug mode ON'-I");
 			else notify("'Debug mode OFF'-I");
 			return;
+		case NEW_TAB:
+			if (http.transfer) break;
+			EventOpenNewTab(URL_SERVICE_HOMEPAGE);
+			return;
+		case TAB_ID...TAB_ID+TABS_MAX:
+			if (http.transfer) break;
+			if (mouse.mkm) {
+				EventTabClose(id__ - TAB_ID);
+			} else {
+				EventTabClick(id__ - TAB_ID);
+			}
+			return;
+		case TAB_CLOSE_ID...TAB_CLOSE_ID+TABS_MAX:
+			EventTabClose(id__ - TAB_CLOSE_ID);
+			return;
+	}
+}
 void StopLoading()
+{
 	char new_url[URL_SIZE+1];
+	StopLoading();
-	StopLoading();
+	if (open_new_tab) {
+		open_new_tab = false;
+		EventOpenNewTab(_open_URL);
+		return;
-	strcpy(#editURL, _open_URL);
+	}
 	address_box.flags=0;
-	DrawOmnibox();
+	SetOmniboxText(_open_URL);
 	if (!strncmp(_click_URL,"mailto:", 7)) || (!strncmp(_click_URL,"tel:", 4)) {
 		notify(_click_URL);
 		return;
+	}
-	if (http.transfer > 0) {
+	if (http.transfer) {
 		StopLoading();
 		history.back();
+	}
 			strcat(#editURL, #anchors.current);
 			DrawOmnibox();
+		}
 		WB1.ParseHtml(_bufdata, _in_bufsize);
 		DrawStatusBar(NULL);
+		DrawActiveTab();
 		if (source_mode) {
 			source_mode = false;
 			ShowSource(WB1.bufpointer, _in_bufsize);
 		} else {
 			WB1.DrawPage();
+}
 void EventViewSource()
+{
 	char source_view_param[URL_SIZE+1];
-	strcpy(#source_view_param, "-source ");
+	//strcpy(#source_view_param, "-source ");
-	strncat(#source_view_param, history.current(), URL_SIZE);
+	//strncat(#source_view_param, history.current(), URL_SIZE);
+	//RunProgram(#program_path, #source_view_param);
+	source_mode = true;
-	RunProgram(#program_path, #source_view_param);
+	EventOpenNewTab(history.current());
+}
 dword GetFileSize(dword _path)
 	DefineHiddenButton(address_box.left+address_box.width-1, address_box.top-2, 17, skin.h-3, REFRESH_BUTTON);
 	DrawProgress();
+}
+void SetOmniboxText(dword _text)
+{
+	strcpy(#editURL, _text);
+	address_box.flags=0;
+	DrawOmnibox();
+}

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c – Rev 7770 → 7771