summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-07-31 22:55:08 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-07-31 22:55:08 +0100
commit9e3db46b67f45b57a683fe1ff3350f89a6387354 (patch)
treee5ca60728fe3d315620233ba3fd02a5ded575a93
parent21ce8800b8b25ae2b5efefa2136c02387d390e8c (diff)
downloadnetsurf-9e3db46b67f45b57a683fe1ff3350f89a6387354.tar.gz
netsurf-9e3db46b67f45b57a683fe1ff3350f89a6387354.tar.bz2
Handle CTRL modifier too. CTRL with cursor left/right is same as SHIFT. CTRL+U clears writable.
-rw-r--r--framebuffer/fbtk/text.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/framebuffer/fbtk/text.c b/framebuffer/fbtk/text.c
index e2f0fa389..15c3f7a4f 100644
--- a/framebuffer/fbtk/text.c
+++ b/framebuffer/fbtk/text.c
@@ -306,6 +306,14 @@ text_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
modifier &= ~(1<<1);
break;
+ case NSFB_KEY_RCTRL:
+ modifier &= ~(1<<2);
+ break;
+
+ case NSFB_KEY_LCTRL:
+ modifier &= ~(1<<3);
+ break;
+
default:
break;
}
@@ -371,7 +379,28 @@ text_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
modifier |= 1<<1;
break;
+ case NSFB_KEY_RCTRL:
+ modifier |= 1<<2;
+ break;
+
+ case NSFB_KEY_LCTRL:
+ modifier |= 1<<3;
+ break;
+
default:
+ if (modifier & 1<<2 || modifier & 1<<3) {
+ /* CTRL pressed, don't enter any text */
+ if (value == NSFB_KEY_u) {
+ /* CTRL+U: clear writable */
+ widget->u.text.idx = 0;
+ widget->u.text.len = 0;
+ widget->u.text.text[widget->u.text.len] = '\0';
+ widget->u.text.width = 0;
+ caret_moved = true;
+ }
+ break;
+ }
+
/* allow for new character and null */
temp = realloc(widget->u.text.text, widget->u.text.len + 2);
if (temp == NULL) {