diff options
author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-09-28 23:20:03 -0700 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-09-28 23:20:03 -0700 |
commit | 9604e0925aac3c535ddc5f670e850230d84c46f4 (patch) | |
tree | 1e165510bb1a3810290ffec1a168c985c4b5cc1f | |
parent | e60fbd976c2d2705e516950789283b5ab3c33189 (diff) |
XQuartz: Push kXquartzReloadKeymap into DarwinEventHandler
-rw-r--r-- | hw/xquartz/darwinEvents.c | 6 | ||||
-rw-r--r-- | hw/xquartz/quartzKeyboard.c | 2 | ||||
-rw-r--r-- | hw/xquartz/quartzKeyboard.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c index c4ed57fd1..de2a60eb2 100644 --- a/hw/xquartz/darwinEvents.c +++ b/hw/xquartz/darwinEvents.c @@ -269,6 +269,10 @@ static void DarwinEventHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, in DEBUG_LOG("kXquartzSpaceChanged\n"); QuartzSpaceChanged(xe[i].u.clientMessage.u.l.longs0); break; + + case kXquartzReloadKeymap: + DarwinKeyboardReloadHandler(); + break; default: ErrorF("Unknown application defined event type %d.\n", xe[i].u.u.type); @@ -321,7 +325,7 @@ Bool DarwinEQInit(void) { } mieqInit(); - mieqSetHandler(kXquartzReloadKeymap, DarwinKeyboardReloadHandler); + mieqSetHandler(kXquartzReloadKeymap, DarwinEventHandler); mieqSetHandler(kXquartzActivate, DarwinEventHandler); mieqSetHandler(kXquartzDeactivate, DarwinEventHandler); mieqSetHandler(kXquartzReloadPreferences, DarwinEventHandler); diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c index 4a52df797..ffbe3f635 100644 --- a/hw/xquartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -370,7 +370,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) { CopyKeyClass(pDev, inputInfo.keyboard); } -void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr pDev, int nevents) { +void DarwinKeyboardReloadHandler(void) { KeySymsRec keySyms; DEBUG_LOG("DarwinKeyboardReloadHandler\n"); diff --git a/hw/xquartz/quartzKeyboard.h b/hw/xquartz/quartzKeyboard.h index 215a4a9a5..1aaec6ef2 100644 --- a/hw/xquartz/quartzKeyboard.h +++ b/hw/xquartz/quartzKeyboard.h @@ -53,7 +53,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info); /* Provided for darwinEvents.c */ extern darwinKeyboardInfo keyInfo; extern pthread_mutex_t keyInfo_mutex; -void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents); +void DarwinKeyboardReloadHandler(void); int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide); int DarwinModifierNXKeyToNXKeycode(int key, int side); int DarwinModifierNXKeyToNXMask(int key); |