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

dix: move storing last.valuators into a helper function 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-12-09 15:49:04 +10:00
parent a15abf82dd
commit 10a8c428fa
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dix/getevents.c
View File

@ -1094,6 +1094,30 @@ transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
valuator_mask_set_double(mask, 1, y); valuator_mask_set_double(mask, 1, y);
} }
static void
storeLastValuators(DeviceIntPtr dev, ValuatorMask *mask,
int xaxis, int yaxis,
double devx, double devy)
{
int i;
/* store desktop-wide in last.valuators */
if (valuator_mask_isset(mask, xaxis))
dev->last.valuators[0] = devx;
if (valuator_mask_isset(mask, yaxis))
dev->last.valuators[1] = devy;
for (i = 0; i < valuator_mask_size(mask); i++)
{
if (i == xaxis || i == yaxis)
continue;
if (valuator_mask_isset(mask, i))
dev->last.valuators[i] = valuator_mask_get_double(mask, i);
}
}
/** /**
* Generate internal events representing this pointer event and enqueue them * Generate internal events representing this pointer event and enqueue them
* on the event queue. * on the event queue.
@ -1162,7 +1186,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
int buttons, CARD32 ms, int flags, int buttons, CARD32 ms, int flags,
const ValuatorMask *mask_in) const ValuatorMask *mask_in)
{ {
int num_events = 1, i; int num_events = 1;
DeviceEvent *event; DeviceEvent *event;
RawDeviceEvent *raw; RawDeviceEvent *raw;
double screenx = 0.0, screeny = 0.0; /* desktop coordinate system */ double screenx = 0.0, screeny = 0.0; /* desktop coordinate system */
@ -1237,17 +1261,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
clipValuators(pDev, &mask); clipValuators(pDev, &mask);
/* store desktop-wide in last.valuators */ storeLastValuators(pDev, &mask, 0, 1, devx, devy);
if (valuator_mask_isset(&mask, 0))
pDev->last.valuators[0] = devx;
if (valuator_mask_isset(&mask, 1))
pDev->last.valuators[1] = devy;
for (i = 2; i < valuator_mask_size(&mask); i++)
{
if (valuator_mask_isset(&mask, i))
pDev->last.valuators[i] = valuator_mask_get_double(&mask, i);
}
/* Update the MD's co-ordinates, which are always in desktop space. */ /* Update the MD's co-ordinates, which are always in desktop space. */
if (!IsMaster(pDev) || !IsFloating(pDev)) { if (!IsMaster(pDev) || !IsFloating(pDev)) {