From befa5e6ed356e019fa82b7ebf9be90913aad3edb Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <gglater62@gmail.com>
Date: Fri, 27 Mar 2015 09:36:19 +0000
Subject: To avoid namespace conflicts with ncurses add NetSurf key prefix.

Adds a NetSurf key code prefix of NS_ to all key codes.
---
 framebuffer/fbtk/event.c | 12 ++++++------
 framebuffer/gui.c        | 28 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'framebuffer')

diff --git a/framebuffer/fbtk/event.c b/framebuffer/fbtk/event.c
index 5fffb16f0..607db8984 100644
--- a/framebuffer/fbtk/event.c
+++ b/framebuffer/fbtk/event.c
@@ -314,27 +314,27 @@ fbtk_keycode_to_ucs4(int code, fbtk_modifier_type mods)
 	} else if (mods & FBTK_MOD_LCTRL || mods & FBTK_MOD_RCTRL) {
 		switch (code) {
 		case NSFB_KEY_a:
-			ucs4 = KEY_SELECT_ALL;
+			ucs4 = NS_KEY_SELECT_ALL;
 			break;
 
 		case NSFB_KEY_c:
-			ucs4 = KEY_COPY_SELECTION;
+			ucs4 = NS_KEY_COPY_SELECTION;
 			break;
 
 		case NSFB_KEY_u:
-			ucs4 = KEY_DELETE_LINE;
+			ucs4 = NS_KEY_DELETE_LINE;
 			break;
 
 		case NSFB_KEY_v:
-			ucs4 = KEY_PASTE;
+			ucs4 = NS_KEY_PASTE;
 			break;
 
 		case NSFB_KEY_x:
-			ucs4 = KEY_CUT_SELECTION;
+			ucs4 = NS_KEY_CUT_SELECTION;
 			break;
 
 		case NSFB_KEY_z:
-			ucs4 = KEY_CLEAR_SELECTION;
+			ucs4 = NS_KEY_CLEAR_SELECTION;
 			break;
 		default:
 			break;
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index fab655e1e..6eb33cd19 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -821,19 +821,19 @@ fb_browser_window_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 		switch (cbi->event->value.keycode) {
 
 		case NSFB_KEY_DELETE:
-			browser_window_key_press(gw->bw, KEY_DELETE_RIGHT);
+			browser_window_key_press(gw->bw, NS_KEY_DELETE_RIGHT);
 			break;
 
 		case NSFB_KEY_PAGEUP:
 			if (browser_window_key_press(gw->bw,
-					KEY_PAGE_UP) == false)
+					NS_KEY_PAGE_UP) == false)
 				widget_scroll_y(gw, -fbtk_get_height(
 						gw->browser), false);
 			break;
 
 		case NSFB_KEY_PAGEDOWN:
 			if (browser_window_key_press(gw->bw,
-					KEY_PAGE_DOWN) == false)
+					NS_KEY_PAGE_DOWN) == false)
 				widget_scroll_y(gw, fbtk_get_height(
 						gw->browser), false);
 			break;
@@ -843,21 +843,21 @@ fb_browser_window_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 					modifier & FBTK_MOD_LCTRL) {
 				/* CTRL held */
 				if (browser_window_key_press(gw->bw,
-						KEY_LINE_END) == false)
+						NS_KEY_LINE_END) == false)
 					widget_scroll_x(gw, INT_MAX, true);
 
 			} else if (modifier & FBTK_MOD_RSHIFT ||
 					modifier & FBTK_MOD_LSHIFT) {
 				/* SHIFT held */
 				if (browser_window_key_press(gw->bw,
-						KEY_WORD_RIGHT) == false)
+						NS_KEY_WORD_RIGHT) == false)
 					widget_scroll_x(gw, fbtk_get_width(
 						gw->browser), false);
 
 			} else {
 				/* no modifier */
 				if (browser_window_key_press(gw->bw,
-						KEY_RIGHT) == false)
+						NS_KEY_RIGHT) == false)
 					widget_scroll_x(gw, 100, false);
 			}
 			break;
@@ -867,34 +867,34 @@ fb_browser_window_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 					modifier & FBTK_MOD_LCTRL) {
 				/* CTRL held */
 				if (browser_window_key_press(gw->bw,
-						KEY_LINE_START) == false)
+						NS_KEY_LINE_START) == false)
 					widget_scroll_x(gw, 0, true);
 
 			} else if (modifier & FBTK_MOD_RSHIFT ||
 					modifier & FBTK_MOD_LSHIFT) {
 				/* SHIFT held */
 				if (browser_window_key_press(gw->bw,
-						KEY_WORD_LEFT) == false)
+						NS_KEY_WORD_LEFT) == false)
 					widget_scroll_x(gw, -fbtk_get_width(
 						gw->browser), false);
 
 			} else {
 				/* no modifier */
 				if (browser_window_key_press(gw->bw,
-						KEY_LEFT) == false)
+						NS_KEY_LEFT) == false)
 					widget_scroll_x(gw, -100, false);
 			}
 			break;
 
 		case NSFB_KEY_UP:
 			if (browser_window_key_press(gw->bw,
-					KEY_UP) == false)
+					NS_KEY_UP) == false)
 				widget_scroll_y(gw, -100, false);
 			break;
 
 		case NSFB_KEY_DOWN:
 			if (browser_window_key_press(gw->bw,
-					KEY_DOWN) == false)
+					NS_KEY_DOWN) == false)
 				widget_scroll_y(gw, 100, false);
 			break;
 
@@ -922,21 +922,21 @@ fb_browser_window_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 					(modifier & FBTK_MOD_RSHIFT ||
 					 modifier & FBTK_MOD_LSHIFT)) {
 				/* Z pressed with CTRL and SHIFT held */
-				browser_window_key_press(gw->bw, KEY_REDO);
+				browser_window_key_press(gw->bw, NS_KEY_REDO);
 				break;
 
 			} else if (cbi->event->value.keycode == NSFB_KEY_z &&
 					(modifier & FBTK_MOD_RCTRL ||
 					 modifier & FBTK_MOD_LCTRL)) {
 				/* Z pressed with CTRL held */
-				browser_window_key_press(gw->bw, KEY_UNDO);
+				browser_window_key_press(gw->bw, NS_KEY_UNDO);
 				break;
 
 			} else if (cbi->event->value.keycode == NSFB_KEY_y &&
 					(modifier & FBTK_MOD_RCTRL ||
 					 modifier & FBTK_MOD_LCTRL)) {
 				/* Y pressed with CTRL held */
-				browser_window_key_press(gw->bw, KEY_REDO);
+				browser_window_key_press(gw->bw, NS_KEY_REDO);
 				break;
 			}
 			/* Z or Y pressed but not undo or redo;
-- 
cgit v1.2.3