[PATCH 05/20] dix: replace direct master access with GetMaster and temp. device.
Peter Hutterer
peter.hutterer at who-t.net
Thu Feb 17 19:52:12 PST 2011
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
dix/getevents.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dix/getevents.c b/dix/getevents.c
index 794df42..60282a8 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)
--
1.7.4
More information about the xorg-devel
mailing list