fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-24 13:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't send events through the master if the device has SendCoreEvents off.

Browse source 
In server 1.6, all devices are attached to the master device (VCP or VCK).
Sending an event through the master device means the device is sending core
events. If a device is configured as SendCoreEvents, just send through the
device, not through the master.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-09-16 15:46:55 +10:00 • committed by Keith Packard
parent 507e57381f
commit a26fd1a6d6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dix/getevents.c
View file

@ -536,7 +536,7 @@ static EventListPtr
updateFromMaster(EventListPtr events, DeviceIntPtr dev, int *num_events)
{
DeviceIntPtr master = dev->u.master;
if (master && master->u.lastSlave != dev)
if (master && master->u.lastSlave != dev && dev->coreEvents)
{
updateSlaveDeviceCoords(master, dev);
master->u.lastSlave = dev;
@ -674,7 +674,7 @@ positionSprite(DeviceIntPtr dev, int *x, int *y,
* to the current screen. */
miPointerSetPosition(dev, &dev->last.valuators[0], &dev->last.valuators[1]);
if (dev->u.master) {
if (dev->u.master && dev->coreEvents) {
dev->u.master->last.valuators[0] = dev->last.valuators[0];
dev->u.master->last.valuators[1] = dev->last.valuators[1];
}

4
mi/mieq.c
View file

@ -446,7 +446,7 @@ mieqProcessInputEvents(void)
NewCurrentScreen (dev, DequeueScreen(dev), x, y);
}
else {
if (master) {
if (master && dev->coreEvents) {
/* Force a copy of the key class into the VCK so that the layout
is transferred. */
if (event->u.u.type == DeviceKeyPress ||
@ -473,7 +473,7 @@ mieqProcessInputEvents(void)
/* process slave first, then master */
dev->public.processInputProc(event, dev, nevents);
if (master)
if (master && dev->coreEvents)
master->public.processInputProc(masterEvents->event, master,
nevents);
}