XQuartz: Nuke duplicate locks that make painful headaches
(cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)
This commit is contained in:
parent
fba8c702ba
commit
7159381881
|
@ -296,13 +296,11 @@ static void DarwinLoadKeyboardMapping(KeySymsRec *keySyms) {
|
||||||
static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms, CARD8 *modmap) {
|
static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms, CARD8 *modmap) {
|
||||||
DeviceIntPtr pDev;
|
DeviceIntPtr pDev;
|
||||||
|
|
||||||
pthread_mutex_lock(&keyInfo_mutex);
|
|
||||||
for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
|
for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
|
||||||
if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key)
|
if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key)
|
||||||
XkbApplyMappingChange(pDev, keySyms, keySyms->minKeyCode,
|
XkbApplyMappingChange(pDev, keySyms, keySyms->minKeyCode,
|
||||||
keySyms->maxKeyCode - keySyms->minKeyCode + 1,
|
keySyms->maxKeyCode - keySyms->minKeyCode + 1,
|
||||||
modmap, serverClient);
|
modmap, serverClient);
|
||||||
pthread_mutex_unlock(&keyInfo_mutex);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue