From af014bce99d4990f1a0cbb1a779127de0f716a90 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 10 Feb 2014 14:08:45 +0000 Subject: Allow tab creation without history clone. Changes browser_window_create and browser_window_navigate flags. --- riscos/dialog.c | 3 +-- riscos/gui.c | 14 +++++--------- riscos/gui/url_bar.c | 4 ++-- riscos/iconbar.c | 7 ++----- riscos/uri.c | 3 +-- riscos/url_complete.c | 4 ++-- riscos/url_protocol.c | 3 +-- riscos/window.c | 43 +++++++++++++++++++------------------------ 8 files changed, 33 insertions(+), 48 deletions(-) (limited to 'riscos') diff --git a/riscos/dialog.c b/riscos/dialog.c index 434702384..d259c8771 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -775,8 +775,7 @@ bool ro_gui_dialog_openurl_apply(wimp_w w) { error = nsurl_create(url2, &url); free(url2); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, diff --git a/riscos/gui.c b/riscos/gui.c index 83add251f..e3826353d 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -941,8 +941,7 @@ static void gui_init2(int argc, char** argv) errorns = nsurl_create(url, &urlns); if (errorns == NSERROR_OK) { - errorns = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + errorns = browser_window_create(BW_CREATE_HISTORY, urlns, NULL, NULL, @@ -1516,8 +1515,8 @@ void ro_msg_dataload(wimp_message *message) error = browser_window_navigate(g->bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -1529,9 +1528,7 @@ void ro_msg_dataload(wimp_message *message) ro_gui_hotlist_url_drop(message, urltxt); #endif } else { - error = browser_window_create( - BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -1906,8 +1903,7 @@ void ro_msg_dataopen(wimp_message *message) free(url); if (error == NSERROR_OK) { /* create a new window with the file */ - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, urlns, NULL, NULL, diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index 304a6bf20..18bcb31fa 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -857,8 +857,8 @@ bool ro_gui_url_bar_menu_select(struct url_bar *url_bar, wimp_i i, browser_window_navigate(g->bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); diff --git a/riscos/iconbar.c b/riscos/iconbar.c index 7e3d73230..e0949b365 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -135,8 +135,7 @@ bool ro_gui_iconbar_click(wimp_pointer *pointer) /* create an initial browser window */ if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -206,9 +205,7 @@ bool ro_gui_iconbar_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_CONTENTS: error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url); if (error == NSERROR_OK) { - error = browser_window_create( - BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, diff --git a/riscos/uri.c b/riscos/uri.c index 70f75bc09..bf789ee17 100644 --- a/riscos/uri.c +++ b/riscos/uri.c @@ -74,8 +74,7 @@ void ro_uri_message_received(wimp_message *msg) error = nsurl_create(uri_requested, &url); free(uri_requested); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 01774f62f..6d99016f1 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -734,8 +734,8 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer) browser_window_navigate(g->bw, url_complete_matches[url_complete_matches_selection], NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c index 171b6205f..76d403147 100644 --- a/riscos/url_protocol.c +++ b/riscos/url_protocol.c @@ -126,8 +126,7 @@ void ro_url_message_received(wimp_message *message) } /* create new browser window */ - errorns = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + errorns = browser_window_create(BW_CREATE_HISTORY, nsurl, NULL, NULL, diff --git a/riscos/window.c b/riscos/window.c index f638b349d..27fdb39fa 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1923,8 +1923,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, { error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2673,8 +2672,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_CONTENTS: error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2686,8 +2684,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_GUIDE: error = nsurl_create("http://www.netsurf-browser.org/documentation/guide", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2699,8 +2696,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_INFORMATION: error = nsurl_create("http://www.netsurf-browser.org/documentation/info", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2712,8 +2708,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_CREDITS: error = nsurl_create("about:credits", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2725,8 +2720,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case HELP_OPEN_LICENCE: error = nsurl_create("about:licence", &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -2837,8 +2831,8 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, error = browser_window_navigate(bw, url, hlcache_handle_get_url(h), - BROWSER_WINDOW_DOWNLOAD | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -2851,8 +2845,9 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, if (current_menu_url != NULL) { error = nsurl_create(current_menu_url, &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create( + BW_CREATE_HISTORY | + BW_CREATE_CLONE, url, hlcache_handle_get_url(h), bw, @@ -3728,7 +3723,8 @@ void ro_gui_window_toolbar_click(void *data, hlcache_handle *h = g->bw->current_content; nserror error; - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE, + error = browser_window_create( + BW_CREATE_HISTORY | BW_CREATE_CLONE, NULL, NULL, g->bw, @@ -4010,8 +4006,7 @@ void ro_gui_window_launch_url(struct gui_window *g, const char *url1) browser_window_navigate(g->bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_CREATE_HISTORY, NULL, NULL, NULL); @@ -4051,8 +4046,8 @@ bool ro_gui_window_navigate_up(struct gui_window *g, const char *url) browser_window_navigate(g->bw, parent, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -4088,8 +4083,8 @@ void ro_gui_window_action_home(struct gui_window *g) error = browser_window_navigate(g->bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -4114,7 +4109,7 @@ void ro_gui_window_action_new_window(struct gui_window *g) if (g == NULL || g->bw == NULL || g->bw->current_content == NULL) return; - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE, + error = browser_window_create(BW_CREATE_CLONE, hlcache_handle_get_url(g->bw->current_content), NULL, g->bw, -- cgit v1.2.3