To avoid namespace conflicts with ncurses add NetSurf key prefix.

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

5 files changed, 42 insertions, 42 deletions

diff --git a/gtk/cookies.c b/gtk/cookies.c
index 35470ce93..3251e17fb 100644
--- a/gtk/cookies.c
+++ b/gtk/cookies.c
@@ -161,26 +161,26 @@ void nsgtk_cookies_destroy(void)
 /* edit menu */
 MENUHANDLER(delete_selected)
 {
-	cookie_manager_keypress(KEY_DELETE_LEFT);
+	cookie_manager_keypress(NS_KEY_DELETE_LEFT);
 	return TRUE;
 }
 
 MENUHANDLER(delete_all)
 {
-	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);
 	return TRUE;
 }
 
 MENUHANDLER(select_all)
 {
-	cookie_manager_keypress(KEY_SELECT_ALL);
+	cookie_manager_keypress(NS_KEY_SELECT_ALL);
 	return TRUE;
 }
 
 MENUHANDLER(clear_selection)
 {
-	cookie_manager_keypress(KEY_CLEAR_SELECTION);
+	cookie_manager_keypress(NS_KEY_CLEAR_SELECTION);
 	return TRUE;
 }
 
diff --git a/gtk/gui.c b/gtk/gui.c
index e652287e0..c3fe6bb78 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -812,69 +812,69 @@ uint32_t gtk_gui_gdkkey_to_nskey(GdkEventKey *key)
 	switch (key->keyval) {
 
 	case GDK_KEY(Tab):
-		return KEY_TAB;
+		return NS_KEY_TAB;
 
 	case GDK_KEY(BackSpace):
 		if (key->state & GDK_SHIFT_MASK)
-			return KEY_DELETE_LINE_START;
+			return NS_KEY_DELETE_LINE_START;
 		else
-			return KEY_DELETE_LEFT;
+			return NS_KEY_DELETE_LEFT;
 	case GDK_KEY(Delete):
 		if (key->state & GDK_SHIFT_MASK)
-			return KEY_DELETE_LINE_END;
+			return NS_KEY_DELETE_LINE_END;
 		else
-			return KEY_DELETE_RIGHT;
+			return NS_KEY_DELETE_RIGHT;
 	case GDK_KEY(Linefeed):	return 13;
 	case GDK_KEY(Return):	return 10;
-	case GDK_KEY(Left):		return KEY_LEFT;
-	case GDK_KEY(Right):		return KEY_RIGHT;
-	case GDK_KEY(Up):		return KEY_UP;
-	case GDK_KEY(Down):		return KEY_DOWN;
+	case GDK_KEY(Left):		return NS_KEY_LEFT;
+	case GDK_KEY(Right):		return NS_KEY_RIGHT;
+	case GDK_KEY(Up):		return NS_KEY_UP;
+	case GDK_KEY(Down):		return NS_KEY_DOWN;
 	case GDK_KEY(Home):
 		if (key->state & GDK_CONTROL_MASK)
-			return KEY_TEXT_START;
+			return NS_KEY_TEXT_START;
 		else
-			return KEY_LINE_START;
+			return NS_KEY_LINE_START;
 	case GDK_KEY(End):
 		if (key->state & GDK_CONTROL_MASK)
-			return KEY_TEXT_END;
+			return NS_KEY_TEXT_END;
 		else
-			return KEY_LINE_END;
+			return NS_KEY_LINE_END;
 	case GDK_KEY(Page_Up):
-		return KEY_PAGE_UP;
+		return NS_KEY_PAGE_UP;
 	case GDK_KEY(Page_Down):
-		return KEY_PAGE_DOWN;
+		return NS_KEY_PAGE_DOWN;
 	case 'a':
 		if (key->state & GDK_CONTROL_MASK)
-			return KEY_SELECT_ALL;
+			return NS_KEY_SELECT_ALL;
 		return gdk_keyval_to_unicode(key->keyval);
 	case 'u':
 		if (key->state & GDK_CONTROL_MASK)
-			return KEY_DELETE_LINE;
+			return NS_KEY_DELETE_LINE;
 		return gdk_keyval_to_unicode(key->keyval);
 	case 'c':
 		if (key->state & GDK_CONTROL_MASK)
-			return KEY_COPY_SELECTION;
+			return NS_KEY_COPY_SELECTION;
 		return gdk_keyval_to_unicode(key->keyval);
 	case 'v':
 		if (key->state & GDK_CONTROL_MASK)
-			return KEY_PASTE;
+			return NS_KEY_PASTE;
 		return gdk_keyval_to_unicode(key->keyval);
 	case 'x':
 		if (key->state & GDK_CONTROL_MASK)
-			return KEY_CUT_SELECTION;
+			return NS_KEY_CUT_SELECTION;
 		return gdk_keyval_to_unicode(key->keyval);
 	case 'Z':
 	case 'y':
 		if (key->state & GDK_CONTROL_MASK)
-			return KEY_REDO;
+			return NS_KEY_REDO;
 		return gdk_keyval_to_unicode(key->keyval);
 	case 'z':
 		if (key->state & GDK_CONTROL_MASK)
-			return KEY_UNDO;
+			return NS_KEY_UNDO;
 		return gdk_keyval_to_unicode(key->keyval);
 	case GDK_KEY(Escape):
-		return KEY_ESCAPE;
+		return NS_KEY_ESCAPE;
 
 		/* Modifiers - do nothing for now */
 	case GDK_KEY(Shift_L):
diff --git a/gtk/history.c b/gtk/history.c
index 2cf1438d4..deb1763c2 100644
--- a/gtk/history.c
+++ b/gtk/history.c
@@ -197,26 +197,26 @@ MENUHANDLER(export)
 /* edit menu */
 MENUHANDLER(delete_selected)
 {
-	global_history_keypress(KEY_DELETE_LEFT);
+	global_history_keypress(NS_KEY_DELETE_LEFT);
 	return TRUE;
 }
 
 MENUHANDLER(delete_all)
 {
-	global_history_keypress(KEY_SELECT_ALL);
-	global_history_keypress(KEY_DELETE_LEFT);
+	global_history_keypress(NS_KEY_SELECT_ALL);
+	global_history_keypress(NS_KEY_DELETE_LEFT);
 	return TRUE;
 }
 
 MENUHANDLER(select_all)
 {
-	global_history_keypress(KEY_SELECT_ALL);
+	global_history_keypress(NS_KEY_SELECT_ALL);
 	return TRUE;
 }
 
 MENUHANDLER(clear_selection)
 {
-	global_history_keypress(KEY_CLEAR_SELECTION);
+	global_history_keypress(NS_KEY_CLEAR_SELECTION);
 	return TRUE;
 }
 
@@ -259,6 +259,6 @@ MENUHANDLER(collapse_addresses)
 
 MENUHANDLER(launch)
 {
-	global_history_keypress(KEY_CR);
+	global_history_keypress(NS_KEY_CR);
 	return TRUE;
 }
diff --git a/gtk/hotlist.c b/gtk/hotlist.c
index 0c98bd90c..b12d09dd0 100644
--- a/gtk/hotlist.c
+++ b/gtk/hotlist.c
@@ -222,19 +222,19 @@ MENUHANDLER(edit_selected)
 
 MENUHANDLER(delete_selected)
 {
-	hotlist_keypress(KEY_DELETE_LEFT);
+	hotlist_keypress(NS_KEY_DELETE_LEFT);
 	return TRUE;
 }
 
 MENUHANDLER(select_all)
 {
-	hotlist_keypress(KEY_SELECT_ALL);
+	hotlist_keypress(NS_KEY_SELECT_ALL);
 	return TRUE;
 }
 
 MENUHANDLER(clear_selection)
 {
-	hotlist_keypress(KEY_CLEAR_SELECTION);
+	hotlist_keypress(NS_KEY_CLEAR_SELECTION);
 	return TRUE;
 }
 
@@ -277,6 +277,6 @@ MENUHANDLER(collapse_addresses)
 
 MENUHANDLER(launch)
 {
-	hotlist_keypress(KEY_CR);
+	hotlist_keypress(NS_KEY_CR);
 	return TRUE;
 }
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 85d61495c..7c785e225 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -1029,7 +1029,7 @@ MULTIHANDLER(cut)
 	if (GTK_IS_EDITABLE (focused))
 		gtk_editable_cut_clipboard (GTK_EDITABLE(g->url_bar));
 	else
-		browser_window_key_press(bw, KEY_CUT_SELECTION);
+		browser_window_key_press(bw, NS_KEY_CUT_SELECTION);
 
 	return TRUE;
 }
@@ -1043,7 +1043,7 @@ MULTIHANDLER(copy)
 	if (GTK_IS_EDITABLE (focused))
 		gtk_editable_copy_clipboard(GTK_EDITABLE(g->url_bar));
 	else
-		browser_window_key_press(bw, KEY_COPY_SELECTION);
+		browser_window_key_press(bw, NS_KEY_COPY_SELECTION);
 
 	return TRUE;
 }
@@ -1057,7 +1057,7 @@ MULTIHANDLER(paste)
 	if (GTK_IS_EDITABLE (focused))
 		gtk_editable_paste_clipboard (GTK_EDITABLE (focused));
 	else
-		browser_window_key_press(bw, KEY_PASTE);
+		browser_window_key_press(bw, NS_KEY_PASTE);
 
 	return TRUE;
 }
@@ -1083,7 +1083,7 @@ MULTIHANDLER(selectall)
 		gtk_editable_select_region(GTK_EDITABLE(g->url_bar), 0, -1);
 	} else {
 		LOG(("Selecting all document text"));
-		browser_window_key_press(bw, KEY_SELECT_ALL);
+		browser_window_key_press(bw, NS_KEY_SELECT_ALL);
 	}
 
 	return TRUE;