debian/changelog | 6 +++
debian/patches/503_fix_mouse_warp.patch | 52 ++++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 58 insertions(+), 1 deletion(-)
New commits:
commit 8676e14cf7a5e0a50d46f2b7b18810940f69f86c
Author: Chase Douglas <chase.doug...@canonical.com>
Date: Thu Mar 29 15:40:03 2012 -0700
Fix mouse warping and clipping (LP: #948938)
* Fix mouse warping and clipping (LP: #948938)
- Add temporary patch 503_fix_mouse_warp.patch
diff --git a/debian/changelog b/debian/changelog
index eb92668..fc38802 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,11 @@ xorg-server (2:1.11.4-0ubuntu8) UNRELEASED; urgency=low
miGetDCDevice. Fixes crash after connecting a bluetooth keyboard.
(LP: #930936)
- -- Bryce Harrington <br...@ubuntu.com> Tue, 27 Mar 2012 18:46:03 -0700
+ [ Chase Douglas ]
+ * Fix mouse warping and clipping (LP: #948938)
+ - Add temporary patch 503_fix_mouse_warp.patch
+
+ -- Chase Douglas <chase.doug...@ubuntu.com> Thu, 29 Mar 2012 15:38:53 -0700
xorg-server (2:1.11.4-0ubuntu7) precise; urgency=low
diff --git a/debian/patches/503_fix_mouse_warp.patch
b/debian/patches/503_fix_mouse_warp.patch
new file mode 100644
index 0000000..d0e9d66
--- /dev/null
+++ b/debian/patches/503_fix_mouse_warp.patch
@@ -0,0 +1,52 @@
+Subject: dix: set raw event values before adding up relative values (#46976)
+Date: Wed, 21 Mar 2012 04:09:18 -0000
+From: Peter Hutterer <peter.hutte...@who-t.net>
+
+Regression introduced in 4e52cc0ef48145134cd58d357fb7289e6f8bb709
+
+Raw event values are values as-is from the driver, modified only be
+transformation or acceleration. 4e52cc caused the mask to be updated from
+driver-submitted relative to device-absolute coordinates, and that mask was
+then written into the raw events.
+
+Move the raw event update into the respective branches for absolute/relative
+events.
+
+X.Org Bug 46976 <http://bugs.freedesktop.org/show_bug.cgi?id=46976>
+
+Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+Reviewed-by: Simon Thum <simon.t...@gmx.de>
+
+---
+dix/getevents.c | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/dix/getevents.c b/dix/getevents.c
+index 5b9cef3..fd5998d 100644
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -1311,17 +1311,18 @@ fill_pointer_events(InternalEvent *events,
DeviceIntPtr pDev, int type,
+
+ transformAbsolute(pDev, &mask);
+ clipAbsolute(pDev, &mask);
++ if ((flags & POINTER_NORAW) == 0)
++ set_raw_valuators(raw, &mask, raw->valuators.data);
+ } else {
+ if (flags & POINTER_ACCELERATE)
+ accelPointer(pDev, &mask, ms);
++ if ((flags & POINTER_NORAW) == 0)
++ set_raw_valuators(raw, &mask, raw->valuators.data);
++
+ moveRelative(pDev, &mask);
+ }
+
+ /* valuators are in device coordinate system in absolute coordinates */
+-
+- if ((flags & POINTER_NORAW) == 0)
+- set_raw_valuators(raw, &mask, raw->valuators.data);
+-
+ scale_to_desktop(pDev, &mask, &devx, &devy, &screenx, &screeny);
+ scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute :
Relative,
+ &mask, &devx, &devy, &screenx, &screeny);
diff --git a/debian/patches/series b/debian/patches/series
index fde4653..28b62b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@
500_pointer_barrier_thresholds.diff
501_touch_accept_end.patch
502_indirect_touch_window_set.patch
+503_fix_mouse_warp.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sdoy9-0000xo...@vasks.debian.org
