[Bf-blender-cvs] [4127aeb7a5d] master: GHOST/X11: Map unknown de, fr keys to accentgrave

Campbell Barton noreply at git.blender.org
Fri Jun 8 14:54:21 CEST 2018


Commit: 4127aeb7a5da5eeff8d6278b94f6302187ab0264
Author: Campbell Barton
Date:   Fri Jun 8 14:53:03 2018 +0200
Branches: master
https://developer.blender.org/rB4127aeb7a5da5eeff8d6278b94f6302187ab0264

GHOST/X11: Map unknown de,fr keys to accentgrave

This still uses the correct string when typing text,
it just allows the key to be used in keymaps.

We should eventually add scan-code support.

===================================================================

M	intern/ghost/intern/GHOST_SystemX11.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 62befc2f227..cecfeee134d 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -1743,6 +1743,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;



More information about the Bf-blender-cvs mailing list