From bd5ba01b2ea32563dde5d80ad0560d45f263fecc Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Mon, 3 Jan 2005 01:18:17 +0000 Subject: [project @ 2005-01-03 01:18:17 by jmb] Reorder F-key order (looks tidier ;) svn path=/import/netsurf/; revision=1428 --- riscos/window.c | 80 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/riscos/window.c b/riscos/window.c index b9ba998c0..7054cacf6 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -26,6 +26,7 @@ #include "netsurf/content/content.h" #include "netsurf/css/css.h" #include "netsurf/desktop/plotters.h" +#include "netsurf/dom/dom.h" #include "netsurf/render/box.h" #include "netsurf/render/form.h" #include "netsurf/riscos/buffer.h" @@ -1406,13 +1407,51 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar) } switch (key) { + case wimp_KEY_F1: /* Help. */ + ro_gui_open_help_page("docs"); + return true; + case wimp_KEY_CONTROL + wimp_KEY_F1: current_gui = g; ro_gui_menu_prepare_pageinfo(); ro_gui_dialog_open_persistant(g->window, dialog_pageinfo, false); return true; - case wimp_KEY_F1: /* Help. */ - ro_gui_open_help_page("docs"); + + case wimp_KEY_F2: + if (!g->toolbar) + return false; + ro_gui_set_icon_string(g->toolbar->toolbar_handle, + ICON_TOOLBAR_URL, "www."); + xwimp_set_caret_position(g->toolbar->toolbar_handle, + ICON_TOOLBAR_URL, 0, 0, -1, 4); + return true; + + case wimp_KEY_CONTROL + wimp_KEY_F2: /* Close window. */ + browser_window_destroy(g->bw); + return true; + + case wimp_KEY_F3: + current_gui = g; + ro_gui_save_open(GUI_SAVE_SOURCE, content, + false, 0, 0, g->window, true); + return true; + + case wimp_KEY_CONTROL + wimp_KEY_F3: + current_gui = g; + ro_gui_save_open(GUI_SAVE_TEXT, content, + false, 0, 0, g->window, true); + return true; + + case wimp_KEY_SHIFT + wimp_KEY_F3: + current_gui = g; + ro_gui_save_open(GUI_SAVE_COMPLETE, content, + false, 0, 0, g->window, true); + return true; + + case wimp_KEY_CONTROL + wimp_KEY_SHIFT + wimp_KEY_F3: + current_gui = g; + ro_gui_save_open(GUI_SAVE_DRAW, content, + false, 0, 0, g->window, true); return true; #ifdef WITH_SEARCH @@ -1464,43 +1503,6 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar) gui_window_redraw_window(g); return true; - case wimp_KEY_F2: - if (!g->toolbar) - return false; - ro_gui_set_icon_string(g->toolbar->toolbar_handle, - ICON_TOOLBAR_URL, "www."); - xwimp_set_caret_position(g->toolbar->toolbar_handle, - ICON_TOOLBAR_URL, 0, 0, -1, 4); - return true; - - case wimp_KEY_CONTROL + wimp_KEY_F2: /* Close window. */ - browser_window_destroy(g->bw); - return true; - - case wimp_KEY_F3: - current_gui = g; - ro_gui_save_open(GUI_SAVE_SOURCE, content, - false, 0, 0, g->window, true); - return true; - - case wimp_KEY_CONTROL + wimp_KEY_F3: - current_gui = g; - ro_gui_save_open(GUI_SAVE_TEXT, content, - false, 0, 0, g->window, true); - return true; - - case wimp_KEY_SHIFT + wimp_KEY_F3: - current_gui = g; - ro_gui_save_open(GUI_SAVE_COMPLETE, content, - false, 0, 0, g->window, true); - return true; - - case wimp_KEY_CONTROL + wimp_KEY_SHIFT + wimp_KEY_F3: - current_gui = g; - ro_gui_save_open(GUI_SAVE_DRAW, content, - false, 0, 0, g->window, true); - return true; - case wimp_KEY_RETURN: if (!toolbar) break; -- cgit v1.2.3