Commit 5d02e580 authored by Peter Hutterer's avatar Peter Hutterer

dix: use UpdateFromMaster in GetProximityEvents.

Signed-off-by: default avatarPeter Hutterer <peter.hutterer@redhat.com>
parent 95fc59a1
...@@ -1079,7 +1079,6 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, ...@@ -1079,7 +1079,6 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,
{ {
int num_events = 1; int num_events = 1;
deviceKeyButtonPointer *kbp; deviceKeyButtonPointer *kbp;
DeviceIntPtr master;
/* Sanity checks. */ /* Sanity checks. */
if (type != ProximityIn && type != ProximityOut) if (type != ProximityIn && type != ProximityOut)
...@@ -1101,16 +1100,7 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, ...@@ -1101,16 +1100,7 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,
(num_valuators + first_valuator) > pDev->valuator->numAxes) (num_valuators + first_valuator) > pDev->valuator->numAxes)
return 0; return 0;
master = pDev->u.master; events = updateFromMaster(events, pDev, &num_events);
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++;
}
kbp = (deviceKeyButtonPointer *) events->event; kbp = (deviceKeyButtonPointer *) events->event;
kbp->type = type; kbp->type = type;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment