From 39ad1632eb78e8c632d3e66711d09f2bb982a4e8 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 1 Oct 2004 00:06:49 +0000 Subject: [project @ 2004-10-01 00:06:49 by jmb] Send HTTP referer header. This is _only_ sent when a link is clicked (theoretically, at least). svn path=/import/netsurf/; revision=1296 --- riscos/401login.c | 4 ++-- riscos/gui.c | 2 +- riscos/history.c | 2 +- riscos/menus.c | 4 ++-- riscos/plugin.c | 2 +- riscos/window.c | 22 ++++++++++++++++++---- 6 files changed, 25 insertions(+), 11 deletions(-) (limited to 'riscos') diff --git a/riscos/401login.c b/riscos/401login.c index 9edef15a8..0832d594f 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -99,7 +99,7 @@ bool ro_gui_401login_keypress(wimp_key *key) case wimp_KEY_RETURN: get_unamepwd(); ro_gui_dialog_close(dialog_401li); - browser_window_go(bwin, url); + browser_window_go(bwin, url, false); return true; } @@ -118,7 +118,7 @@ void ro_gui_401login_click(wimp_pointer *pointer) case ICON_401LOGIN_LOGIN: get_unamepwd(); ro_gui_dialog_close(dialog_401li); - browser_window_go(bwin, url); + browser_window_go(bwin, url, false); break; case ICON_401LOGIN_CANCEL: ro_gui_dialog_close(dialog_401li); diff --git a/riscos/gui.c b/riscos/gui.c index eb635bdd9..7edd73cdb 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -1164,7 +1164,7 @@ void ro_msg_dataload(wimp_message *message) return; if (g) - browser_window_go(g->bw, url); + browser_window_go(g->bw, url, false); else browser_window_create(url, 0); diff --git a/riscos/history.c b/riscos/history.c index 87e420015..628409db5 100644 --- a/riscos/history.c +++ b/riscos/history.c @@ -663,7 +663,7 @@ void history_go(struct browser_window *bw, struct history_entry *entry) else url = entry->url; - browser_window_go_post(bw, url, 0, 0, false); + browser_window_go_post(bw, url, 0, 0, false, false); if (entry->frag_id) free(url); diff --git a/riscos/menus.c b/riscos/menus.c index 2fc45c7b5..616f48782 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -817,12 +817,12 @@ void ro_gui_menu_selection(wimp_selection *selection) switch (selection->items[1]) { case 0: /* Home */ if (option_homepage_url && option_homepage_url[0]) { - browser_window_go_post(current_gui->bw, option_homepage_url, 0, 0, true); + browser_window_go_post(current_gui->bw, option_homepage_url, 0, 0, true, false); } else { snprintf(url, sizeof url, "file://Docs/intro_%s", option_language); - browser_window_go_post(current_gui->bw, url, 0, 0, true); + browser_window_go_post(current_gui->bw, url, 0, 0, true, false); } break; case 1: /* Back */ diff --git a/riscos/plugin.c b/riscos/plugin.c index 8801ac326..76213d1f5 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -730,7 +730,7 @@ void plugin_url_access(wimp_message *message) strcasecmp(window, "_parent") == 0 || strcasecmp(window, "_top") == 0 || strcasecmp(window, "") == 0) { - browser_window_go(c->data.plugin.bw, url); + browser_window_go(c->data.plugin.bw, url, false); } else if (strcasecmp(window, "_blank") == 0) { browser_window_create(url, NULL); diff --git a/riscos/window.c b/riscos/window.c index 0ca060353..dd0d9dfad 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -762,6 +762,20 @@ void gui_window_set_url(struct gui_window *g, const char *url) } } +/** + * Get the contents of a window's address bar. + * + * \param g gui_window to update + * \return The url in the address bar or NULL + */ +char *gui_window_get_url(struct gui_window *g) +{ + if (!g->toolbar) + return NULL; + + return ro_gui_get_icon_string(g->toolbar->toolbar_handle, + ICON_TOOLBAR_URL); +} /** * Forces all windows to be set to the current theme @@ -818,7 +832,7 @@ void ro_gui_window_update_dimensions(struct gui_window *g, int yscroll) { return; } state.yscroll -= yscroll; - g->old_height = -1; + g->old_height = -1; ro_gui_window_open(g, (wimp_open *)&state); /* gui_window_redraw_window(g); */ } @@ -1085,7 +1099,7 @@ void ro_gui_toolbar_click(struct gui_window *g, wimp_pointer *pointer) if (option_homepage_url && option_homepage_url[0]) { if (pointer->buttons == wimp_CLICK_SELECT) { browser_window_go_post(g->bw, option_homepage_url, - 0, 0, true); + 0, 0, true, false); } else { browser_window_create(option_homepage_url, NULL); } @@ -1094,7 +1108,7 @@ void ro_gui_toolbar_click(struct gui_window *g, wimp_pointer *pointer) "file://Docs/intro_%s", option_language); if (pointer->buttons == wimp_CLICK_SELECT) { - browser_window_go_post(g->bw, url, 0, 0, true); + browser_window_go_post(g->bw, url, 0, 0, true, false); } else { browser_window_create(url, NULL); } @@ -1447,7 +1461,7 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar) res = url_normalize(toolbar_url, &url); if (res == URL_FUNC_OK) { gui_window_set_url(g, url); - browser_window_go(g->bw, url); + browser_window_go(g->bw, url, false); free(url); } return true; -- cgit v1.2.3