From 6f265d55a61f9be323583b8acacae783be72bda9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 5 Jan 2010 13:15:25 +1000 Subject: [PATCH] dix: don't update the slave coordinates from the VCK. A keyboard event from a device with both valuators and keys will be posted through the VCK. In this case, do not update the slave device coordinates from the VCK - they're always 0/0. Leave them as-is, for the next pointer event will continue where it left. Signed-off-by: Peter Hutterer Reviewed-by: Keith Packard Signed-off-by: Keith Packard --- dix/getevents.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dix/getevents.c b/dix/getevents.c index 2df32e8f5..bfde2e93f 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -630,9 +630,12 @@ updateFromMaster(EventListPtr events, DeviceIntPtr dev, int type, int *num_event if (master && master->last.slave != dev) { CreateClassesChangedEvent(events, master, dev, type); - updateSlaveDeviceCoords(master, dev); + if (IsPointerDevice(master)) + { + updateSlaveDeviceCoords(master, dev); + master->last.numValuators = dev->last.numValuators; + } master->last.slave = dev; - master->last.numValuators = dev->last.numValuators; (*num_events)++; events++; }