diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-11 15:21:31 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-22 14:35:44 +1000 |
| commit | d63c979c7fe0f2b114b27e73ebe0a706be8840ae (patch) | |
| tree | ed7b58823a5926a9cf3365c0a4dc1e9f3ce2c1ad | |
| parent | c2a9e0a96983f22f721196513e75a53ea0b86d7e (diff) | |
dix: replace direct master access with GetMaster and temp. device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
| -rw-r--r-- | dix/getevents.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 794df420b..60282a826 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -866,10 +866,11 @@ positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac, miPointerSetPosition(dev, screenx, screeny); if (dev->u.master) { - dev->u.master->last.valuators[0] = *screenx; - dev->u.master->last.valuators[1] = *screeny; - dev->u.master->last.remainder[0] = *screenx_frac; - dev->u.master->last.remainder[1] = *screeny_frac; + DeviceIntPtr master = GetMaster(dev, MASTER_POINTER); + master->last.valuators[0] = *screenx; + master->last.valuators[1] = *screeny; + master->last.remainder[0] = *screenx_frac; + master->last.remainder[1] = *screeny_frac; } if (dev->valuator) |