diff options
author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-11-28 11:46:15 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-12-02 15:50:38 +1000 |
commit | 5d02e580d7c4144ea6f0984240fc913e05fec877 (patch) | |
tree | f5526ea9debbb4e7e63e6677ed8ade1956ff39e8 /dix | |
parent | 95fc59a199f99bf167fbb09297a9bb0e33e31869 (diff) |
dix: use UpdateFromMaster in GetProximityEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Diffstat (limited to 'dix')
-rw-r--r-- | dix/getevents.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 3d004920b..1671a2411 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -1079,7 +1079,6 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, { int num_events = 1; deviceKeyButtonPointer *kbp; - DeviceIntPtr master; /* Sanity checks. */ if (type != ProximityIn && type != ProximityOut) @@ -1101,16 +1100,7 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, (num_valuators + first_valuator) > pDev->valuator->numAxes) return 0; - master = pDev->u.master; - if (master && master->u.lastSlave != pDev) - { - CreateClassesChangedEvent(events, master, pDev); - updateSlaveDeviceCoords(master, pDev); - master->u.lastSlave = pDev; - master->last.numValuators = pDev->last.numValuators; - num_events++; - events++; - } + events = updateFromMaster(events, pDev, &num_events); kbp = (deviceKeyButtonPointer *) events->event; kbp->type = type; |