diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 15:57:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 15:57:17 +0300 |
| commit | 97e7d9f90b31a0ede58e123bfec35d7fb1f913d4 (patch) | |
| tree | 828bb6f45a491a8c22e006a09608aa126de90f0a /intern/ghost | |
| parent | d97df0d0e682c56b0cc24e89398651d1d22e9ac3 (diff) | |
| parent | 4127aeb7a5da5eeff8d6278b94f6302187ab0264 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 5d14ff5bb93..129261480b9 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1841,6 +1841,9 @@ convertXKey(KeySym key) GXMAP(type, XF86XK_AudioForward, GHOST_kKeyMediaLast); #endif #endif + /* Non US keyboard layouts: avoid 'UnknownKey' - TODO(campbell): lookup scan-codes. */ + GXMAP(type, XK_dead_circumflex, GHOST_kKeyAccentGrave); /* 'de' */ + GXMAP(type, XK_twosuperior, GHOST_kKeyAccentGrave); /* 'fr' */ default: type = GHOST_kKeyUnknown; break; |