diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 16:22:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 16:22:28 +0300 |
| commit | 6739bb195ea332cb067311c9162a9439204b9485 (patch) | |
| tree | 86a9d2440df441a11de0467e29767c03395811af | |
| parent | 0dd9a9e66a31fe2adfa79f2378600d3ac15a8e71 (diff) | |
| parent | 540e85d567b7fa9f1a2da8f8760c6cd24e3cfa13 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 129261480b9..b7bd0be017d 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1843,8 +1843,13 @@ convertXKey(KeySym key) #endif /* Non US keyboard layouts: avoid 'UnknownKey' - TODO(campbell): lookup scan-codes. */ GXMAP(type, XK_dead_circumflex, GHOST_kKeyAccentGrave); /* 'de' */ + GXMAP(type, XK_masculine, GHOST_kKeyAccentGrave); /* 'es' */ + GXMAP(type, XK_onehalf, GHOST_kKeyAccentGrave); /* 'dk' */ GXMAP(type, XK_twosuperior, GHOST_kKeyAccentGrave); /* 'fr' */ default: +#ifdef GHOST_DEBUG + printf("%s: unknown key: %lu / 0x%lx\n", __func__, key, key); +#endif type = GHOST_kKeyUnknown; break; } |