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

 	DOWNLOAD_LINK_CONTENTS,
 	TAB_ID,
 	TAB_CLOSE_ID = 900
 };
+enum { TARGET_SAME_TAB, TARGET_NEW_WINDOW, TARGET_NEW_TAB };
 #include "..\TWB\TWB.c" //HTML Parser, a core component
 			strcpy(#downloader_edit, #param+19);
 			Downloader();
 			ExitProcess();
 		} else if (!strncmp(#param, "-download ", 10)) {
 			strcpy(#downloader_edit, #param+10);
-			//CreateThread(#Downloader,#downloader_stak+4092);
 			Downloader();
 			ExitProcess();
 		} else if (!strncmp(#param, "-source ", 8)) {
 			source_mode = true;
 			history.add(#param + 8);
 	ESDWORD[shared_url] = '\0';
+}
 void main()
 {
-	int i, btn, redirect_count=0;
+	int i, redirect_count=0;
 	LoadLibraries();
 	CreateDir("/tmp0/1/Downloads");
 	//CreateDir("/tmp0/1/WebView_Cache");
 	HandleParam();
 	loop() switch(@WaitEventTimeout(30))
+	{
 		case evMouse:
 			edit_box_mouse stdcall (#address_box);
 			mouse.get();
-			PageLinks.HoverAndProceed(mouse.x, WB1.list.first + mouse.y, WB1.list.y, WB1.list.first);
-			if (PageLinks.active == -1) && (mouse.pkm) && (mouse.up) {
-				if (WB1.list.MouseOver(mouse.x, mouse.y)) EventShowPageMenu();
-				break;
-			}
 			if (WB1.list.MouseScroll(mouse.vert)) WB1.DrawPage();
 			scrollbar_v_mouse (#scroll_wv);
-			if (WB1.list.first != scroll_wv.position)
+			if (scroll_wv.delta) {
-			{
 				WB1.list.first = scroll_wv.position;
 				WB1.DrawPage();
 				break;
+			}
-			if (mouse.up) && (! address_box.flags & ed_focus) && (address_box.flags & ed_shift_bac)
+			if (links.hover(WB1.list.y, WB1.list.first))
+			{
+				if (mouse.mkm) {
+					if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) {
-				DrawOmnibox(); //reset text selection
+						EventClickLink(TARGET_NEW_WINDOW);
+					} else {
+						EventClickLink(TARGET_NEW_TAB);
+					}
+				}
+				if (mouse.lkm) {
+					CursorPointer.Restore();
+					EventClickLink(TARGET_SAME_TAB);
+				}
+				if (mouse.pkm) {
+					CursorPointer.Restore();
+					EventShowLinkMenu();
+				}
+			} else {
+				CursorPointer.Restore();
+				if (mouse.pkm) && (WB1.list.MouseOver(mouse.x, mouse.y)) {
+					EventShowPageMenu();
+				}
+			}
 			break;
 		case evButton:
-			btn = GetButtonID();
-			if (1==btn) ExitProcess(); else ProcessEvent(btn);
+			ProcessEvent( GetButtonID() );
 			break;
-		case evKey:
-			GetKeys();
+		case evKey:
-			//if (key_scancode == SCAN_CODE_F1) {DebugTabs();break;}
+			GetKeys();
 	if (!BrowserWidthChanged()) {
 		WB1.DrawPage();
 		DrawOmnibox();
+	}
 	DrawProgress();
-	DrawStatusBar(NULL);
+	DrawStatusBar();
 	DrawTabsBar();
+}
 bool BrowserWidthChanged()
+}
-void ProcessEvent(dword id__)
 void ProcessEvent(dword id__)
 	char new_clip_url[URL_SIZE+1];
+	switch (id__)
+	{
+		case 1:
-	switch (id__)
+			ExitProcess();
 			break;
 		case ENCODINGS...ENCODINGS+6:
 			EventChangeEncodingAndLoadPage(id__-ENCODINGS);
 			return;
 			pages_cache.clear();
 			notify(#clear_cache_ok);
 			EventRefreshPage();
 			return;
 		case IN_NEW_TAB:
-			open_new_tab = true;
-			EventClickLink(PageLinks.GetURL(PageLinks.active));
+			EventClickLink(TARGET_NEW_TAB);
-			open_new_tab = false;
 			return;
 		case IN_NEW_WINDOW:
-			open_new_window = true;
-			EventClickLink(PageLinks.GetURL(PageLinks.active));
+			EventClickLink(TARGET_NEW_WINDOW);
-			open_new_window = false;
 			return;
 		case COPY_LINK_URL:
-			strncpy(#new_clip_url, PageLinks.GetURL(PageLinks.active), URL_SIZE);
-			GetAbsoluteURL(#new_clip_url, history.current());
-			Clipboard__CopyText(#new_clip_url);
+			Clipboard__CopyText(GetAbsoluteActiveURL());
 			notify("'URL copied to clipboard'O");
 			return;
 		case DOWNLOAD_LINK_CONTENTS:
 			if (!downloader_opened) {
-				strcpy(#downloader_edit, PageLinks.GetURL(PageLinks.active));
+				strcpy(#downloader_edit, GetAbsoluteActiveURL());
-				GetAbsoluteURL(#downloader_edit, history.current());
 				CreateThread(#Downloader,#downloader_stak+4092);
+			}
 			return;
 		case OPEN_FILE:
 			EventOpenDialog();
+}
 void OpenPage(dword _open_URL)
+{
+	char new_url[URL_SIZE+1];
-	char new_url[URL_SIZE+1];
+	char new_url_full[URL_SIZE+1];
 	int unz_id;
-	StopLoading();
-	if (open_new_tab) {
-		open_new_tab = false;
-		EventOpenNewTab(_open_URL);
 		return;
 	StopLoading();
 	SetOmniboxText(_open_URL);
+	strncpy(#new_url, _open_URL, URL_SIZE);
-	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
-	//Exclude # from the URL to the load page
+	if (strrchr(#new_url, '#')) {
+		}
 		if (!strncmp(#new_url,"http:",5)) {
 			http.get(#new_url);
 		} else if (!strncmp(#new_url,"https://",8)) {
-			strcpy(#new_url, "http://gate.aspero.pro/?site=");
+			strcpy(#new_url_full, "http://gate.aspero.pro/?site=");
-			strncat(#new_url, _open_URL, URL_SIZE);
+			strncat(#new_url_full, #new_url, URL_SIZE);
-			http.get(#new_url);
+			http.get(#new_url_full);
+		}
 			LoadInternalPage(#page_not_found, sizeof(page_not_found));
+		}
+	}
+}
+bool EventClickAnchor()
+{
+	dword aURL = links.active_url;
+	if (anchors.get_pos_by_name(aURL+1)!=-1) {
+		WB1.list.first = anchors.get_pos_by_name(aURL+1);
+		//WB1.list.CheckDoesValuesOkey();
+		strcpy(#editURL, history.current());
+		strcat(#editURL, aURL);
+		DrawOmnibox();
+		WB1.DrawPage();
+		return true;
+	}
+	return false;
+}
-void EventClickLink(dword _click_URL)
+void EventClickLink(dword _target)
+{
 	char new_url[URL_SIZE+1];
+	char new_url_full[URL_SIZE+1];
+	dword aURL = GetAbsoluteActiveURL();
-	char new_url_full[URL_SIZE+1];
+	if (!aURL) return;
-	if (open_new_window) {
+	strcpy(#new_url, aURL);
-		strncpy(#new_url, _click_URL, sizeof(new_url));
-		GetAbsoluteURL(#new_url, history.current());
-		strcpy(#new_url_full, "-new ");
+	if (ESBYTE[aURL]=='#') {
-		strncat(#new_url_full, #new_url, sizeof(new_url_full));
+		if (_target == TARGET_SAME_TAB) {
+			EventClickAnchor();
+			return;
+		} else {
+			strcpy(#new_url, history.current());
-		RunProgram(#program_path, #new_url_full);
+			strcat(#new_url, aURL);
-		return;
+		}
 	}
-	if (ESBYTE[_click_URL]=='#') {
-		if (anchors.get_pos_by_name(_click_URL+1)!=-1) {
+	if (_target == TARGET_NEW_TAB) {
+		EventOpenNewTab(#new_url);
-			WB1.list.first = anchors.get_pos_by_name(_click_URL+1);
+		return;
-			WB1.list.CheckDoesValuesOkey();
+	}
-		}
-		strcpy(#editURL, history.current());
+	if (_target == TARGET_NEW_WINDOW) {
-		strcat(#editURL, _click_URL);
+		strcpy(#new_url_full, "-new ");
-		DrawOmnibox();
+		strncat(#new_url_full, #new_url, URL_SIZE);
-		WB1.DrawPage();
+		RunProgram(#program_path, #new_url_full);
 		return;
+	}
-	if (!strncmp(_click_URL,"mailto:", 7)) || (!strncmp(_click_URL,"tel:", 4)) {
+	if (!strncmp(#new_url,"mailto:", 7)) || (!strncmp(#new_url,"tel:", 4)) {
-		notify(_click_URL);
+		notify(#new_url);
 		return;
+	}
-	if (http.transfer) {
-		StopLoading();
 		history.back();
 	if (http.transfer) {
 		StopLoading();
-	strcpy(#new_url, _click_URL);
+		history.back();
 	GetAbsoluteURL(#new_url, history.current());
 	if (!strncmp(#editURL,"http:",5)) || (editURL[0]=='/')
 	|| (!strncmp(#editURL,"https:",6)) || (!strncmp(#editURL,"WebView:",8)) {
 		OpenPage(#editURL);
 	} else {
 		strcpy(#new_url, "http://");
-		strncat(#new_url, #editURL, sizeof(new_url)-1);
+		strncat(#new_url, #editURL, URL_SIZE-1);
 		OpenPage(#new_url);
+	}
+}
 		if(!strrchr(#editURL, '#')) {
 			strcat(#editURL, #anchors.current);
 			DrawOmnibox();
+		}
 		WB1.ParseHtml(_bufdata, _in_bufsize);
-		DrawStatusBar(NULL);
+		DrawStatusBar();
 		DrawActiveTab();
 		if (source_mode) {
 			source_mode = false;
 			WB1.custom_encoding = CH_CP866;
 			ShowSource(WB1.bufpointer, _in_bufsize);
 	menu_id = OPEN_FILE;
+}
 void EventShowEncodingsList()
 {
-	open_lmenu(Form.left + Form.cwidth, Form.top + skin_height + status_text.start_y + 8,
+	open_lmenu(Form.left + Form.cwidth, Form.top + skin_height + Form.cheight - STATUSBAR_H + 12,
 		MENU_ALIGN_BOT_RIGHT, WB1.cur_encoding + 1, "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866");
 	menu_id = ENCODINGS;
+}
 		RunProgram(#program_path, history.current());
 		ExitProcess();
+	}
+}
-void DrawStatusBar(dword _status_text)
+void DrawStatusBar()
-{
-	status_text.font_color = sc.work_text;
-	status_text.start_x = 10;
+{
-	status_text.start_y = Form.cheight - STATUSBAR_H + 4;
+	dword status_y = Form.cheight - STATUSBAR_H + 4;
-	status_text.area_size_x = Form.cwidth - status_text.start_x -3 - 70;
-	//DrawBar(status_text.start_x, status_text.start_y, status_text.area_size_x, 9, sc.work);
+	dword status_w = Form.cwidth - 90;
 	DrawBar(0,Form.cheight - STATUSBAR_H+1, Form.cwidth,STATUSBAR_H-1, sc.work);
-	if (_status_text) {
-		status_text.text_pointer = _status_text;
+	if (links.active_url) {
-		PathShow_prepare stdcall(#status_text);
+		ESI = math.min(status_w/6, strlen(links.active_url));
-		PathShow_draw stdcall(#status_text);
+		WriteText(10, status_y, 0, sc.work_text, links.active_url);
 	}
-	DefineHiddenButton(status_text.start_x+status_text.area_size_x+10, status_text.start_y-3,
-, 12, CHANGE_ENCODING);
-	WriteTextCenter(status_text.start_x+status_text.area_size_x+10,
+	DefineHiddenButton(status_w+20, status_y-3, 60, 12, CHANGE_ENCODING);
-		status_text.start_y, 60, sc.work_text, WB1.cur_encoding*10+#charsets);
+	WriteTextCenter(status_w+20, status_y, 60, sc.work_text, WB1.cur_encoding*10+#charsets);
+}
 void DrawOmnibox()
 	strcpy(#editURL, _text);
 	address_box.flags=0;
 	DrawOmnibox();
+}
+dword GetAbsoluteActiveURL()
+{
+	char abs_url[URL_SIZE];
+	if (links.active_url) {
+		strncpy(#abs_url, links.active_url, URL_SIZE);
+		GetAbsoluteURL(#abs_url, history.current());
+		return #abs_url;
+	}
+	return 0;
+}

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c – Rev 7945 → 7970