From afdf592637e488beeceba371234035c14235322f Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Sun, 24 Aug 2008 10:31:38 +0000 Subject: Merge Mike's tabs changes. Still needs some cleaning. svn path=/trunk/netsurf/; revision=5189 --- riscos/dialog.c | 2 +- riscos/gui.c | 13 +++++++------ riscos/menus.c | 2 +- riscos/plugin.c | 3 ++- riscos/treeview.c | 2 +- riscos/uri.c | 2 +- riscos/url_protocol.c | 2 +- riscos/window.c | 9 +++++---- 8 files changed, 19 insertions(+), 16 deletions(-) (limited to 'riscos') diff --git a/riscos/dialog.c b/riscos/dialog.c index 8fac4376d..808a566b6 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -714,7 +714,7 @@ bool ro_gui_dialog_openurl_apply(wimp_w w) { url = ro_gui_get_icon_string(w, ICON_OPENURL_URL); res = url_normalize(url, &url2); if (res == URL_FUNC_OK) { - browser_window_create(url2, 0, 0, true); + browser_window_create(url2, 0, 0, true, false); global_history_add_recent(url2); free(url2); return true; diff --git a/riscos/gui.c b/riscos/gui.c index 5ff558f5d..ea3755730 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -763,7 +763,7 @@ void gui_init2(int argc, char** argv) } if (open_window) - browser_window_create(url, NULL, 0, true); + browser_window_create(url, NULL, 0, true, false); free(url); } @@ -1209,12 +1209,13 @@ bool ro_gui_icon_bar_click(wimp_pointer *pointer) } else if (pointer->buttons == wimp_CLICK_SELECT) { if (option_homepage_url && option_homepage_url[0]) { - browser_window_create(option_homepage_url, NULL, 0, true); + browser_window_create(option_homepage_url, NULL, 0, + true, false); } else { snprintf(url, sizeof url, "file:////Docs/welcome/index_%s", option_language); - browser_window_create(url, NULL, 0, true); + browser_window_create(url, NULL, 0, true, false); } } else if (pointer->buttons == wimp_CLICK_ADJUST) { @@ -1560,7 +1561,7 @@ void ro_msg_dataload(wimp_message *message) ro_gui_tree_start_edit(hotlist_tree, &node->data, NULL); } } else { - browser_window_create(url, 0, 0, true); + browser_window_create(url, 0, 0, true, false); } /* send DataLoadAck */ @@ -1919,7 +1920,7 @@ void ro_msg_dataopen(wimp_message *message) return; /* create a new window with the file */ - browser_window_create(url, NULL, 0, true); + browser_window_create(url, NULL, 0, true, false); free(url); } @@ -2164,7 +2165,7 @@ void ro_gui_open_help_page(const char *page) if ((length = snprintf(url, sizeof url, "file:////Docs/%s_%s", page, option_language)) >= 0 && length < (int)sizeof(url)) - browser_window_create(url, NULL, 0, true); + browser_window_create(url, NULL, 0, true, false); } diff --git a/riscos/menus.c b/riscos/menus.c index 9c2dfffda..ed67f7966 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -1516,7 +1516,7 @@ bool ro_gui_menu_handle_action(wimp_w owner, menu_action action, case BROWSER_NEW_WINDOW: if (!c) return false; - browser_window_create(c->url, bw, 0, false); + browser_window_create(c->url, bw, 0, false, false); return true; case BROWSER_VIEW_SOURCE: if (!c) diff --git a/riscos/plugin.c b/riscos/plugin.c index dbeb02b14..1e4279f18 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -930,7 +930,8 @@ void plugin_url_access(wimp_message *message) else if (!option_block_popups && strcasecmp(window, "_blank") == 0) { /* don't do this if popups are blocked */ - browser_window_create(url, NULL, 0, true); + browser_window_create(url, NULL, 0, true, + false); } } else { /* POST request */ diff --git a/riscos/treeview.c b/riscos/treeview.c index 819c2f178..3989d0887 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -1580,7 +1580,7 @@ bool ro_gui_tree_launch_node(struct tree *tree, struct node *node) element = tree_find_element(node, TREE_ELEMENT_URL); if (element) { - browser_window_create(element->text, NULL, 0, true); + browser_window_create(element->text, NULL, 0, true, false); return true; } diff --git a/riscos/uri.c b/riscos/uri.c index 53167d305..b4250941d 100644 --- a/riscos/uri.c +++ b/riscos/uri.c @@ -60,7 +60,7 @@ void ro_uri_message_received(wimp_message *msg) xuri_request_uri(0, uri_requested, uri_length, uri_handle, NULL); - browser_window_create(uri_requested, NULL, 0, true); + browser_window_create(uri_requested, NULL, 0, true, false); free(uri_requested); } diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c index 7831334b6..57409d25f 100644 --- a/riscos/url_protocol.c +++ b/riscos/url_protocol.c @@ -116,7 +116,7 @@ void ro_url_message_received(wimp_message *message) } /* create new browser window */ - browser_window_create(url, 0, 0, true); + browser_window_create(url, 0, 0, true, false); free(url); } diff --git a/riscos/window.c b/riscos/window.c index 34725155e..9f791c81d 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -169,7 +169,7 @@ struct update_box *pending_updates; */ struct gui_window *gui_create_browser_window(struct browser_window *bw, - struct browser_window *clone) + struct browser_window *clone, bool new_tab) { int screen_width, screen_height, win_width, win_height, scroll_width; static int window_count = 2; @@ -2114,7 +2114,7 @@ bool ro_gui_toolbar_click(wimp_pointer *pointer) case ICON_TOOLBAR_BACK: if (pointer->buttons == wimp_CLICK_ADJUST) { new_bw = browser_window_create(NULL, - g->bw, NULL, false); + g->bw, NULL, false, false); ro_gui_menu_handle_action(new_bw->window->window, BROWSER_NAVIGATE_BACK, true); } else { @@ -2126,7 +2126,7 @@ bool ro_gui_toolbar_click(wimp_pointer *pointer) case ICON_TOOLBAR_FORWARD: if (pointer->buttons == wimp_CLICK_ADJUST) { new_bw = browser_window_create(NULL, - g->bw, NULL, false); + g->bw, NULL, false, false); ro_gui_menu_handle_action(new_bw->window->window, BROWSER_NAVIGATE_FORWARD, true); } else { @@ -2197,7 +2197,8 @@ bool ro_gui_toolbar_click(wimp_pointer *pointer) if (pointer->buttons == wimp_CLICK_ADJUST) { if (g->bw && g->bw->current_content) { new_bw = browser_window_create(NULL, - g->bw, NULL, false); + g->bw, NULL, false, + false); /* do it without loading the content into the new window */ ro_gui_window_navigate_up(new_bw->window, g->bw->current_content->url); -- cgit v1.2.3