diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-09 13:06:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-09 13:06:33 +0300 |
| commit | 7ce81484f8214cd52b000e8d3f47dd3aed56da84 (patch) | |
| tree | f04125842db46058091913d0c76a05725f563b70 | |
| parent | b492a0e7671a0b09ab2d9b8b9d81c28481e44753 (diff) | |
| parent | 6f4c7f1f0173773fc75e2ad0c992f384d8a193b6 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index e50df358cb2..ce89b5c8758 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -969,7 +969,6 @@ GHOST_SystemX11::processEvent(XEvent *xe) { XKeyEvent *xke = &(xe->xkey); 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(). @@ -1014,6 +1013,7 @@ GHOST_SystemX11::processEvent(XEvent *xe) * * [1] http://cgit.freedesktop.org/xorg/lib/libX11/tree/src/KeyBind.c */ + KeySym key_sym_str; /* Mode_switch 'modifier' is AltGr - when this one or Shift are enabled, we do not want to apply * that 'forced number' hack. */ const unsigned int mode_switch_mask = XkbKeysymToModifiers(xke->display, XK_Mode_switch); @@ -1098,7 +1098,7 @@ GHOST_SystemX11::processEvent(XEvent *xe) key_sym = XLookupKeysym(xke, 0); } - gkey = ghost_key_from_keysym(key_sym); + gkey = ghost_key_from_keysym_or_keycode(key_sym, m_xkb_descr, xke->keycode); if (!XLookupString(xke, &ascii, 1, NULL, NULL)) { ascii = '\0'; |