diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-10-03 13:58:01 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-10-11 12:07:00 +1000 |
| commit | 32b289e46cc2d5ec32ff0c4ba5bbfbf602afb388 (patch) | |
| tree | 821ead0e9481b4c11d8055f87c337902213d8abe | |
| parent | 3b36fd1b49030ead44358945f62e5abe7f4609ce (diff) | |
dix: move MD last.valuator update into fill_pointer_events
Don't update the MD where it's not expected, positionSprite should really
just do that - position the sprite.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.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 ade3ca132..874189f57 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -844,12 +844,6 @@ positionSprite(DeviceIntPtr dev, int mode, ValuatorMask *mask, y = rescaleValuatorAxis(*screeny, NULL, dev->valuator->axes + 1, scr->height); - /* Update the MD's co-ordinates, which are always in screen space. */ - if (!IsMaster(dev) || !IsFloating(dev)) { - DeviceIntPtr master = GetMaster(dev, MASTER_POINTER); - master->last.valuators[0] = *screenx; - master->last.valuators[1] = *screeny; - } if (valuator_mask_isset(mask, 0)) valuator_mask_set_double(mask, 0, x); @@ -1189,6 +1183,13 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, pDev->last.valuators[i] = valuator_mask_get_double(&mask, i); } + /* Update the MD's co-ordinates, which are always in screen space. */ + if (!IsMaster(pDev) || !IsFloating(pDev)) { + DeviceIntPtr master = GetMaster(pDev, MASTER_POINTER); + master->last.valuators[0] = screenx; + master->last.valuators[1] = screeny; + } + event = &events->device_event; init_device_event(event, pDev, ms); |