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. --- desktop/textarea.c | 56 +++++++++++++++++++++++----------------------- desktop/textinput.h | 64 ++++++++++++++++++++++++++--------------------------- desktop/treeview.c | 38 +++++++++++++++---------------- 3 files changed, 79 insertions(+), 79 deletions(-) (limited to 'desktop') diff --git a/desktop/textarea.c b/desktop/textarea.c index 573da1d1d..a2e6c167b 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -2448,10 +2448,10 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) caret += byte_delta; } else switch (key) { - case KEY_SELECT_ALL: + case NS_KEY_SELECT_ALL: textarea_select(ta, 0, ta->show->len - 1, true); return true; - case KEY_COPY_SELECTION: + case NS_KEY_COPY_SELECTION: if (ta->sel_start != -1) { if (!textarea_replace_text(ta, ta->sel_start, ta->sel_end, @@ -2459,7 +2459,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) return false; } break; - case KEY_DELETE_LEFT: + case NS_KEY_DELETE_LEFT: if (readonly) break; if (ta->sel_start != -1) { @@ -2480,7 +2480,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) } caret += byte_delta; break; - case KEY_DELETE_RIGHT: + case NS_KEY_DELETE_RIGHT: if (readonly) break; if (ta->sel_start != -1) { @@ -2503,8 +2503,8 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) } caret += byte_delta; break; - case KEY_CR: - case KEY_NL: + case NS_KEY_CR: + case NS_KEY_NL: if (readonly) break; @@ -2527,7 +2527,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) } caret += byte_delta; break; - case KEY_PASTE: + case NS_KEY_PASTE: { char *clipboard = NULL; size_t clipboard_length; @@ -2562,7 +2562,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) free(clipboard); } break; - case KEY_CUT_SELECTION: + case NS_KEY_CUT_SELECTION: if (readonly) break; if (ta->sel_start != -1) { @@ -2577,11 +2577,11 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_reset_selection(ta); } break; - case KEY_ESCAPE: - /* Fall through to KEY_CLEAR_SELECTION */ - case KEY_CLEAR_SELECTION: + case NS_KEY_ESCAPE: + /* Fall through to NS_KEY_CLEAR_SELECTION */ + case NS_KEY_CLEAR_SELECTION: return textarea_clear_selection(ta); - case KEY_LEFT: + case NS_KEY_LEFT: if (readonly) break; if (caret > 0) @@ -2590,7 +2590,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_clear_selection(ta); } break; - case KEY_RIGHT: + case NS_KEY_RIGHT: if (readonly) break; if (caret < ta->show->len - 1) @@ -2600,7 +2600,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_clear_selection(ta); } break; - case KEY_UP: + case NS_KEY_UP: if (readonly) break; if (ta->sel_start != -1) { @@ -2620,7 +2620,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_set_caret_xy(ta, x, y, false); return true; - case KEY_DOWN: + case NS_KEY_DOWN: if (readonly) break; if (ta->sel_start != -1) { @@ -2640,7 +2640,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_set_caret_xy(ta, x, y, false); return true; - case KEY_PAGE_UP: + case NS_KEY_PAGE_UP: if (!(ta->flags & TEXTAREA_MULTILINE)) break; y = ta->vis_height - 2 * ta->border_width - @@ -2648,7 +2648,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) ta->line_height; textarea_scroll(ta, 0, -y); return true; - case KEY_PAGE_DOWN: + case NS_KEY_PAGE_DOWN: if (!(ta->flags & TEXTAREA_MULTILINE)) break; y = ta->vis_height - 2 * ta->border_width - @@ -2656,7 +2656,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) ta->line_height; textarea_scroll(ta, 0, y); return true; - case KEY_LINE_START: + case NS_KEY_LINE_START: if (readonly) break; caret -= ta->caret_pos.byte_off; @@ -2664,7 +2664,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_clear_selection(ta); } break; - case KEY_LINE_END: + case NS_KEY_LINE_END: if (readonly) break; @@ -2679,7 +2679,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_clear_selection(ta); } break; - case KEY_TEXT_START: + case NS_KEY_TEXT_START: if (readonly) break; caret = 0; @@ -2687,7 +2687,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_clear_selection(ta); } break; - case KEY_TEXT_END: + case NS_KEY_TEXT_END: if (readonly) break; caret = ta->show->len - 1; @@ -2695,7 +2695,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_clear_selection(ta); } break; - case KEY_WORD_LEFT: + case NS_KEY_WORD_LEFT: if (readonly) break; if (caret == 0) @@ -2715,7 +2715,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_clear_selection(ta); } break; - case KEY_WORD_RIGHT: + case NS_KEY_WORD_RIGHT: if (readonly) break; if (strchr(sep, ta->show->data[caret]) != NULL && @@ -2738,7 +2738,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) textarea_clear_selection(ta); } break; - case KEY_DELETE_LINE: + case NS_KEY_DELETE_LINE: if (readonly) break; if (ta->sel_start != -1) { @@ -2771,7 +2771,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) } caret += byte_delta; break; - case KEY_DELETE_LINE_END: + case NS_KEY_DELETE_LINE_END: if (readonly) break; if (ta->sel_start != -1) { @@ -2793,7 +2793,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) } caret += byte_delta; break; - case KEY_DELETE_LINE_START: + case NS_KEY_DELETE_LINE_START: if (readonly) break; if (ta->sel_start != -1) { @@ -2814,7 +2814,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) } caret += byte_delta; break; - case KEY_UNDO: + case NS_KEY_UNDO: if (!textarea_undo(ta, false, &caret, &r)) { /* We consume the UNDO, even if we can't act * on it. */ @@ -2825,7 +2825,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) } redraw = true; break; - case KEY_REDO: + case NS_KEY_REDO: if (!textarea_undo(ta, true, &caret, &r)) { /* We consume the REDO, even if we can't act * on it. */ diff --git a/desktop/textinput.h b/desktop/textinput.h index 123bf5d82..0b3593104 100644 --- a/desktop/textinput.h +++ b/desktop/textinput.h @@ -30,44 +30,44 @@ struct browser_window; enum input_key { - KEY_SELECT_ALL = 1, - KEY_COPY_SELECTION = 3, + NS_KEY_SELECT_ALL = 1, + NS_KEY_COPY_SELECTION = 3, - KEY_DELETE_LEFT = 8, - KEY_TAB = 9, + NS_KEY_DELETE_LEFT = 8, + NS_KEY_TAB = 9, - KEY_NL = 10, - KEY_SHIFT_TAB = 11, - KEY_CR = 13, + NS_KEY_NL = 10, + NS_KEY_SHIFT_TAB = 11, + NS_KEY_CR = 13, - KEY_DELETE_LINE = 21, - KEY_PASTE = 22, - KEY_CUT_SELECTION = 24, - KEY_CLEAR_SELECTION = 26, + NS_KEY_DELETE_LINE = 21, + NS_KEY_PASTE = 22, + NS_KEY_CUT_SELECTION = 24, + NS_KEY_CLEAR_SELECTION = 26, - KEY_ESCAPE = 27, + NS_KEY_ESCAPE = 27, /* cursor movement keys */ - KEY_LEFT = 28, - KEY_RIGHT, - KEY_UP, - KEY_DOWN, - - KEY_DELETE_RIGHT = 127, - - KEY_LINE_START = 128, - KEY_LINE_END, - KEY_TEXT_START, - KEY_TEXT_END, - KEY_WORD_LEFT, - KEY_WORD_RIGHT, - KEY_PAGE_UP, - KEY_PAGE_DOWN, - KEY_DELETE_LINE_END, - KEY_DELETE_LINE_START, - - KEY_UNDO, - KEY_REDO + NS_KEY_LEFT = 28, + NS_KEY_RIGHT, + NS_KEY_UP, + NS_KEY_DOWN, + + NS_KEY_DELETE_RIGHT = 127, + + NS_KEY_LINE_START = 128, + NS_KEY_LINE_END, + NS_KEY_TEXT_START, + NS_KEY_TEXT_END, + NS_KEY_WORD_LEFT, + NS_KEY_WORD_RIGHT, + NS_KEY_PAGE_UP, + NS_KEY_PAGE_DOWN, + NS_KEY_DELETE_LINE_END, + NS_KEY_DELETE_LINE_START, + + NS_KEY_UNDO, + NS_KEY_REDO }; diff --git a/desktop/treeview.c b/desktop/treeview.c index 89abfb22c..f6134ae71 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -2663,7 +2663,7 @@ static bool treeview_keyboard_navigation(treeview *tree, uint32_t key, redraw = treeview_clear_selection(tree, rect); switch (key) { - case KEY_LEFT: + case NS_KEY_LEFT: if (ns.curr != NULL && ns.curr->parent != NULL && ns.curr->parent->type != TREE_NODE_ROOT) { @@ -2676,7 +2676,7 @@ static bool treeview_keyboard_navigation(treeview *tree, uint32_t key, } break; - case KEY_RIGHT: + case NS_KEY_RIGHT: if (ns.curr != NULL) { if (!(ns.curr->flags & TV_NFLAGS_EXPANDED)) { /* Toggle node to expanded */ @@ -2702,14 +2702,14 @@ static bool treeview_keyboard_navigation(treeview *tree, uint32_t key, } break; - case KEY_UP: + case NS_KEY_UP: if (ns.prev != NULL) { /* Step to previous node */ ns.prev->flags |= TV_NFLAGS_SELECTED; } break; - case KEY_DOWN: + case NS_KEY_DOWN: if (ns.next != NULL) { /* Step to next node */ ns.next->flags |= TV_NFLAGS_SELECTED; @@ -2745,11 +2745,11 @@ bool treeview_keypress(treeview *tree, uint32_t key) /* Pass to textarea, if editing in progress */ if (tree->edit.textarea != NULL) { switch (key) { - case KEY_ESCAPE: + case NS_KEY_ESCAPE: treeview_edit_cancel(tree, true); return true; - case KEY_NL: - case KEY_CR: + case NS_KEY_NL: + case NS_KEY_CR: treeview_edit_done(tree); return true; default: @@ -2759,14 +2759,14 @@ bool treeview_keypress(treeview *tree, uint32_t key) /* Keypress to be handled by treeview */ switch (key) { - case KEY_SELECT_ALL: + case NS_KEY_SELECT_ALL: redraw = treeview_select_all(tree, &r); break; - case KEY_COPY_SELECTION: + case NS_KEY_COPY_SELECTION: treeview_copy_selection(tree); break; - case KEY_DELETE_LEFT: - case KEY_DELETE_RIGHT: + case NS_KEY_DELETE_LEFT: + case NS_KEY_DELETE_RIGHT: redraw = treeview_delete_selection(tree, &r); if (tree->flags & TREEVIEW_DEL_EMPTY_DIRS) { @@ -2782,18 +2782,18 @@ bool treeview_keypress(treeview *tree, uint32_t key) } } break; - case KEY_CR: - case KEY_NL: + case NS_KEY_CR: + case NS_KEY_NL: treeview_launch_selection(tree); break; - case KEY_ESCAPE: - case KEY_CLEAR_SELECTION: + case NS_KEY_ESCAPE: + case NS_KEY_CLEAR_SELECTION: redraw = treeview_clear_selection(tree, &r); break; - case KEY_LEFT: - case KEY_RIGHT: - case KEY_UP: - case KEY_DOWN: + case NS_KEY_LEFT: + case NS_KEY_RIGHT: + case NS_KEY_UP: + case NS_KEY_DOWN: redraw = treeview_keyboard_navigation(tree, key, &r); break; default: -- cgit v1.2.3