xserver-xorg-input-evdev: Changes to 'debian-experimental'
debian/changelog | 6 ++++--
src/evdev.c | 9 ++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit c6c52d038bd641316197bde2a481378014fcc0c0
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jan 4 16:06:59 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 61b29e4..211f4fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-evdev (1:2.5.99.901-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.5.99.901-2) experimental; urgency=low
* Switch Architecture for all binary packages from any to linux-any
since this driver is Linux-only.
* Cherry-pick bed25600 from upstream to fix crashes in
GetProximityEvents (Closes: #605374).
- -- Cyril Brulebois <kibi@debian.org> Fri, 03 Dec 2010 19:19:49 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 04 Jan 2011 16:06:52 +0100
xserver-xorg-input-evdev (1:2.5.99.901-1) experimental; urgency=low
commit e5479f812ee51a76462b07164f461464dc79efcc
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jan 4 16:06:46 2011 +0100
Add bug closure for #605374.
diff --git a/debian/changelog b/debian/changelog
index 78cf3b0..61b29e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ xserver-xorg-input-evdev (1:2.5.99.901-2) UNRELEASED; urgency=low
* Switch Architecture for all binary packages from any to linux-any
since this driver is Linux-only.
* Cherry-pick bed25600 from upstream to fix crashes in
- GetProximityEvents.
+ GetProximityEvents (Closes: #605374).
-- Cyril Brulebois <kibi@debian.org> Fri, 03 Dec 2010 19:19:49 +0100
commit 482fb728577672742d1e7d6e3ffe4235336ab9f3
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jan 4 15:59:01 2011 +0100
Document the cherry-pick.
diff --git a/debian/changelog b/debian/changelog
index 029f19f..78cf3b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xserver-xorg-input-evdev (1:2.5.99.901-2) UNRELEASED; urgency=low
* Switch Architecture for all binary packages from any to linux-any
since this driver is Linux-only.
+ * Cherry-pick bed25600 from upstream to fix crashes in
+ GetProximityEvents.
-- Cyril Brulebois <kibi@debian.org> Fri, 03 Dec 2010 19:19:49 +0100
commit 3e98473acdc9caf63c604a96b3173ada748b4703
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 23 12:13:16 2010 +1000
Don't update first_val and num_val if we don't have data (#32480)
For touchpads, rel_queued may be on (due to abs to rel conversion) but the
delta for x/y is 0/0 on the first touch. Hence, we don't have any valuators
to post. The current results in a num_vals of -15 and a subsequent segfault
when the data is posted to the server.
Start with a last valuator of -1, so that we know if we have at least one to
post.
X.Org Bug 32480 <http://bugs.freedesktop.org/show_bug.cgi?id=32480>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
(cherry picked from commit bed25600f66db245b895a48d6edca30568ca7559)
Signed-off-by: Cyril Brulebois <kibi@debian.org>
diff --git a/src/evdev.c b/src/evdev.c
index 040cfdc..c005f9f 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -402,7 +402,7 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v,
}
if (pEvdev->rel_queued) {
- int first = REL_CNT, last = 0;
+ int first = REL_CNT, last = -1;
int i;
if (pEvdev->swap_axes) {
@@ -428,8 +428,11 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v,
}
}
- *num_v = (last - first + 1);
- *first_v = first;
+ if (last >= 0)
+ {
+ *num_v = (last - first + 1);
+ *first_v = first;
+ }
}
/*
* Some devices only generate valid abs coords when BTN_TOOL_PEN is
Reply to: