diff options
| author | Neil <nyamatongwe@gmail.com> | 2016-03-29 15:38:45 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2016-03-29 15:38:45 +1100 |
| commit | 0604389a02a2cb5f33f5f84e460ad3d7a55f1fc4 (patch) | |
| tree | 80b37f718682eaeb207d6b82b4c6940a8b6e8c11 /gtk/ScintillaGTK.cxx | |
| parent | b5618916b1164f90254ebb8c6eed2b5f86fdcc12 (diff) | |
| download | scintilla-mirror-0604389a02a2cb5f33f5f84e460ad3d7a55f1fc4.tar.gz | |
Feature [feature-requests:#1142]. Allow Super modifier on GTK+.
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 25e160510..ad9aa6568 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -2192,6 +2192,7 @@ gboolean ScintillaGTK::KeyThis(GdkEventKey *event) { bool shift = (event->state & GDK_SHIFT_MASK) != 0; bool ctrl = (event->state & GDK_CONTROL_MASK) != 0; bool alt = (event->state & GDK_MOD1_MASK) != 0; + bool super = (event->state & GDK_MOD4_MASK) != 0; guint key = event->keyval; if ((ctrl || alt) && (key < 128)) key = toupper(key); @@ -2208,15 +2209,12 @@ gboolean ScintillaGTK::KeyThis(GdkEventKey *event) { bool consumed = false; #if !(PLAT_GTK_MACOSX) - bool added = KeyDown(key, shift, ctrl, alt, &consumed) != 0; + bool meta = false; #else bool meta = ctrl; ctrl = (event->state & GDK_META_MASK) != 0; - bool added = KeyDownWithModifiers(key, (shift ? SCI_SHIFT : 0) | - (ctrl ? SCI_CTRL : 0) | - (alt ? SCI_ALT : 0) | - (meta ? SCI_META : 0), &consumed) != 0; #endif + bool added = KeyDownWithModifiers(key, ModifierFlags(shift, ctrl, alt, meta, super), &consumed) != 0; if (!consumed) consumed = added; //fprintf(stderr, "SK-key: %d %x %x\n",event->keyval, event->state, consumed); |