diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-11-22 13:57:45 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-11-22 13:57:45 -0800 |
| commit | 8e2287c220694953e972cd5119c2b0cd256b7a30 (patch) | |
| tree | 125e30a4b1fb8fab5a39ca94a30ca70a0e2282e5 /hw/xquartz/quartzKeyboard.c | |
| parent | 6eb33bc0cb2e62339d323e1f1894015d7e3142f3 (diff) | |
XQuartz: Updated some code to use newer server API
Diffstat (limited to 'hw/xquartz/quartzKeyboard.c')
| -rw-r--r-- | hw/xquartz/quartzKeyboard.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c index 9aa9ece5a..8aaa57025 100644 --- a/hw/xquartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -432,7 +432,7 @@ static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms) { DeviceIntPtr pDev; /* From ProcSetModifierMapping */ - SendMappingNotify(MappingModifier, 0, 0, serverClient); + SendMappingNotify(darwinKeyboard, MappingModifier, 0, 0, serverClient); for (pDev = inputInfo.devices; pDev; pDev = pDev->next) if (pDev->key && pDev->coreEvents) SendDeviceMappingNotify(serverClient, MappingModifier, 0, 0, pDev); @@ -442,7 +442,7 @@ static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms) { if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) assert(SetKeySymsMap(&pDev->key->curKeySyms, keySyms)); - SendMappingNotify(MappingKeyboard, keySyms->minKeyCode, + SendMappingNotify(darwinKeyboard, MappingKeyboard, keySyms->minKeyCode, keySyms->maxKeyCode - keySyms->minKeyCode + 1, serverClient); for (pDev = inputInfo.devices; pDev; pDev = pDev->next) if (pDev->key && pDev->coreEvents) @@ -477,7 +477,8 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) { QuartzBell, DarwinChangeKeyboardControl)); pthread_mutex_unlock(&keyInfo_mutex); - SwitchCoreKeyboard(pDev); + // TODO: What do we do now in 1.6? + //SwitchCoreKeyboard(pDev); DarwinKeyboardSetDeviceKeyMap(&keySyms); } |