Re: KEY_* to NETSURF_KEY_* change

[Vincent Sanders]

On Tue, Mar 24, 2015 at 08:25:56PM +0100, Witold Filipczyk wrote:
 Here is with the NS_ prefix.

Applied, thanks for that.

-- 
Regards Vincent
http://www.kyllikki.org/

Re: KEY_* to NETSURF_KEY_* change

[François Revol]

On 23/03/2015 11:02, Witold Filipczyk wrote:
 Hi,
 I am an entrant programmer, in the future I want to add the ncurses backend.
 The goal of this change (in the attachment) is to avoid conflicts with 
 (n)curses.
 What do you think?
 

NS_ would probably be enough as a prefix, we already did this with
NS_TRANSPARENT IIRC...

François.

KEY_* to NETSURF_KEY_* change

[Witold Filipczyk]

Hi,
I am an entrant programmer, in the future I want to add the ncurses backend.
The goal of this change (in the attachment) is to avoid conflicts with 
(n)curses.
What do you think?
diff --git a/amiga/clipboard.c b/amiga/clipboard.c
index c95a9a3..054496d 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, NETSURF_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, NETSURF_KEY_PASTE);
 
ami_clipboard_free_internal(iffh);
iffh = old_iffh;
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index 970490e..81a0620 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, 
NETSURF_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, 
NETSURF_KEY_COPY_SELECTION);
+   browser_window_key_press(gwin-gw-bw, 
NETSURF_KEY_CLEAR_SELECTION);
break;
 
case CMID_SELPASTE:
-   browser_window_key_press(gwin-gw-bw, 
KEY_PASTE);
+   browser_window_key_press(gwin-gw-bw, 
NETSURF_KEY_PASTE);
break;
 
case CMID_SELALL:
-   browser_window_key_press(gwin-gw-bw, 
KEY_SELECT_ALL);
+   browser_window_key_press(gwin-gw-bw, 
NETSURF_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, 
NETSURF_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, NETSURF_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, NETSURF_KEY_DELETE_RIGHT);
break;
}
}
diff --git a/amiga/gui.c b/amiga/gui.c
index 238a4ad..49c1252 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 = NETSURF_KEY_PAGE_UP;
}
else if(ie-ie_Qualifier  IEQUALIFIER_RALT)
{
-   nskey = KEY_TEXT_START;
+   nskey = NETSURF_KEY_TEXT_START;
}
-   else nskey = KEY_UP;
+   else nskey = NETSURF_KEY_UP;
break;
case RAWKEY_CRSRDOWN:
if(ie-ie_Qualifier  IEQUALIFIER_RSHIFT)
{
-   nskey = KEY_PAGE_DOWN;
+   nskey = NETSURF_KEY_PAGE_DOWN;
}
else if(ie-ie_Qualifier  IEQUALIFIER_RALT)
{
-   nskey = KEY_TEXT_END;
+   nskey = NETSURF_KEY_TEXT_END;
}
-   else nskey = KEY_DOWN;
+   else nskey = NETSURF_KEY_DOWN;