debian/changelog | 7 ++++ debian/patches/201_fix_touch_count.patch | 53 +++++++++++++++++++++++++++++++ debian/patches/series | 1 3 files changed, 61 insertions(+)
New commits: commit dc1b979f783fbc198c770c4f5819a27e6a238551 Author: Chase Douglas <[email protected]> Date: Mon Apr 2 11:34:16 2012 -0700 releasing version 1.5.99.902-0ubuntu2 diff --git a/debian/changelog b/debian/changelog index b3ab7c6..80237c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-input-synaptics (1.5.99.902-0ubuntu2) UNRELEASED; urgency=low +xserver-xorg-input-synaptics (1.5.99.902-0ubuntu2) precise; urgency=low * Fix three touch taps and clicks on some trackpads (LP: #971783) - Add temporary patch 201_fix_touch_count.patch - -- Chase Douglas <[email protected]> Mon, 02 Apr 2012 11:24:50 -0700 + -- Chase Douglas <[email protected]> Mon, 02 Apr 2012 11:33:58 -0700 xserver-xorg-input-synaptics (1.5.99.902-0ubuntu1) precise; urgency=low commit 203490dd524b669c7099bbad0b4569909d8d76ec Author: Chase Douglas <[email protected]> Date: Mon Apr 2 11:31:05 2012 -0700 Fix three touch taps and clicks on some trackpads (LP: #971783) * Fix three touch taps and clicks on some trackpads (LP: #971783) - Add temporary patch 201_fix_touch_count.patch diff --git a/debian/changelog b/debian/changelog index 49f3bb1..b3ab7c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-synaptics (1.5.99.902-0ubuntu2) UNRELEASED; urgency=low + + * Fix three touch taps and clicks on some trackpads (LP: #971783) + - Add temporary patch 201_fix_touch_count.patch + + -- Chase Douglas <[email protected]> Mon, 02 Apr 2012 11:24:50 -0700 + xserver-xorg-input-synaptics (1.5.99.902-0ubuntu1) precise; urgency=low * New upstream release diff --git a/debian/patches/201_fix_touch_count.patch b/debian/patches/201_fix_touch_count.patch new file mode 100644 index 0000000..d83cf5c --- /dev/null +++ b/debian/patches/201_fix_touch_count.patch @@ -0,0 +1,53 @@ +From 5f4c01a88be28fdf309f7e2ec6bf75eeb1c6e751 Mon Sep 17 00:00:00 2001 +From: Chase Douglas <[email protected]> +Date: Mon, 2 Apr 2012 11:14:36 -0700 +Subject: [PATCH] Use maximum number of touches reported by evdev + +This resolves a regression from da461b91659d0c64aa6827e065aee2682116a57e +where three touch tap and click actions on certain devices no longer +work. + +Some devices report a higher touch count than the number of touches they +can provide data for. For example, many Synaptics touchpads can report +up to five touches, but only provide data for two of them. We need to be +able to report the correct number of touches for these devices when +there are three touches. Using the maximum of the reported touch count +and the number of touches provided ensures the count is accurate for all +device types. + +Signed-off-by: Chase Douglas <[email protected]> +--- + src/eventcomm.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/eventcomm.c b/src/eventcomm.c +index 28d034f..3ceb98c 100644 +--- a/src/eventcomm.c ++++ b/src/eventcomm.c +@@ -624,11 +624,6 @@ static int count_fingers(InputInfoPtr pInfo, const struct CommData *comm) + struct eventcomm_proto_data *proto_data = priv->proto_data; + int fingers = 0; + +-#ifdef HAVE_MULTITOUCH +- if (priv->has_touch) +- return proto_data->num_touches; +-#endif +- + if (comm->oneFinger) + fingers = 1; + else if (comm->twoFingers) +@@ -636,6 +631,11 @@ static int count_fingers(InputInfoPtr pInfo, const struct CommData *comm) + else if (comm->threeFingers) + fingers = 3; + ++#ifdef HAVE_MULTITOUCH ++ if (priv->has_touch && proto_data->num_touches > fingers) ++ fingers = proto_data->num_touches; ++#endif ++ + return fingers; + } + +-- +1.7.9.1 + diff --git a/debian/patches/series b/debian/patches/series index f24e0a4..06f6c8e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -23,3 +23,4 @@ # Temporary patches until they are merged upstream 200_fix_four_tap.patch +201_fix_touch_count.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
