From befa5e6ed356e019fa82b7ebf9be90913aad3edb Mon Sep 17 00:00:00 2001 From: Witold Filipczyk 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. --- windows/drawable.c | 14 +++++++------- windows/window.c | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'windows') diff --git a/windows/drawable.c b/windows/drawable.c index 7726d6a56..f53e5d4d2 100644 --- a/windows/drawable.c +++ b/windows/drawable.c @@ -227,49 +227,49 @@ nsws_drawable_key(struct gui_window *gw, HWND hwnd, WPARAM wparam) switch(wparam) { case VK_LEFT: - i = KEY_LEFT; + i = NS_KEY_LEFT; if (shift) SendMessage(hwnd, WM_HSCROLL, MAKELONG(SB_LINELEFT, 0), 0); break; case VK_RIGHT: - i = KEY_RIGHT; + i = NS_KEY_RIGHT; if (shift) SendMessage(hwnd, WM_HSCROLL, MAKELONG(SB_LINERIGHT, 0), 0); break; case VK_UP: - i = KEY_UP; + i = NS_KEY_UP; if (shift) SendMessage(hwnd, WM_VSCROLL, MAKELONG(SB_LINEUP, 0), 0); break; case VK_DOWN: - i = KEY_DOWN; + i = NS_KEY_DOWN; if (shift) SendMessage(hwnd, WM_VSCROLL, MAKELONG(SB_LINEDOWN, 0), 0); break; case VK_HOME: - i = KEY_LINE_START; + i = NS_KEY_LINE_START; if (shift) SendMessage(hwnd, WM_HSCROLL, MAKELONG(SB_PAGELEFT, 0), 0); break; case VK_END: - i = KEY_LINE_END; + i = NS_KEY_LINE_END; if (shift) SendMessage(hwnd, WM_HSCROLL, MAKELONG(SB_PAGERIGHT, 0), 0); break; case VK_DELETE: - i = KEY_DELETE_RIGHT; + i = NS_KEY_DELETE_RIGHT; break; case VK_NEXT: diff --git a/windows/window.c b/windows/window.c index 3ea2afde9..fae9247ef 100644 --- a/windows/window.c +++ b/windows/window.c @@ -911,7 +911,7 @@ nsws_window_command(HWND hwnd, if (GetFocus() == gw->urlbar) { SendMessage(gw->urlbar, WM_CUT, 0, 0); } else if (gw->bw != NULL) { - browser_window_key_press(gw->bw, KEY_CUT_SELECTION); + browser_window_key_press(gw->bw, NS_KEY_CUT_SELECTION); } break; @@ -922,7 +922,7 @@ nsws_window_command(HWND hwnd, if (GetFocus() == gw->urlbar) { SendMessage(gw->urlbar, WM_COPY, 0, 0); } else if (gw->bw != NULL) { - browser_window_key_press(gw->bw, KEY_COPY_SELECTION); + browser_window_key_press(gw->bw, NS_KEY_COPY_SELECTION); } break; @@ -938,7 +938,7 @@ nsws_window_command(HWND hwnd, if (GetFocus() == gw->urlbar) SendMessage(gw->urlbar, WM_PASTE, 0, 0); else - browser_window_key_press(gw->bw, KEY_PASTE); + browser_window_key_press(gw->bw, NS_KEY_PASTE); break; } @@ -946,14 +946,14 @@ nsws_window_command(HWND hwnd, if (GetFocus() == gw->urlbar) SendMessage(gw->urlbar, WM_CUT, 0, 0); else - browser_window_key_press(gw->bw, KEY_DELETE_RIGHT); + browser_window_key_press(gw->bw, NS_KEY_DELETE_RIGHT); break; case IDM_EDIT_SELECT_ALL: if (GetFocus() == gw->urlbar) SendMessage(gw->urlbar, EM_SETSEL, 0, -1); else - browser_window_key_press(gw->bw, KEY_SELECT_ALL); + browser_window_key_press(gw->bw, NS_KEY_SELECT_ALL); break; case IDM_EDIT_SEARCH: -- cgit v1.2.3