xserver-xorg-input-mutouch: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
src/xf86MuTouch.c | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit b74a7c66d5a28f7a9faaf759f55e5740d052fd3b
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jan 16 07:32:08 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index c8f763c..405d70a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-mutouch (1:1.2.0-3) unstable; urgency=medium
+
+ * Cherry-pick one more fix from upstream: Fix calculation of coordinates
+ with inverted axes. Thanks to Fernando Vicente for the report and the
+ patch.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 16 Jan 2009 07:31:55 +0100
+
xserver-xorg-input-mutouch (1:1.2.0-2) unstable; urgency=medium
* Cherry-picked from upstream: Handle axis inversion in the driver.
commit d6f7e2f90eb2828b169d83fb32fc3a6885d7de5b
Author: Fernando Vicente <fvicente@gmail.com>
Date: Fri Jan 16 06:53:22 2009 +0100
Fix calculation of coordinates with inverted axes
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 301153d4c833590c8f5a19b9f0780c8426abb2d0)
diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c
index 37caa7a..8222baa 100644
--- a/src/xf86MuTouch.c
+++ b/src/xf86MuTouch.c
@@ -790,9 +790,9 @@ xf86MuTReadInput(LocalDevicePtr local)
* or we will feed X with quite bogus event positions.
*/
if (priv->x_inverted)
- cur_x = priv->max_x - cur_x;
+ cur_x = priv->max_x - cur_x + priv->min_x;
if (priv->y_inverted)
- cur_y = priv->max_y - cur_y;
+ cur_y = priv->max_y - cur_y + priv->min_y;
xf86PostMotionEvent(local_to_use->dev, TRUE, 0, 2, cur_x, cur_y);
/*
Reply to: