diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-10-03 12:37:28 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-10-11 12:06:50 +1000 |
| commit | 88dfe5366d9855e0ebf8bbff74967b793ede57d1 (patch) | |
| tree | f22c39a364d4157ed7424d290da2ed9f25c52be4 | |
| parent | 967bc25da221a69c8fc390253465145ce534fcb9 (diff) | |
dix: drop screen argument from positionSprite
We can just get this in the function, no effective functional changes.
Also return the screen to the caller. Though we don't use it yet, we will in
a follow-up patch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | dix/getevents.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 3ef7a5cc5..4206ca9e1 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -797,20 +797,20 @@ scale_from_screen(DeviceIntPtr dev, ValuatorMask *mask) * * @param dev The device to be moved. * @param mode Movement mode (Absolute or Relative) - * @param scr Screen the device's sprite is currently on. * @param mask Mask of axis values for this event * @param screenx Screen x coordinate the sprite is on after the update. * @param screeny Screen y coordinate the sprite is on after the update. */ -static void -positionSprite(DeviceIntPtr dev, int mode, ScreenPtr scr, ValuatorMask *mask, +static ScreenPtr +positionSprite(DeviceIntPtr dev, int mode, ValuatorMask *mask, double *screenx, double *screeny) { int isx, isy; /* screen {x, y}, in int */ double x, y; + ScreenPtr scr = miPointerGetScreen(dev); if (!dev->valuator || dev->valuator->numAxes < 2) - return; + return scr; if (valuator_mask_isset(mask, 0)) x = valuator_mask_get_double(mask, 0); @@ -859,6 +859,8 @@ positionSprite(DeviceIntPtr dev, int mode, ScreenPtr scr, ValuatorMask *mask, valuator_mask_set_double(mask, 0, x); if (valuator_mask_isset(mask, 1)) valuator_mask_set_double(mask, 1, y); + + return scr; } /** @@ -1124,7 +1126,6 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, DeviceEvent *event; RawDeviceEvent *raw; double screenx = 0.0, screeny = 0.0; - ScreenPtr scr = miPointerGetScreen(pDev); ValuatorMask mask; switch (type) @@ -1180,7 +1181,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, if ((flags & POINTER_NORAW) == 0) set_raw_valuators(raw, &mask, raw->valuators.data); - positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, scr, + positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, &mask, &screenx, &screeny); updateHistory(pDev, &mask, ms); |