diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-02 23:27:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-02 23:27:33 +0300 |
| commit | b80c07321ba9611b19557d245c67f6933b80ec95 (patch) | |
| tree | 66ae08725cf0d9ef258a2b605ce816d2f4cf0e4e /intern/ghost | |
| parent | e3f48bdb4848a9b6239ec0b03a39583001086624 (diff) | |
Fix T47300: SHIFT TAB, CTRL SHIFT TAB shortcuts does not toggle snap, snap mode on off anymore.
Regression from rB12c71508c2d7.
Now, we systematically first try keycode from `XLookupKeysym()`, and only fall back to
the one from `XLookupString()` if it failed to convert to a valid gkey.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index f90ff8104fe..beb8ab5db85 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -765,7 +765,8 @@ GHOST_SystemX11::processEvent(XEvent *xe) case KeyRelease: { XKeyEvent *xke = &(xe->xkey); - KeySym key_sym = 0; + KeySym key_sym; + KeySym key_sym_str; char ascii; #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING) /* utf8_array[] is initial buffer used for Xutf8LookupString(). @@ -810,18 +811,20 @@ GHOST_SystemX11::processEvent(XEvent *xe) if ((xke->keycode >= 10 && xke->keycode < 20)) { key_sym = XLookupKeysym(xke, ShiftMask); if (!((key_sym >= XK_0) && (key_sym <= XK_9))) { - key_sym = XLookupKeysym(xke, 0); - } - if (!((key_sym >= XK_0) && (key_sym <= XK_9))) { - key_sym = 0; /* Get current-keymap valid key_sym. */ + key_sym = XLookupKeysym(xke, 0); } } + else { + key_sym = XLookupKeysym(xke, 0); + } - if (!XLookupString(xke, &ascii, 1, (key_sym == 0) ? &key_sym : NULL, NULL)) { + if (!XLookupString(xke, &ascii, 1, &key_sym_str, NULL)) { ascii = '\0'; } - gkey = convertXKey(key_sym); + if ((gkey = convertXKey(key_sym)) == GHOST_kKeyUnknown) { + gkey = convertXKey(key_sym_str); + } #else /* In keyboards like latin ones, * numbers needs a 'Shift' to be accessed but key_sym |