Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 8 Jun 2018 13:22:28 +0000 (15:22 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 8 Jun 2018 13:22:28 +0000 (15:22 +0200)
intern/ghost/intern/GHOST_SystemX11.cpp

index 129261480b960cd30d68963f879542ec7c252501..b7bd0be017da4301b4849102ed7656023718ac4f 100644 (file)
@@ -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;
                }