fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-14 19:30:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: Push kXquartzReloadKeymap into DarwinEventHandler

Browse source 
(cherry picked from commit 9604e0925a)
This commit is contained in:
Jeremy Huddleston 2009-09-28 23:56:28 -07:00
parent 3218bc7eb5
commit 35dfe0bd9a
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/xquartz/darwinEvents.c
View file

@ -270,6 +270,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);
@ -322,7 +326,7 @@ Bool DarwinEQInit(void) {
}
mieqInit();
mieqSetHandler(kXquartzReloadKeymap, DarwinKeyboardReloadHandler);
mieqSetHandler(kXquartzReloadKeymap, DarwinEventHandler);
mieqSetHandler(kXquartzActivate, DarwinEventHandler);
mieqSetHandler(kXquartzDeactivate, DarwinEventHandler);
mieqSetHandler(kXquartzReloadPreferences, DarwinEventHandler);

2
hw/xquartz/quartzKeyboard.c
View file

@ -367,7 +367,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
SwitchCoreKeyboard(pDev);
}
void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr pDev, int nevents) {
void DarwinKeyboardReloadHandler(void) {
KeySymsRec keySyms;
DEBUG_LOG("DarwinKeyboardReloadHandler\n");

3
hw/xquartz/quartzKeyboard.h
View file

@ -53,8 +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 DarwinKeyboardInit(DeviceIntPtr pDev);
void DarwinKeyboardReloadHandler(void);
int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);
int DarwinModifierNXKeyToNXKeycode(int key, int side);
int DarwinModifierNXKeyToNXMask(int key);