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

dix: cosmetic change. Remove "pointer" variable, might as well use pDev.

This commit is contained in:
Peter Hutterer 2007-09-13 23:33:07 +09:30
parent c4db4d1fcf
commit 5d9f6cf51b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dix/getevents.c
View File

@ -619,7 +619,6 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
*valptr = valuators[i]; *valptr = valuators[i];
events++; events++;
pointer = pDev;
/* Set x and y based on whether this is absolute or relative, and /* Set x and y based on whether this is absolute or relative, and
* accelerate if we need to. */ * accelerate if we need to. */
@ -628,14 +627,14 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
x = valuators[0]; x = valuators[0];
} }
else { else {
x = pointer->valuator->lastx; x = pDev->valuator->lastx;
} }
if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) { if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) {
y = valuators[1 - first_valuator]; y = valuators[1 - first_valuator];
} }
else { else {
y = pointer->valuator->lasty; y = pDev->valuator->lasty;
} }
} }
else { else {
@ -644,14 +643,14 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
valuators); valuators);
if (first_valuator == 0 && num_valuators >= 1) if (first_valuator == 0 && num_valuators >= 1)
x = pointer->valuator->lastx + valuators[0]; x = pDev->valuator->lastx + valuators[0];
else else
x = pointer->valuator->lastx; x = pDev->valuator->lastx;
if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))
y = pointer->valuator->lasty + valuators[1 - first_valuator]; y = pDev->valuator->lasty + valuators[1 - first_valuator];
else else
y = pointer->valuator->lasty; y = pDev->valuator->lasty;
} }
/* Clip both x and y to the defined limits (usually co-ord space limit). */ /* Clip both x and y to the defined limits (usually co-ord space limit). */