diff options
Diffstat (limited to 'riscos')
-rw-r--r-- | riscos/cookies.c | 8 | ||||
-rw-r--r-- | riscos/global_history.c | 12 | ||||
-rw-r--r-- | riscos/hotlist.c | 12 | ||||
-rw-r--r-- | riscos/treeview.c | 34 | ||||
-rw-r--r-- | riscos/window.c | 52 |
5 files changed, 59 insertions, 59 deletions
diff --git a/riscos/cookies.c b/riscos/cookies.c index b5e97f778..835229835 100644 --- a/riscos/cookies.c +++ b/riscos/cookies.c @@ -190,7 +190,7 @@ void ro_gui_cookies_toolbar_click(button_bar_action action) { switch (action) { case TOOLBAR_BUTTON_DELETE: - cookie_manager_keypress(KEY_DELETE_LEFT); + cookie_manager_keypress(NS_KEY_DELETE_LEFT); break; case TOOLBAR_BUTTON_EXPAND: @@ -329,13 +329,13 @@ bool ro_gui_cookies_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, cookie_manager_contract(false); return true; case TREE_SELECTION_DELETE: - cookie_manager_keypress(KEY_DELETE_LEFT); + cookie_manager_keypress(NS_KEY_DELETE_LEFT); return true; case TREE_SELECT_ALL: - cookie_manager_keypress(KEY_SELECT_ALL); + cookie_manager_keypress(NS_KEY_SELECT_ALL); return true; case TREE_CLEAR_SELECTION: - cookie_manager_keypress(KEY_CLEAR_SELECTION); + cookie_manager_keypress(NS_KEY_CLEAR_SELECTION); return true; case TOOLBAR_BUTTONS: ro_toolbar_set_display_buttons(cookies_window.toolbar, diff --git a/riscos/global_history.c b/riscos/global_history.c index e81d6b099..6482d1bba 100644 --- a/riscos/global_history.c +++ b/riscos/global_history.c @@ -199,7 +199,7 @@ void ro_gui_global_history_toolbar_click(button_bar_action action) { switch (action) { case TOOLBAR_BUTTON_DELETE: - global_history_keypress(KEY_DELETE_LEFT); + global_history_keypress(NS_KEY_DELETE_LEFT); break; case TOOLBAR_BUTTON_EXPAND: @@ -219,7 +219,7 @@ void ro_gui_global_history_toolbar_click(button_bar_action action) break; case TOOLBAR_BUTTON_LAUNCH: - global_history_keypress(KEY_CR); + global_history_keypress(NS_KEY_CR); break; default: @@ -356,16 +356,16 @@ bool ro_gui_global_history_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, global_history_contract(false); return true; case TREE_SELECTION_LAUNCH: - global_history_keypress(KEY_CR); + global_history_keypress(NS_KEY_CR); return true; case TREE_SELECTION_DELETE: - global_history_keypress(KEY_DELETE_LEFT); + global_history_keypress(NS_KEY_DELETE_LEFT); return true; case TREE_SELECT_ALL: - global_history_keypress(KEY_SELECT_ALL); + global_history_keypress(NS_KEY_SELECT_ALL); return true; case TREE_CLEAR_SELECTION: - global_history_keypress(KEY_CLEAR_SELECTION); + global_history_keypress(NS_KEY_CLEAR_SELECTION); return true; case TOOLBAR_BUTTONS: ro_toolbar_set_display_buttons(global_history_window.toolbar, diff --git a/riscos/hotlist.c b/riscos/hotlist.c index 00f9196cd..38df65ef7 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -257,7 +257,7 @@ void ro_gui_hotlist_toolbar_click(button_bar_action action) { switch (action) { case TOOLBAR_BUTTON_DELETE: - hotlist_keypress(KEY_DELETE_LEFT); + hotlist_keypress(NS_KEY_DELETE_LEFT); ro_toolbar_update_all_hotlists(); break; @@ -278,7 +278,7 @@ void ro_gui_hotlist_toolbar_click(button_bar_action action) break; case TOOLBAR_BUTTON_LAUNCH: - hotlist_keypress(KEY_CR); + hotlist_keypress(NS_KEY_CR); break; case TOOLBAR_BUTTON_CREATE: @@ -425,17 +425,17 @@ bool ro_gui_hotlist_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, hotlist_edit_selection(); return true; case TREE_SELECTION_LAUNCH: - hotlist_keypress(KEY_CR); + hotlist_keypress(NS_KEY_CR); return true; case TREE_SELECTION_DELETE: - hotlist_keypress(KEY_DELETE_LEFT); + hotlist_keypress(NS_KEY_DELETE_LEFT); ro_toolbar_update_all_hotlists(); return true; case TREE_SELECT_ALL: - hotlist_keypress(KEY_SELECT_ALL); + hotlist_keypress(NS_KEY_SELECT_ALL); return true; case TREE_CLEAR_SELECTION: - hotlist_keypress(KEY_CLEAR_SELECTION); + hotlist_keypress(NS_KEY_CLEAR_SELECTION); return true; case TOOLBAR_BUTTONS: ro_toolbar_set_display_buttons(hotlist_window.toolbar, diff --git a/riscos/treeview.c b/riscos/treeview.c index d33704c8d..39c601413 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -1127,35 +1127,35 @@ static bool ro_treeview_keypress(wimp_key *key) /* cursor movement keys */ case wimp_KEY_HOME: case wimp_KEY_CONTROL | wimp_KEY_LEFT: - c = KEY_LINE_START; + c = NS_KEY_LINE_START; break; case wimp_KEY_END: if (os_version >= RISCOS5) - c = KEY_LINE_END; + c = NS_KEY_LINE_END; else - c = KEY_DELETE_RIGHT; + c = NS_KEY_DELETE_RIGHT; break; - case wimp_KEY_CONTROL | wimp_KEY_RIGHT: c = KEY_LINE_END; break; - case wimp_KEY_CONTROL | wimp_KEY_UP: c = KEY_TEXT_START; break; - case wimp_KEY_CONTROL | wimp_KEY_DOWN: c = KEY_TEXT_END; break; - case wimp_KEY_SHIFT | wimp_KEY_LEFT: c = KEY_WORD_LEFT ; break; - case wimp_KEY_SHIFT | wimp_KEY_RIGHT: c = KEY_WORD_RIGHT; break; - case wimp_KEY_SHIFT | wimp_KEY_UP: c = KEY_PAGE_UP; break; - case wimp_KEY_SHIFT | wimp_KEY_DOWN: c = KEY_PAGE_DOWN; break; - case wimp_KEY_LEFT: c = KEY_LEFT; break; - case wimp_KEY_RIGHT: c = KEY_RIGHT; break; - case wimp_KEY_UP: c = KEY_UP; break; - case wimp_KEY_DOWN: c = KEY_DOWN; break; + case wimp_KEY_CONTROL | wimp_KEY_RIGHT: c = NS_KEY_LINE_END; break; + case wimp_KEY_CONTROL | wimp_KEY_UP: c = NS_KEY_TEXT_START; break; + case wimp_KEY_CONTROL | wimp_KEY_DOWN: c = NS_KEY_TEXT_END; break; + case wimp_KEY_SHIFT | wimp_KEY_LEFT: c = NS_KEY_WORD_LEFT ; break; + case wimp_KEY_SHIFT | wimp_KEY_RIGHT: c = NS_KEY_WORD_RIGHT; break; + case wimp_KEY_SHIFT | wimp_KEY_UP: c = NS_KEY_PAGE_UP; break; + case wimp_KEY_SHIFT | wimp_KEY_DOWN: c = NS_KEY_PAGE_DOWN; break; + case wimp_KEY_LEFT: c = NS_KEY_LEFT; break; + case wimp_KEY_RIGHT: c = NS_KEY_RIGHT; break; + case wimp_KEY_UP: c = NS_KEY_UP; break; + case wimp_KEY_DOWN: c = NS_KEY_DOWN; break; /* editing */ case wimp_KEY_CONTROL | wimp_KEY_END: - c = KEY_DELETE_LINE_END; + c = NS_KEY_DELETE_LINE_END; break; case wimp_KEY_DELETE: if (ro_gui_ctrl_pressed()) - c = KEY_DELETE_LINE_START; + c = NS_KEY_DELETE_LINE_START; else if (os_version < RISCOS5) - c = KEY_DELETE_LEFT; + c = NS_KEY_DELETE_LEFT; break; default: diff --git a/riscos/window.c b/riscos/window.c index 759c0c281..05e929267 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1779,42 +1779,42 @@ bool ro_gui_window_keypress(wimp_key *key) /* cursor movement keys */ case wimp_KEY_HOME: case wimp_KEY_CONTROL | wimp_KEY_LEFT: - c = KEY_LINE_START; + c = NS_KEY_LINE_START; break; case wimp_KEY_END: if (os_version >= RISCOS5) - c = KEY_LINE_END; + c = NS_KEY_LINE_END; else - c = KEY_DELETE_RIGHT; + c = NS_KEY_DELETE_RIGHT; break; - case wimp_KEY_CONTROL | wimp_KEY_RIGHT: c = KEY_LINE_END; break; - case wimp_KEY_CONTROL | wimp_KEY_UP: c = KEY_TEXT_START; break; - case wimp_KEY_CONTROL | wimp_KEY_DOWN: c = KEY_TEXT_END; break; - case wimp_KEY_SHIFT | wimp_KEY_LEFT: c = KEY_WORD_LEFT ; break; - case wimp_KEY_SHIFT | wimp_KEY_RIGHT: c = KEY_WORD_RIGHT; break; - case wimp_KEY_SHIFT | wimp_KEY_UP: c = KEY_PAGE_UP; break; - case wimp_KEY_SHIFT | wimp_KEY_DOWN: c = KEY_PAGE_DOWN; break; - case wimp_KEY_LEFT: c = KEY_LEFT; break; - case wimp_KEY_RIGHT: c = KEY_RIGHT; break; - case wimp_KEY_UP: c = KEY_UP; break; - case wimp_KEY_DOWN: c = KEY_DOWN; break; + case wimp_KEY_CONTROL | wimp_KEY_RIGHT: c = NS_KEY_LINE_END; break; + case wimp_KEY_CONTROL | wimp_KEY_UP: c = NS_KEY_TEXT_START; break; + case wimp_KEY_CONTROL | wimp_KEY_DOWN: c = NS_KEY_TEXT_END; break; + case wimp_KEY_SHIFT | wimp_KEY_LEFT: c = NS_KEY_WORD_LEFT ; break; + case wimp_KEY_SHIFT | wimp_KEY_RIGHT: c = NS_KEY_WORD_RIGHT; break; + case wimp_KEY_SHIFT | wimp_KEY_UP: c = NS_KEY_PAGE_UP; break; + case wimp_KEY_SHIFT | wimp_KEY_DOWN: c = NS_KEY_PAGE_DOWN; break; + case wimp_KEY_LEFT: c = NS_KEY_LEFT; break; + case wimp_KEY_RIGHT: c = NS_KEY_RIGHT; break; + case wimp_KEY_UP: c = NS_KEY_UP; break; + case wimp_KEY_DOWN: c = NS_KEY_DOWN; break; /* editing */ case wimp_KEY_CONTROL | wimp_KEY_END: - c = KEY_DELETE_LINE_END; + c = NS_KEY_DELETE_LINE_END; break; case wimp_KEY_DELETE: if (ro_gui_ctrl_pressed()) - c = KEY_DELETE_LINE_START; + c = NS_KEY_DELETE_LINE_START; else if (os_version < RISCOS5) - c = KEY_DELETE_LEFT; + c = NS_KEY_DELETE_LEFT; break; case wimp_KEY_F8: - c = KEY_UNDO; + c = NS_KEY_UNDO; break; case wimp_KEY_F9: - c = KEY_REDO; + c = NS_KEY_REDO; break; default: @@ -2593,7 +2593,7 @@ static void ro_gui_window_paste_cb(void *pw) { struct browser_window *bw = pw; - browser_window_key_press(bw, KEY_PASTE); + browser_window_key_press(bw, NS_KEY_PASTE); } @@ -2732,8 +2732,8 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, break; case COOKIES_DELETE: - cookie_manager_keypress(KEY_SELECT_ALL); - cookie_manager_keypress(KEY_DELETE_LEFT); + cookie_manager_keypress(NS_KEY_SELECT_ALL); + cookie_manager_keypress(NS_KEY_DELETE_LEFT); break; /* page actions */ @@ -2882,19 +2882,19 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, } break; case BROWSER_SELECTION_COPY: - browser_window_key_press(bw, KEY_COPY_SELECTION); + browser_window_key_press(bw, NS_KEY_COPY_SELECTION); break; case BROWSER_SELECTION_CUT: - browser_window_key_press(bw, KEY_CUT_SELECTION); + browser_window_key_press(bw, NS_KEY_CUT_SELECTION); break; case BROWSER_SELECTION_PASTE: ro_gui_selection_prepare_paste(w, ro_gui_window_paste_cb, bw); break; case BROWSER_SELECTION_ALL: - browser_window_key_press(bw, KEY_SELECT_ALL); + browser_window_key_press(bw, NS_KEY_SELECT_ALL); break; case BROWSER_SELECTION_CLEAR: - browser_window_key_press(bw, KEY_CLEAR_SELECTION); + browser_window_key_press(bw, NS_KEY_CLEAR_SELECTION); break; /* navigation actions */ |