frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: auto-float SD's with SendCoreEvents "false" 

AlwaysCore and SendCoreEvents specify whether a device is to send core
events. A device that has either disabled is not supposed to send core
events.

With MPX/XI2, a device that is attached automatically sends core events when
the event is routed through the master device. Floating a slave device
disables core events by breaking the route.

This patch automatically floats devices that have coreEvents disabled in the
xorg.conf/HAL. This replicates the behaviour of a SendCoreEvents "false"
device in server 1.6 and earlier.

The devices may still be reattached to a master at runtime.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-09-08 09:55:22 +10:00
parent 447bd4ce90
commit 97e3f4316b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dix/devices.c
View File

@ -312,8 +312,11 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
PairDevices(NULL, other, dev); PairDevices(NULL, other, dev);
} else } else
{ {
if (dev->coreEvents)
other = (IsPointerDevice(dev)) ? inputInfo.pointer : other = (IsPointerDevice(dev)) ? inputInfo.pointer :
inputInfo.keyboard; inputInfo.keyboard;
else
other = NULL; /* auto-float non-core devices */
AttachDevice(NULL, dev, other); AttachDevice(NULL, dev, other);
} }
} }
@ -2335,7 +2338,7 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
return BadDevice; return BadDevice;
/* set from floating to floating? */ /* set from floating to floating? */
if (!dev->u.master && !master) if (!dev->u.master && !master && dev->enabled)
return Success; return Success;
/* free the existing sprite. */ /* free the existing sprite. */
@ -2357,7 +2360,13 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
*/ */
if (!master) if (!master)
{ {
WindowPtr currentRoot = dev->spriteInfo->sprite->spriteTrace[0]; WindowPtr currentRoot;
if (dev->spriteInfo->sprite)
currentRoot = dev->spriteInfo->sprite->spriteTrace[0];
else /* new device auto-set to floating */
currentRoot = WindowTable[0];
/* we need to init a fake sprite */ /* we need to init a fake sprite */
screen = currentRoot->drawable.pScreen; screen = currentRoot->drawable.pScreen;
screen->DeviceCursorInitialize(dev, screen); screen->DeviceCursorInitialize(dev, screen);