To avoid namespace conflicts with ncurses add NetSurf key prefix.

Adds a NetSurf key code prefix of NS_ to all key codes.

6 files changed, 48 insertions, 48 deletions

diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index 907e65d97..4dc17016a 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -209,19 +209,19 @@ void context_popup(struct gui_window * gw, short x, short y)
 
 	switch( choice ){
 		case POP_CTX_COPY_SEL:
-			browser_window_key_press(gw->browser->bw, KEY_COPY_SELECTION);
+			browser_window_key_press(gw->browser->bw, NS_KEY_COPY_SELECTION);
 		break;
 
 		case POP_CTX_CUT_SEL:
-			browser_window_key_press(gw->browser->bw, KEY_CUT_SELECTION);
+			browser_window_key_press(gw->browser->bw, NS_KEY_CUT_SELECTION);
 		break;
 
 		case POP_CTX_PASTE_SEL:
-			browser_window_key_press(gw->browser->bw, KEY_PASTE);
+			browser_window_key_press(gw->browser->bw, NS_KEY_PASTE);
 		break;
 
 		case POP_CTX_SELECT_ALL:
-			browser_window_key_press(gw->browser->bw, KEY_SELECT_ALL);
+			browser_window_key_press(gw->browser->bw, NS_KEY_SELECT_ALL);
 		break;
 
 		case POP_CTX_SAVE_AS:
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index c151ef559..91a1d994c 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -323,21 +323,21 @@ static void __CDECL menu_quit(short item, short title, void *data)
 static void __CDECL menu_cut(short item, short title, void *data)
 {
 	if( input_window != NULL )
-		browser_window_key_press( input_window->browser->bw, KEY_CUT_SELECTION);
+		browser_window_key_press( input_window->browser->bw, NS_KEY_CUT_SELECTION);
 }
 
 static void __CDECL menu_copy(short item, short title, void *data)
 {
 	LOG(("%s", __FUNCTION__));
 	if( input_window != NULL )
-		browser_window_key_press( input_window->browser->bw, KEY_COPY_SELECTION);
+		browser_window_key_press( input_window->browser->bw, NS_KEY_COPY_SELECTION);
 }
 
 static void __CDECL menu_paste(short item, short title, void *data)
 {
 	LOG(("%s", __FUNCTION__));
 	if( input_window != NULL )
-		browser_window_key_press( input_window->browser->bw, KEY_PASTE);
+		browser_window_key_press( input_window->browser->bw, NS_KEY_PASTE);
 }
 
 static void __CDECL menu_find(short item, short title, void *data)
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 0324c3bf5..d314fcb81 100644
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -159,7 +159,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
 						break;
 
 					case TOOLBAR_HOTLIST_DELETE:
-						hotlist_keypress(KEY_DELETE_LEFT);
+						hotlist_keypress(NS_KEY_DELETE_LEFT);
 						break;
 
 					case TOOLBAR_HOTLIST_EDIT:
diff --git a/atari/misc.c b/atari/misc.c
index 8cb285531..e3c358bce 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -297,19 +297,19 @@ long nkc_to_input_key(short nkc, long * ucs4_out)
 	else if( (nkc & NKF_CTRL) == NKF_CTRL ) {
 		switch ( ascii ) {
 			case 'A':
-				ik = KEY_SELECT_ALL;
+				ik = NS_KEY_SELECT_ALL;
 			break;
 
 			case 'C':
-				ik = KEY_COPY_SELECTION;
+				ik = NS_KEY_COPY_SELECTION;
 			break;
 
 			case 'X':
-				ik = KEY_CUT_SELECTION;
+				ik = NS_KEY_CUT_SELECTION;
 			break;
 
 			case 'V':
-				ik = KEY_PASTE;
+				ik = NS_KEY_PASTE;
 			break;
 
 			default:
@@ -320,23 +320,23 @@ long nkc_to_input_key(short nkc, long * ucs4_out)
 	else if( (nkc & NKF_SHIFT) != 0 ) {
 		switch( ascii ) {
 			case NK_TAB:
-				ik = KEY_SHIFT_TAB;
+				ik = NS_KEY_SHIFT_TAB;
 			break;
 
 			case NK_LEFT:
-				ik = KEY_LINE_START;
+				ik = NS_KEY_LINE_START;
 			break;
 
 			case NK_RIGHT:
-				ik = KEY_LINE_END;
+				ik = NS_KEY_LINE_END;
 			break;
 
 			case NK_UP:
-				ik = KEY_PAGE_UP;
+				ik = NS_KEY_PAGE_UP;
 			break;
 
 			case NK_DOWN:
-				ik = KEY_PAGE_DOWN;
+				ik = NS_KEY_PAGE_DOWN;
 			break;
 
 			default:
@@ -348,64 +348,64 @@ long nkc_to_input_key(short nkc, long * ucs4_out)
 		switch( ascii ) {
 
 			case NK_INS:
-				ik = KEY_PASTE;
+				ik = NS_KEY_PASTE;
 				break;
 
 			case NK_BS:
-				ik = KEY_DELETE_LEFT;
+				ik = NS_KEY_DELETE_LEFT;
 			break;
 
 			case NK_DEL:
-				ik = KEY_DELETE_RIGHT;
+				ik = NS_KEY_DELETE_RIGHT;
 			break;
 
 			case NK_TAB:
-				ik = KEY_TAB;
+				ik = NS_KEY_TAB;
 			break;
 
 
 			case NK_ENTER:
-				ik = KEY_NL;
+				ik = NS_KEY_NL;
 			break;
 
 			case NK_RET:
-				ik = KEY_CR;
+				ik = NS_KEY_CR;
 			break;
 
 			case NK_ESC:
-				ik = KEY_ESCAPE;
+				ik = NS_KEY_ESCAPE;
 			break;
 
 			case NK_CLRHOME:
-				ik = KEY_TEXT_START;
+				ik = NS_KEY_TEXT_START;
 			break;
 
 			case NK_RIGHT:
-				ik = KEY_RIGHT;
+				ik = NS_KEY_RIGHT;
 			break;
 
 			case NK_LEFT:
-				ik = KEY_LEFT;
+				ik = NS_KEY_LEFT;
 			break;
 
 			case NK_UP:
-				ik = KEY_UP;
+				ik = NS_KEY_UP;
 			break;
 
 			case NK_UNDO:
-				ik = KEY_UNDO;
+				ik = NS_KEY_UNDO;
 			break;
 
 			case NK_DOWN:
-				ik = KEY_DOWN;
+				ik = NS_KEY_DOWN;
 			break;
 
 			case NK_M_PGUP:
-				ik = KEY_PAGE_UP;
+				ik = NS_KEY_PAGE_UP;
 			break;
 
 			case NK_M_PGDOWN:
-				ik = KEY_PAGE_DOWN;
+				ik = NS_KEY_PAGE_DOWN;
 			break;
 
 			default:
diff --git a/atari/rootwin.c b/atari/rootwin.c
index a35f1791a..66785aaae 100755
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -512,7 +512,7 @@ void window_set_focus(struct s_gui_win_root *rootwin,
 /*
 			ta = toolbar_get_textarea(rootwin->toolbar,
 										URL_INPUT_TEXT_AREA);
-			textarea_keypress(ta, KEY_SELECT_ALL);
+			textarea_keypress(ta, NS_KEY_SELECT_ALL);
 			*/
 			break;
 
@@ -1287,51 +1287,51 @@ static bool on_content_keypress(struct gui_window *gw, unsigned short nkc)
             struct gemtk_wm_scroll_info_s *slid = gemtk_wm_get_scroll_info(w);
 
             switch( ik ) {
-            case KEY_LINE_START:
+            case NS_KEY_LINE_START:
                 gemtk_wm_scroll(w, GEMTK_WM_HSLIDER, -(g.g_w/slid->x_unit_px),
                               false);
 				r = true;
                 break;
 
-            case KEY_LINE_END:
+            case NS_KEY_LINE_END:
                 gemtk_wm_scroll(w, GEMTK_WM_HSLIDER, (g.g_w/slid->x_unit_px),
                               false);
 				r = true;
                 break;
 
-            case KEY_PAGE_UP:
+            case NS_KEY_PAGE_UP:
                 gemtk_wm_scroll(w, GEMTK_WM_VSLIDER, -(g.g_h/slid->y_unit_px),
                               false);
 				r = true;
                 break;
 
-            case KEY_PAGE_DOWN:
+            case NS_KEY_PAGE_DOWN:
                 gemtk_wm_scroll(w, GEMTK_WM_VSLIDER, (g.g_h/slid->y_unit_px),
                               false);
 				r = true;
                 break;
 
-            case KEY_RIGHT:
+            case NS_KEY_RIGHT:
                 gemtk_wm_scroll(w, GEMTK_WM_HSLIDER, -1, false);
 				r = true;
                 break;
 
-            case KEY_LEFT:
+            case NS_KEY_LEFT:
                 gemtk_wm_scroll(w, GEMTK_WM_HSLIDER, 1, false);
 				r = true;
                 break;
 
-            case KEY_UP:
+            case NS_KEY_UP:
                 gemtk_wm_scroll(w, GEMTK_WM_VSLIDER, -1, false);
 				r = true;
                 break;
 
-            case KEY_DOWN:
+            case NS_KEY_DOWN:
                 gemtk_wm_scroll(w, GEMTK_WM_VSLIDER, 1, false);
                 r = true;
                 break;
 
-			case KEY_TEXT_START:
+			case NS_KEY_TEXT_START:
 				window_scroll_by(gw->root, 0, 0);
 				r = true;
 				break;
diff --git a/atari/toolbar.c b/atari/toolbar.c
index 56d49de03..02861818f 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -696,7 +696,7 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
 			ret = textarea_keypress(tb->url.textarea, ucs4);
 		}
 	}
-	else if (ik == KEY_CR || ik == KEY_NL) {
+	else if (ik == NS_KEY_CR || ik == NS_KEY_NL) {
 		nsurl *url;
 		char tmp_url[PATH_MAX];
 		if ( textarea_get_text( tb->url.textarea, tmp_url, PATH_MAX) > 0 ) {
@@ -713,7 +713,7 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
 			ret = true;
 		}
 	}
-	else if (ik == KEY_COPY_SELECTION) {
+	else if (ik == NS_KEY_COPY_SELECTION) {
 		// copy whole text
 		char * text;
 		int len;
@@ -725,7 +725,7 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
 			free( text );
 		}
 	}
-	else if ( ik == KEY_PASTE) {
+	else if ( ik == NS_KEY_PASTE) {
 		char * clip = scrap_txt_read();
 		if ( clip != NULL ){
 			int clip_length = strlen( clip );
@@ -744,9 +744,9 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
 			free( clip );
 		}
 	}
-	else if (ik == KEY_ESCAPE) {
-		textarea_keypress( tb->url.textarea, KEY_SELECT_ALL );
-		textarea_keypress( tb->url.textarea, KEY_DELETE_LEFT );
+	else if (ik == NS_KEY_ESCAPE) {
+		textarea_keypress( tb->url.textarea, NS_KEY_SELECT_ALL );
+		textarea_keypress( tb->url.textarea, NS_KEY_DELETE_LEFT );
 	}
 	else {
 		ret = textarea_keypress( tb->url.textarea, ik );