diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-12 15:29:36 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-01-30 17:10:40 -0800 |
| commit | 50d80c25525a691472e3fc5859fb303a3ffe1ef2 (patch) | |
| tree | 2c7b1cbeab5aaca49dfcffbcbd82f91610a227e7 /mi | |
| parent | b19f12712a0762f20065282fd055fe9bc3ca975f (diff) | |
dix: fix WarpPointer calls for devices with custom valuator ranges (#19297)
If the MD's lastSlave was a devices with custom axes ranges, then a
WarpPointer would position the cursor at the wrong location. A WarpPointer
request provides screen coordinates and these coordinates were scaled to the
device range before warping.
This patch consists of two parts:
1) in the WarpPointer handling, get the lastSlave and post the event through
this device.
2) assume that WarpPointer coordinates are always in screen coordinates and
scale them to device coordinates in GPE before continuing. Note that this
breaks device-coordinate based XWarpDevicePointer calls (for which the spec
isn't nailed down yet anyway) until a better solution is found.
X.Org Bug 19297 <http://bugs.freedesktop.org/show_bug.cgi?id=19297>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit d36adf52a2b2711d22b11105f7bd907d4493fb9b)
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/mipointer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mi/mipointer.c b/mi/mipointer.c index 9b2a1b2ba..8c8af6ec2 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -576,7 +576,7 @@ miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) } } - nevents = GetPointerEvents(events, pDev, MotionNotify, 0, POINTER_ABSOLUTE, 0, 2, valuators); + nevents = GetPointerEvents(events, pDev, MotionNotify, 0, POINTER_SCREEN | POINTER_ABSOLUTE, 0, 2, valuators); OsBlockSignals(); #ifdef XQUARTZ |