diff options
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/dix.c | 0 | ||||
| -rw-r--r-- | xorg-server/dix/getevents.c | 7 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xorg-server/dix/dix.c b/xorg-server/dix/dix.c deleted file mode 100644 index e69de29bb..000000000 --- a/xorg-server/dix/dix.c +++ /dev/null diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index 2df32e8f5..bfde2e93f 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/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++; } |