[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-synaptics: Changes to 'ubuntu'



 debian/changelog                                        |    4 +
 debian/patches/122_revert_pressure_finger_default.patch |   48 ++++++++++++++++
 debian/patches/series                                   |    1 
 3 files changed, 52 insertions(+), 1 deletion(-)

New commits:
commit 9c14a16d8ee6292eea92493d58e9740f3e082944
Author: Chase Douglas <chase.douglas@canonical.com>
Date:   Wed Mar 30 10:55:41 2011 -0400

    Fix spurious right click events on some trackpads (LP: #742213)
    
    * Fix spurious right click events on some trackpads (LP: #742213)
      - Added 122_revert_pressure_finger_default.patch

diff --git a/debian/changelog b/debian/changelog
index dbaf197..d869500 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu9) UNRELEASED;
     - Added 119_active_area_touches.patch
     - Added 120_active_touches_num_fingers.patch
     - Added 121_semi-mt_num_fingers.patch
+  * Fix spurious right click events on some trackpads (LP: #742213)
+    - Added 122_revert_pressure_finger_default.patch
 
- -- Chase Douglas <chase.douglas@ubuntu.com>  Tue, 29 Mar 2011 13:53:00 -0400
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 30 Mar 2011 10:54:50 -0400
 
 xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu8) natty; urgency=low
 
diff --git a/debian/patches/122_revert_pressure_finger_default.patch b/debian/patches/122_revert_pressure_finger_default.patch
new file mode 100644
index 0000000..8894a50
--- /dev/null
+++ b/debian/patches/122_revert_pressure_finger_default.patch
@@ -0,0 +1,48 @@
+From c31cbe1a856dd6a1093469091d90ac12619b6244 Mon Sep 17 00:00:00 2001
+From: Chase Douglas <chase.douglas@canonical.com>
+Date: Wed, 30 Mar 2011 10:47:13 -0400
+Subject: [PATCH] Revert "Default to 2-finger emulation when HW supports it"
+
+The default pressure threshold set by this patch is low enough to cause
+spurious behavior in some devices. One bug report also notes that the
+pressure values seem to vary with environment state (temperature,
+air pressure, etc.). Thus, this commit is being reverted to restore
+behavior to what it was before Natty.
+
+This reverts upstream commit ffa6dc2809734a6aaa690e9133d6761480603a68.
+
+Fixes LP: #742213
+
+Reported-by: steubens (https://launchpad.net/~d-launchpad-lez-ath-cx)
+Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
+---
+ src/synaptics.c |    7 +------
+ 1 files changed, 1 insertions(+), 6 deletions(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index f4e440a..51d3ad0 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -463,18 +463,13 @@ static void set_default_parameters(InputInfoPtr pInfo)
+     fingerLow = priv->minp + range * (25.0/256);
+     fingerHigh = priv->minp + range * (30.0/256);
+     fingerPress = priv->minp + range * 1.000;
++    emulateTwoFingerMinZ = priv->minp + range * (282.0/256);
+     edgeMotionMinZ = priv->minp + range * (30.0/256);
+     edgeMotionMaxZ = priv->minp + range * (160.0/256);
+     pressureMotionMinZ = priv->minp + range * (30.0/256);
+     pressureMotionMaxZ = priv->minp + range * (160.0/256);
+     palmMinZ = priv->minp + range * (200.0/256);
+ 
+-    /* Enable emulation when hw supports both pressure and width. */
+-    if (!priv->has_double && priv->has_width)
+-	emulateTwoFingerMinZ = fingerHigh;
+-    else
+-	emulateTwoFingerMinZ = priv->minp + range * (282.0/256);
+-
+     range = priv->maxw - priv->minw;
+ 
+     /* scaling based on defaults below and a tool width of 16 */
+-- 
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e9cc8ea..f806d2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 119_active_area_touches.patch
 120_active_touches_num_fingers.patch
 121_semi-mt_num_fingers.patch
+122_revert_pressure_finger_default.patch


Reply to: