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

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



 debian/changelog                                               |    6 +++
 debian/patches/130_reset-num_active_touches-on-deviceoff.patch |   18 ++++++++++
 debian/patches/series                                          |    1 
 3 files changed, 25 insertions(+)

New commits:
commit 50e068d1bf0232d8abfc8a78f886f478cdf30638
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Thu Aug 30 20:22:12 2012 +0300

    Added 130_reset-num_active_touches-on-deviceoff.patch (LP: #956071)

diff --git a/debian/changelog b/debian/changelog
index b87b64f..0c5b2a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.6.2-1ubuntu5) quantal; urgency=low
+
+  * Added 130_reset-num_active_touches-on-deviceoff.patch (LP: #956071)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 30 Aug 2012 20:13:39 +0300
+
 xserver-xorg-input-synaptics (1.6.2-1ubuntu4) quantal-proposed; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/patches/130_reset-num_active_touches-on-deviceoff.patch b/debian/patches/130_reset-num_active_touches-on-deviceoff.patch
new file mode 100644
index 0000000..c80c934
--- /dev/null
+++ b/debian/patches/130_reset-num_active_touches-on-deviceoff.patch
@@ -0,0 +1,18 @@
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -1154,6 +1154,7 @@
+     priv->lastButtons = 0;
+     priv->prev_z = 0;
+     priv->prevFingers = 0;
++    priv->num_active_touches = 0;
+ #ifdef HAVE_MULTITOUCH
+     memset(priv->open_slots, 0, priv->num_slots * sizeof(int));
+ #endif
+@@ -3119,6 +3120,7 @@
+         if (hw->slot_state[i] == SLOTSTATE_OPEN) {
+             priv->open_slots[priv->num_active_touches] = i;
+             priv->num_active_touches++;
++            BUG_WARN(priv->num_active_touches > priv->num_slots);
+         }
+         else if (hw->slot_state[i] == SLOTSTATE_CLOSE) {
+             Bool found = FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index 61218c7..d11e8db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
 124_syndaemon_events.patch
 128_disable_three_click_action.patch
 129_disable_three_touch_tap.patch
+130_reset-num_active_touches-on-deviceoff.patch


Reply to: