summaryrefslogtreecommitdiff
path: root/beos
diff options
context:
space:
mode:
authorWitold Filipczyk <gglater62@gmail.com>2015-03-27 09:36:19 +0000
committerVincent Sanders <vince@kyllikki.org>2015-03-27 09:36:19 +0000
commitbefa5e6ed356e019fa82b7ebf9be90913aad3edb (patch)
tree5157bdd1ad1c4f54eda26894af6843afc7050322 /beos
parent9d6ab0475f6cd259bc6135696900bad9295f5bcb (diff)
downloadnetsurf-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 'beos')
-rw-r--r--beos/scaffolding.cpp8
-rw-r--r--beos/window.cpp24
2 files changed, 16 insertions, 16 deletions
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index 04b42611f..49e1cd486 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -961,17 +961,17 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m
break;
}
case B_COPY:
- browser_window_key_press(bw, KEY_COPY_SELECTION);
+ browser_window_key_press(bw, NS_KEY_COPY_SELECTION);
break;
case B_CUT:
- browser_window_key_press(bw, KEY_CUT_SELECTION);
+ browser_window_key_press(bw, NS_KEY_CUT_SELECTION);
break;
case B_PASTE:
- browser_window_key_press(bw, KEY_PASTE);
+ browser_window_key_press(bw, NS_KEY_PASTE);
break;
case B_SELECT_ALL:
LOG(("Selecting all text"));
- browser_window_key_press(bw, KEY_SELECT_ALL);
+ browser_window_key_press(bw, NS_KEY_SELECT_ALL);
break;
case B_NETPOSITIVE_BACK:
case BROWSER_NAVIGATE_BACK:
diff --git a/beos/window.cpp b/beos/window.cpp
index a507d6f07..b85d07d81 100644
--- a/beos/window.cpp
+++ b/beos/window.cpp
@@ -772,24 +772,24 @@ void nsbeos_window_keypress_event(BView *view, gui_window *g, BMessage *event)
nskey = (uint32_t)byte;
else {
switch (byte) {
- case B_BACKSPACE: nskey = KEY_DELETE_LEFT; break;
- case B_TAB: nskey = KEY_TAB; break;
+ case B_BACKSPACE: nskey = NS_KEY_DELETE_LEFT; break;
+ case B_TAB: nskey = NS_KEY_TAB; break;
/*case XK_Linefeed: return QKlinefeed;*/
case B_ENTER: nskey = (uint32_t)10; break;
case B_ESCAPE: nskey = (uint32_t)'\033'; break;
case B_SPACE: nskey = (uint32_t)' '; break;
- case B_DELETE: nskey = KEY_DELETE_RIGHT; break;
+ case B_DELETE: nskey = NS_KEY_DELETE_RIGHT; break;
/*
- case B_INSERT: nskey = KEYSYM("insert"); break;
+ case B_INSERT: nskey = NS_KEYSYM("insert"); break;
*/
- case B_HOME: nskey = KEY_LINE_START; break; // XXX ?
- case B_END: nskey = KEY_LINE_END; break; // XXX ?
- case B_PAGE_UP: nskey = KEY_PAGE_UP; break;
- case B_PAGE_DOWN: nskey = KEY_PAGE_DOWN; break;
- case B_LEFT_ARROW: nskey = KEY_LEFT; break;
- case B_RIGHT_ARROW: nskey = KEY_RIGHT; break;
- case B_UP_ARROW: nskey = KEY_UP; break;
- case B_DOWN_ARROW: nskey = KEY_DOWN; break;
+ case B_HOME: nskey = NS_KEY_LINE_START; break; // XXX ?
+ case B_END: nskey = NS_KEY_LINE_END; break; // XXX ?
+ case B_PAGE_UP: nskey = NS_KEY_PAGE_UP; break;
+ case B_PAGE_DOWN: nskey = NS_KEY_PAGE_DOWN; break;
+ case B_LEFT_ARROW: nskey = NS_KEY_LEFT; break;
+ case B_RIGHT_ARROW: nskey = NS_KEY_RIGHT; break;
+ case B_UP_ARROW: nskey = NS_KEY_UP; break;
+ case B_DOWN_ARROW: nskey = NS_KEY_DOWN; break;
/*
case B_FUNCTION_KEY:
switch (scancode) {