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

dix: remove pointless "flexible" x/y axis mapping 

storeLastValuators() takes the index in the mask for the x and y axis.
Completely pointless because any device that doesn't have x/y on 0 and
1, respectively, is going to break in fun ways anyway. And we only have
two callers two this function, both of which hardcode 0 and 1.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2023-02-15 10:53:01 +10:00 committed by Olivier Fourdan
parent 462b06033e
commit 6f0cd15155
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

@ -1247,19 +1247,18 @@ transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
} }
static void static void
storeLastValuators(DeviceIntPtr dev, ValuatorMask *mask, storeLastValuators(DeviceIntPtr dev, ValuatorMask *mask, double devx, double devy)
int xaxis, int yaxis, double devx, double devy)
{ {
int i; int i;
/* store desktop-wide in last.valuators */ /* store desktop-wide in last.valuators */
if (valuator_mask_isset(mask, xaxis)) if (valuator_mask_isset(mask, 0))
dev->last.valuators[0] = devx; dev->last.valuators[0] = devx;
if (valuator_mask_isset(mask, yaxis)) if (valuator_mask_isset(mask, 1))
dev->last.valuators[1] = devy; dev->last.valuators[1] = devy;
for (i = 0; i < valuator_mask_size(mask); i++) { for (i = 0; i < valuator_mask_size(mask); i++) {
if (i == xaxis || i == yaxis) if (i == 0 || i == 1)
continue; continue;
if (valuator_mask_isset(mask, i)) if (valuator_mask_isset(mask, i))
@ -1448,7 +1447,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
clipValuators(pDev, &mask); clipValuators(pDev, &mask);
storeLastValuators(pDev, &mask, 0, 1, devx, devy); storeLastValuators(pDev, &mask, devx, devy);
/* Update the MD's coordinates, which are always in desktop space. */ /* Update the MD's coordinates, which are always in desktop space. */
if (!IsMaster(pDev) && !IsFloating(pDev)) { if (!IsMaster(pDev) && !IsFloating(pDev)) {
@ -2008,7 +2007,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
clipValuators(dev, &mask); clipValuators(dev, &mask);
if (emulate_pointer) if (emulate_pointer)
storeLastValuators(dev, &mask, 0, 1, devx, devy); storeLastValuators(dev, &mask, devx, devy);
/* Update the MD's coordinates, which are always in desktop space. */ /* Update the MD's coordinates, which are always in desktop space. */
if (emulate_pointer && !IsMaster(dev) && !IsFloating(dev)) { if (emulate_pointer && !IsMaster(dev) && !IsFloating(dev)) {