diff options
author | Witold Filipczyk <gglater62@gmail.com> | 2015-03-27 09:36:19 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2015-03-27 09:36:19 +0000 |
commit | befa5e6ed356e019fa82b7ebf9be90913aad3edb (patch) | |
tree | 5157bdd1ad1c4f54eda26894af6843afc7050322 /amiga | |
parent | 9d6ab0475f6cd259bc6135696900bad9295f5bcb (diff) | |
download | netsurf-befa5e6ed356e019fa82b7ebf9be90913aad3edb.tar.gz netsurf-befa5e6ed356e019fa82b7ebf9be90913aad3edb.tar.bz2 |
To avoid namespace conflicts with ncurses add NetSurf key prefix.
Adds a NetSurf key code prefix of NS_ to all key codes.
Diffstat (limited to 'amiga')
-rw-r--r-- | amiga/clipboard.c | 4 | ||||
-rw-r--r-- | amiga/context_menu.c | 16 | ||||
-rw-r--r-- | amiga/gui.c | 88 | ||||
-rw-r--r-- | amiga/menu.c | 16 | ||||
-rw-r--r-- | amiga/tree.c | 22 |
5 files changed, 73 insertions, 73 deletions
diff --git a/amiga/clipboard.c b/amiga/clipboard.c index c95a9a3a6..7495398b6 100644 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -286,9 +286,9 @@ void ami_drag_selection(struct gui_window *g) { iffh = ami_clipboard_init_internal(1); - browser_window_key_press(g->bw, KEY_COPY_SELECTION); + browser_window_key_press(g->bw, NS_KEY_COPY_SELECTION); browser_window_mouse_click(gwin->gw->bw, BROWSER_MOUSE_PRESS_1, x, y); - browser_window_key_press(gwin->gw->bw, KEY_PASTE); + browser_window_key_press(gwin->gw->bw, NS_KEY_PASTE); ami_clipboard_free_internal(iffh); iffh = old_iffh; diff --git a/amiga/context_menu.c b/amiga/context_menu.c index 970490e16..9a10a2529 100644 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -940,25 +940,25 @@ HOOKF(uint32, ami_context_menu_hook, Object *, item, APTR) break; case CMID_SELCUT: - browser_window_key_press(gwin->gw->bw, KEY_CUT_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_CUT_SELECTION); break; case CMID_SELCOPY: - browser_window_key_press(gwin->gw->bw, KEY_COPY_SELECTION); - browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_COPY_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); break; case CMID_SELPASTE: - browser_window_key_press(gwin->gw->bw, KEY_PASTE); + browser_window_key_press(gwin->gw->bw, NS_KEY_PASTE); break; case CMID_SELALL: - browser_window_key_press(gwin->gw->bw, KEY_SELECT_ALL); + browser_window_key_press(gwin->gw->bw, NS_KEY_SELECT_ALL); gui_start_selection(gwin->gw); break; case CMID_SELCLEAR: - browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); break; case CMID_SELSAVE: @@ -1013,7 +1013,7 @@ static uint32 ami_context_menu_hook_tree(struct Hook *hook, Object *item, APTR r switch(itemid) { case CMID_TREE_LAUNCH: - tree_keypress(tree, KEY_CR); + tree_keypress(tree, NS_KEY_CR); break; case CMID_TREE_EDITFOLDER: @@ -1049,7 +1049,7 @@ static uint32 ami_context_menu_hook_tree(struct Hook *hook, Object *item, APTR r break; case CMID_TREE_DELETE: - tree_keypress(tree, KEY_DELETE_RIGHT); + tree_keypress(tree, NS_KEY_DELETE_RIGHT); break; } } diff --git a/amiga/gui.c b/amiga/gui.c index 238a4ad69..70982034e 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1125,82 +1125,82 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie) case RAWKEY_CRSRUP: if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT) { - nskey = KEY_PAGE_UP; + nskey = NS_KEY_PAGE_UP; } else if(ie->ie_Qualifier & IEQUALIFIER_RALT) { - nskey = KEY_TEXT_START; + nskey = NS_KEY_TEXT_START; } - else nskey = KEY_UP; + else nskey = NS_KEY_UP; break; case RAWKEY_CRSRDOWN: if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT) { - nskey = KEY_PAGE_DOWN; + nskey = NS_KEY_PAGE_DOWN; } else if(ie->ie_Qualifier & IEQUALIFIER_RALT) { - nskey = KEY_TEXT_END; + nskey = NS_KEY_TEXT_END; } - else nskey = KEY_DOWN; + else nskey = NS_KEY_DOWN; break; case RAWKEY_CRSRLEFT: if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT) { - nskey = KEY_LINE_START; + nskey = NS_KEY_LINE_START; } else if(ie->ie_Qualifier & IEQUALIFIER_RALT) { - nskey = KEY_WORD_LEFT; + nskey = NS_KEY_WORD_LEFT; } - else nskey = KEY_LEFT; + else nskey = NS_KEY_LEFT; break; case RAWKEY_CRSRRIGHT: if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT) { - nskey = KEY_LINE_END; + nskey = NS_KEY_LINE_END; } else if(ie->ie_Qualifier & IEQUALIFIER_RALT) { - nskey = KEY_WORD_RIGHT; + nskey = NS_KEY_WORD_RIGHT; } - else nskey = KEY_RIGHT; + else nskey = NS_KEY_RIGHT; break; case RAWKEY_ESC: - nskey = KEY_ESCAPE; + nskey = NS_KEY_ESCAPE; break; case RAWKEY_PAGEUP: - nskey = KEY_PAGE_UP; + nskey = NS_KEY_PAGE_UP; break; case RAWKEY_PAGEDOWN: - nskey = KEY_PAGE_DOWN; + nskey = NS_KEY_PAGE_DOWN; break; case RAWKEY_HOME: - nskey = KEY_TEXT_START; + nskey = NS_KEY_TEXT_START; break; case RAWKEY_END: - nskey = KEY_TEXT_END; + nskey = NS_KEY_TEXT_END; break; case RAWKEY_BACKSPACE: if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT) { - nskey = KEY_DELETE_LINE_START; + nskey = NS_KEY_DELETE_LINE_START; } - else nskey = KEY_DELETE_LEFT; + else nskey = NS_KEY_DELETE_LEFT; break; case RAWKEY_DEL: if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT) { - nskey = KEY_DELETE_LINE_END; + nskey = NS_KEY_DELETE_LINE_END; } - else nskey = KEY_DELETE_RIGHT; + else nskey = NS_KEY_DELETE_RIGHT; break; case RAWKEY_TAB: if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT) { - nskey = KEY_SHIFT_TAB; + nskey = NS_KEY_SHIFT_TAB; } - else nskey = KEY_TAB; + else nskey = NS_KEY_TAB; break; case RAWKEY_F5: case RAWKEY_HELP: @@ -1215,22 +1215,22 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie) if(ie->ie_Qualifier & IEQUALIFIER_RCOMMAND) { switch(nskey) { case 'a': - nskey = KEY_SELECT_ALL; + nskey = NS_KEY_SELECT_ALL; break; case 'c': - nskey = KEY_COPY_SELECTION; + nskey = NS_KEY_COPY_SELECTION; break; case 'v': - nskey = KEY_PASTE; + nskey = NS_KEY_PASTE; break; case 'x': - nskey = KEY_CUT_SELECTION; + nskey = NS_KEY_CUT_SELECTION; break; case 'y': - nskey = KEY_REDO; + nskey = NS_KEY_REDO; break; case 'z': - nskey = KEY_UNDO; + nskey = NS_KEY_UNDO; break; } } @@ -2375,55 +2375,55 @@ static void ami_handle_msg(void) { switch(nskey) { - case KEY_UP: + case NS_KEY_UP: ami_gui_scroll_internal(gwin, 0, -NSA_KBD_SCROLL_PX); break; - case KEY_DOWN: + case NS_KEY_DOWN: ami_gui_scroll_internal(gwin, 0, +NSA_KBD_SCROLL_PX); break; - case KEY_LEFT: + case NS_KEY_LEFT: ami_gui_scroll_internal(gwin, -NSA_KBD_SCROLL_PX, 0); break; - case KEY_RIGHT: + case NS_KEY_RIGHT: ami_gui_scroll_internal(gwin, +NSA_KBD_SCROLL_PX, 0); break; - case KEY_PAGE_UP: + case NS_KEY_PAGE_UP: ami_gui_scroll_internal(gwin, 0, SCROLL_PAGE_UP); break; - case KEY_PAGE_DOWN: + case NS_KEY_PAGE_DOWN: ami_gui_scroll_internal(gwin, 0, SCROLL_PAGE_DOWN); break; - case KEY_LINE_START: // page left + case NS_KEY_LINE_START: // page left ami_gui_scroll_internal(gwin, SCROLL_PAGE_UP, 0); break; - case KEY_LINE_END: // page right + case NS_KEY_LINE_END: // page right ami_gui_scroll_internal(gwin, SCROLL_PAGE_DOWN, 0); break; - case KEY_TEXT_START: // home + case NS_KEY_TEXT_START: // home ami_gui_scroll_internal(gwin, SCROLL_TOP, SCROLL_TOP); break; - case KEY_TEXT_END: // end + case NS_KEY_TEXT_END: // end ami_gui_scroll_internal(gwin, SCROLL_BOTTOM, SCROLL_BOTTOM); break; - case KEY_WORD_RIGHT: // alt+right + case NS_KEY_WORD_RIGHT: // alt+right ami_change_tab(gwin, 1); break; - case KEY_WORD_LEFT: // alt+left + case NS_KEY_WORD_LEFT: // alt+left ami_change_tab(gwin, -1); break; - case KEY_DELETE_LEFT: // backspace + case NS_KEY_DELETE_LEFT: // backspace ami_gui_history(gwin, true); break; @@ -2436,9 +2436,9 @@ static void ami_handle_msg(void) ami_help_open(AMI_HELP_GUI, scrn); break; } - } else if(nskey == KEY_COPY_SELECTION) { + } else if(nskey == NS_KEY_COPY_SELECTION) { /* if we've copied a selection we need to clear it - style guide rules */ - browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); } } break; diff --git a/amiga/menu.c b/amiga/menu.c index fbb6af336..5ed1e3ae8 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -240,7 +240,7 @@ HOOKF(void, ami_menu_item_edit_cut, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(gwin->gw->bw, KEY_CUT_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_CUT_SELECTION); } HOOKF(void, ami_menu_item_edit_copy, APTR, window, struct IntuiMessage *) @@ -250,8 +250,8 @@ HOOKF(void, ami_menu_item_edit_copy, APTR, window, struct IntuiMessage *) GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); if(browser_window_can_select(gwin->gw->bw)) { - browser_window_key_press(gwin->gw->bw, KEY_COPY_SELECTION); - browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_COPY_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); } else if((bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)))) { /** @todo It should be checked that the lifetime of @@ -274,7 +274,7 @@ HOOKF(void, ami_menu_item_edit_paste, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(gwin->gw->bw, KEY_PASTE); + browser_window_key_press(gwin->gw->bw, NS_KEY_PASTE); } HOOKF(void, ami_menu_item_edit_selectall, APTR, window, struct IntuiMessage *) @@ -282,7 +282,7 @@ HOOKF(void, ami_menu_item_edit_selectall, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(gwin->gw->bw, KEY_SELECT_ALL); + browser_window_key_press(gwin->gw->bw, NS_KEY_SELECT_ALL); gui_start_selection(gwin->gw); } @@ -291,7 +291,7 @@ HOOKF(void, ami_menu_item_edit_clearsel, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); } HOOKF(void, ami_menu_item_edit_undo, APTR, window, struct IntuiMessage *) @@ -299,7 +299,7 @@ HOOKF(void, ami_menu_item_edit_undo, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(gwin->gw->bw, KEY_UNDO); + browser_window_key_press(gwin->gw->bw, NS_KEY_UNDO); } HOOKF(void, ami_menu_item_edit_redo, APTR, window, struct IntuiMessage *) @@ -307,7 +307,7 @@ HOOKF(void, ami_menu_item_edit_redo, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(gwin->gw->bw, KEY_REDO); + browser_window_key_press(gwin->gw->bw, NS_KEY_REDO); } HOOKF(void, ami_menu_item_browser_find, APTR, window, struct IntuiMessage *) diff --git a/amiga/tree.c b/amiga/tree.c index cba5375b6..4d2ea5bbd 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -1197,9 +1197,9 @@ BOOL ami_tree_event(struct treeview_window *twin) GetAttr(WINDOW_InputEvent,twin->objects[OID_MAIN],(ULONG *)&ie); nskey = ami_key_to_nskey(storage, ie); tree_keypress(twin->tree, nskey); - if(nskey == KEY_COPY_SELECTION) { + if(nskey == NS_KEY_COPY_SELECTION) { /* if we've copied a selection we need to clear it - style guide rules */ - tree_keypress(twin->tree, KEY_CLEAR_SELECTION); + tree_keypress(twin->tree, NS_KEY_CLEAR_SELECTION); } break; @@ -1386,13 +1386,13 @@ BOOL ami_tree_event(struct treeview_window *twin) switch(twin->type) { case AMI_TREE_HISTORY: - global_history_keypress(KEY_DELETE_LEFT); + global_history_keypress(NS_KEY_DELETE_LEFT); break; case AMI_TREE_COOKIES: - cookie_manager_keypress(KEY_DELETE_LEFT); + cookie_manager_keypress(NS_KEY_DELETE_LEFT); break; case AMI_TREE_HOTLIST: - hotlist_keypress(KEY_DELETE_LEFT); + hotlist_keypress(NS_KEY_DELETE_LEFT); break; } ami_tree_update_buttons(twin); @@ -1402,13 +1402,13 @@ BOOL ami_tree_event(struct treeview_window *twin) switch(twin->type) { case AMI_TREE_HISTORY: - global_history_keypress(KEY_SELECT_ALL); + global_history_keypress(NS_KEY_SELECT_ALL); break; case AMI_TREE_COOKIES: - cookie_manager_keypress(KEY_SELECT_ALL); + cookie_manager_keypress(NS_KEY_SELECT_ALL); break; case AMI_TREE_HOTLIST: - hotlist_keypress(KEY_SELECT_ALL); + hotlist_keypress(NS_KEY_SELECT_ALL); break; } ami_tree_update_buttons(twin); @@ -1418,13 +1418,13 @@ BOOL ami_tree_event(struct treeview_window *twin) switch(twin->type) { case AMI_TREE_HISTORY: - global_history_keypress(KEY_CLEAR_SELECTION); + global_history_keypress(NS_KEY_CLEAR_SELECTION); break; case AMI_TREE_COOKIES: - cookie_manager_keypress(KEY_CLEAR_SELECTION); + cookie_manager_keypress(NS_KEY_CLEAR_SELECTION); break; case AMI_TREE_HOTLIST: - hotlist_keypress(KEY_CLEAR_SELECTION); + hotlist_keypress(NS_KEY_CLEAR_SELECTION); break; } ami_tree_update_buttons(twin); |