fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-02-17 11:20:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'whot/server-1.6-branch' into server-1.6-branch

Browse source
This commit is contained in:
Keith Packard 2009-01-12 10:40:04 -08:00
commit fdfc70ea0a
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Xi/exevents.c
View file

@ -186,7 +186,7 @@ XIGetDevice(xEvent* xE)
* This code is basically the old SwitchCoreKeyboard.
*/
static void
void
CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
{
static DeviceIntPtr lastMapNotifyDevice = NULL;

11
mi/mieq.c
View file

@ -298,6 +298,8 @@ CopyGetMasterEvent(DeviceIntPtr mdev, xEvent* original,
while (count--)
ChangeDeviceID(mdev, &master->event[count]);
}
extern void
CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
/* Call this from ProcessInputEvents(). */
void
@ -360,8 +362,15 @@ mieqProcessInputEvents(void)
NewCurrentScreen (dev, DequeueScreen(dev), x, y);
}
else {
if (master)
if (master) {
/* Force a copy of the key class into the VCK so that the layout
is transferred. */
if (event->u.u.type == DeviceKeyPress ||
event->u.u.type == DeviceKeyRelease)
CopyKeyClass(dev, master);
CopyGetMasterEvent(master, event, masterEvents, nevents);
}
/* If someone's registered a custom event handler, let them
* steal it. */