xserver-xorg-input-evdev: Changes to 'debian-unstable'
ChangeLog | 30 ++++++++++++++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 6 ++++++
src/evdev.c | 3 +--
4 files changed, 38 insertions(+), 3 deletions(-)
New commits:
commit d6d91908e6d349ea0ebc64e82d49a60556e62d0b
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Aug 21 07:18:23 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7df394d..15a1002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-evdev (1:2.2.5-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.2.5-1) unstable; urgency=low
* New upstream release.
- -- Brice Goglin <bgoglin@debian.org> Fri, 21 Aug 2009 07:13:54 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 21 Aug 2009 07:18:07 +0200
xserver-xorg-input-evdev (1:2.2.4-1) unstable; urgency=low
commit 1a92fcc6502fd9fde22e96127ede85d8f5bb1be5
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Aug 21 07:14:27 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index d3e1c9b..5127feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+commit cd24c2cc183d56603056805ed0084e3abb11c758
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Aug 21 09:03:10 2009 +1000
+
+ evdev 2.2.5
+
+commit c8a0f1cf362152ae275717d367afa2179d6bbc0b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Aug 20 11:02:31 2009 +1000
+
+ Only take the driver-internal button mapping to count buttons (#23405)
+
+ Regression:
+ If a user has multiple buttons mapped to the same button number, the
+ number of buttons counted is set to a wrong value. e.g. a button
+ mapping of 1 1 1 for a mouse with three buttons would only initialize 1
+ button to the X server.
+
+ In the future, the user cannot change this button mapping as the server
+ only knows about one button.
+
+ The user-supplied button map (option ButtonMapping) shouldn't matter when
+ counting the buttons. Only the driver-internal mapping (BTN_0 -> button 1,
+ etc.) matters.
+
+ X.Org Bug 23405 <http://bugs.freedesktop.org/show_bug.cgi?id=23405>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 415b6ffa958e3103eeb52af4ccd881497169eed4)
+
commit bf356d939925b537921e1f82559f92baa3a76bcc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 6 14:08:55 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index bf406ce..7df394d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.2.5-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <bgoglin@debian.org> Fri, 21 Aug 2009 07:13:54 +0200
+
xserver-xorg-input-evdev (1:2.2.4-1) unstable; urgency=low
* New upstream release.
commit cd24c2cc183d56603056805ed0084e3abb11c758
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 09:03:10 2009 +1000
evdev 2.2.5
diff --git a/configure.ac b/configure.ac
index 5090e43..76075a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 2.2.4,
+ 2.2.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit c8a0f1cf362152ae275717d367afa2179d6bbc0b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 20 11:02:31 2009 +1000
Only take the driver-internal button mapping to count buttons (#23405)
Regression:
If a user has multiple buttons mapped to the same button number, the
number of buttons counted is set to a wrong value. e.g. a button
mapping of 1 1 1 for a mouse with three buttons would only initialize 1
button to the X server.
In the future, the user cannot change this button mapping as the server
only knows about one button.
The user-supplied button map (option ButtonMapping) shouldn't matter when
counting the buttons. Only the driver-internal mapping (BTN_0 -> button 1,
etc.) matters.
X.Org Bug 23405 <http://bugs.freedesktop.org/show_bug.cgi?id=23405>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 415b6ffa958e3103eeb52af4ccd881497169eed4)
diff --git a/src/evdev.c b/src/evdev.c
index 9f330e3..85ed233 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1544,8 +1544,7 @@ EvdevProbe(InputInfoPtr pInfo)
int mapping = 0;
if (TestBit(i, pEvdev->key_bitmask))
{
- mapping =
- pEvdev->btnmap[EvdevUtilButtonEventToButtonNumber(pEvdev, i)];
+ mapping = EvdevUtilButtonEventToButtonNumber(pEvdev, i);
if (mapping > num_buttons)
num_buttons = mapping;
}
Reply to: