mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap.
We need to find a better way to work with XKB on this. (cherry picked from commit ceaa5c779ceed3de5ea53727649613be3133b24e)
This commit is contained in:
@@ -1180,6 +1180,17 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
|
||||
break;
|
||||
|
||||
case NSKeyDown: case NSKeyUp:
|
||||
{
|
||||
/* XKB clobbers our keymap at startup, so we need to force it on the first keypress.
|
||||
* TODO: Make this less of a kludge.
|
||||
*/
|
||||
static int force_resync_keymap = YES;
|
||||
if(force_resync_keymap) {
|
||||
DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
|
||||
force_resync_keymap = NO;
|
||||
}
|
||||
}
|
||||
|
||||
if(darwinSyncKeymap) {
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
|
||||
TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource();
|
||||
|
||||
Reference in New Issue
Block a user