From 7af0614202bf89e3fae0fa06b65b74aa9bc580fc Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 11 Feb 2013 10:34:06 +0000 Subject: Make delete line key enum value name less missleading. (Doesn't cut to clipboard.) --- desktop/textarea.c | 3 +-- desktop/textinput.h | 2 +- framebuffer/fbtk/event.c | 2 +- gtk/gui.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/desktop/textarea.c b/desktop/textarea.c index 9dd3ace2d..9c3243293 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -1757,8 +1757,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) } redraw = true; break; - case KEY_CUT_LINE: - /* Not actually CUT to clipboard, just delete */ + case KEY_DELETE_LINE: if (readonly) break; if (ta->sel_start != -1) { diff --git a/desktop/textinput.h b/desktop/textinput.h index 745addeb6..e0581b23a 100644 --- a/desktop/textinput.h +++ b/desktop/textinput.h @@ -38,7 +38,7 @@ enum input_key { KEY_SHIFT_TAB = 11, KEY_CR = 13, - KEY_CUT_LINE = 21, + KEY_DELETE_LINE = 21, KEY_PASTE = 22, KEY_CUT_SELECTION = 24, KEY_CLEAR_SELECTION = 26, diff --git a/framebuffer/fbtk/event.c b/framebuffer/fbtk/event.c index 3ace28aaf..bd018c52c 100644 --- a/framebuffer/fbtk/event.c +++ b/framebuffer/fbtk/event.c @@ -316,7 +316,7 @@ fbtk_keycode_to_ucs4(int code, fbtk_modifier_type mods) break; case NSFB_KEY_u: - ucs4 = KEY_CUT_LINE; + ucs4 = KEY_DELETE_LINE; break; case NSFB_KEY_v: diff --git a/gtk/gui.c b/gtk/gui.c index faae172df..f44a13824 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -1028,7 +1028,7 @@ uint32_t gtk_gui_gdkkey_to_nskey(GdkEventKey *key) return gdk_keyval_to_unicode(key->keyval); case 'u': if (key->state & GDK_CONTROL_MASK) - return KEY_CUT_LINE; + return KEY_DELETE_LINE; return gdk_keyval_to_unicode(key->keyval); case 'c': if (key->state & GDK_CONTROL_MASK) -- cgit v1.2.3