xserver-xorg-input-evdev: Changes to 'debian-experimental'
.cvsignore | 19
.gitignore | 5
ChangeLog | 1369 +++++++++++++++++++++++++++++++++++---
Makefile.am | 9
README | 20
configure.ac | 29
debian/README.source | 73 ++
debian/changelog | 44 +
debian/control | 8
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 29
debian/xsfbs/xsfbs.sh | 78 --
include/evdev-properties.h | 2
man/.cvsignore | 2
man/evdev.man | 114 +--
src/.cvsignore | 6
src/Makefile.am | 2
src/draglock.c | 12
src/emuMB.c | 14
src/emuWheel.c | 82 +-
src/evdev.c | 1598 +++++++++++++++++++++++++++++++++------------
src/evdev.h | 78 +-
22 files changed, 2828 insertions(+), 797 deletions(-)
New commits:
commit 9ecc42ebc88789a8cc0a00c210bf9fd1de60c472
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 29 21:46:02 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5f2a7b0..b3a0d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-input-evdev (1:2.2.99.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.2.99.1-1) experimental; urgency=low
* New upstream snapshot.
* Bump build-dep on xutils-dev for new xorg-macros.
* Build against xserver 1.7 RC.
* Bump Standards-Version to 3.8.3.
- -- Julien Cristau <jcristau@debian.org> Tue, 29 Sep 2009 20:45:28 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 29 Sep 2009 21:04:26 +0200
xserver-xorg-input-evdev (1:2.2.5-1) unstable; urgency=low
commit eead939cd7a3faeda0e5479b5b7699bd1efc6580
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 29 20:54:21 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 95189f5..5f2a7b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.2.99.1-1) UNRELEASED; urgency=low
* New upstream snapshot.
* Bump build-dep on xutils-dev for new xorg-macros.
* Build against xserver 1.7 RC.
+ * Bump Standards-Version to 3.8.3.
-- Julien Cristau <jcristau@debian.org> Tue, 29 Sep 2009 20:45:28 +0200
diff --git a/debian/control b/debian/control
index 23ba9f1..82faedc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5~1)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git
commit 9c6e0f09e8b204907b80c6d20cbf9e1dc381e8d9
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 29 20:54:01 2009 +0200
Build against xserver 1.7 RC.
diff --git a/debian/changelog b/debian/changelog
index 9fb5206..95189f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.2.99.1-1) UNRELEASED; urgency=low
* New upstream snapshot.
* Bump build-dep on xutils-dev for new xorg-macros.
+ * Build against xserver 1.7 RC.
-- Julien Cristau <jcristau@debian.org> Tue, 29 Sep 2009 20:45:28 +0200
diff --git a/debian/control b/debian/control
index 7a26bd0..23ba9f1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
quilt,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.6.99.900),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-input-dev,
commit bc9af1887de4b49d3e1ecb9394c9a032b93c7a90
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 29 20:52:25 2009 +0200
Bump build-dep on xutils-dev for new xorg-macros.
diff --git a/debian/changelog b/debian/changelog
index f29cbe7..9fb5206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-evdev (1:2.2.99.1-1) UNRELEASED; urgency=low
* New upstream snapshot.
+ * Bump build-dep on xutils-dev for new xorg-macros.
-- Julien Cristau <jcristau@debian.org> Tue, 29 Sep 2009 20:45:28 +0200
diff --git a/debian/control b/debian/control
index 726b204..7a26bd0 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
dpkg-dev (>= 1.14.17),
automake,
libtool,
- xutils-dev
+ xutils-dev (>= 1:7.5~1)
Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git
commit 1d11fb9a2fcee3834150347ab3a51e1d1f22a950
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 29 20:50:20 2009 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 5127feb..6c26889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,23 @@
-commit cd24c2cc183d56603056805ed0084e3abb11c758
+commit 61b4e88e01f32e976f85e7970a7f5b21fcd84f97
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri Aug 21 09:03:10 2009 +1000
+Date: Mon Sep 21 16:56:28 2009 +1000
- evdev 2.2.5
+ emuWheel: fix signed/unsigned screwup
+
+ This patch fixes wheel emulation on buttons other than 0.
+
+ Reported-by: Andy Neitzke
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit c8a0f1cf362152ae275717d367afa2179d6bbc0b
+commit 9ee70943ec304b08b8e4651c512a8e65fa13cc9c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Sep 11 09:57:22 2009 +1000
+
+ Require xorg-macros 1.3 and XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 415b6ffa958e3103eeb52af4ccd881497169eed4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 20 11:02:31 2009 +1000
@@ -26,15 +39,127 @@ Date: Thu Aug 20 11:02:31 2009 +1000
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
+commit f4ba2bd785b25fd522967abd7775925d5fded70f
+Author: Dima Kogan <dkogan@secretsauce.net>
+Date: Sun Aug 16 23:11:50 2009 -0700
+
+ Allow 0 as wheel emulation button for unconditional scrolling (#20529)
+
+ If wheel emulation is on and the emulation button is 0, then any x/y motion
+ of the device is converted into wheel events. The devices becomes a
+ scrolling-only device.
+
+ Signed-off-by: Dima Kogan <dkogan@cds.caltech.edu>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 2e5f68754fd5bc4e6b7fa5b95bdd30e2bb4e57fb
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu Aug 6 14:08:55 2009 +1000
+Date: Mon Aug 17 09:41:11 2009 +1000
- evdev 2.2.4
+ Restrict wheel emulation to a single axis at a time.
+
+ Wheel emulation works for both horizontal and vertical axes. Thus, if a
+ device doesn't move in perfect straight line, scroll events build up on the
+ respective other axis.
+
+ In some clients, scroll wheel events have specific meanings other than
+ scrolling (e.g. mplayer). In these clients, erroneous scrolling events come
+ at a high cost.
+
+ Thus, if a scroll wheel event is generated for one axis, reset the inertia
+ of the other axis to 0, avoiding the buildup of these erroneous scrolling
+ events.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 8fdb2abb6fe0426cbbfeead2c187092a56792557
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Aug 14 12:59:27 2009 +1000
-commit 4c1c4f2c830dbfc34503d8ee4996f5bcd5547b6a
+ man: fix documentation for EVDEV_PROP_WHEEL_BUTTON
+
+ 0 doesn't disable it, it's still treated like a button number. copy/paste
+ error.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ca0fb396f1a4b87be9f8aa7ad066e0b469c9075d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Aug 14 11:00:12 2009 +1000
+
+ evdev 2.2.99.1
+
+commit 7967677789e3ee24733b3514e1ae7a8e12bbc2b5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Aug 14 09:05:40 2009 +1000
+
+ Treat tablets (BTN_TOOL_PEN devices) differently from touchpads.
+
+ The previous checks for BTN_TOOL_FINGER and BTN_TOUCH reported false
+ positives for touchpads for most popular tablets.
+ As a result, their events were converted to relative events.
+
+ Add a new flag EVDEV_TABLET pending presence of BTN_TOOL_PEN and ignore the
+ touchpad special casing to report the events as-is.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 36064dca9097df896b4b1b49c9c68775f1728846
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Aug 13 10:27:16 2009 +1000
+
+ Add EvdevPostButtonEvent API to immediately post a button event (#23269)
+
+ The wheel emulation code needs this API. When the timer expires, the event
+ must be posted immediately, not enqueued onto the internal event queue.
+ Otherwise, the emulated middle button press is enqueued only and no event is
+ sent until the next physical event (and its EV_SYN) arrives.
+
+ Since the timer is triggered outside of the SIGIO and SIGIO is blocked
+ during this period anyway, we could also just enqueue the event and flush by
+ simulating an EV_SYN. It's easier this way though.
+
+ X.Org Bug 23269 <http://bugs.freedesktop.org/show_bug.cgi?id=23269>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
+
+commit 8bf93709cbcf9f041cd177e929ff46adce8a6b79
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Aug 13 10:16:18 2009 +1000
+
+ Rename parts of the Post API to a Queue API.
+
+ Button and key events aren't posted from EvdevPost*Event, they are simply
+ enqueued onto the evdev-internal event queue until the next EV_SYN arrives.
+ Rename those interfaces from EvdevPost* to EvdevQueue* and leave only those
+ that actually post to the server with a matching "*Post*" name.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
+
+commit 37373a223b2aeef7041c9c0bb99be613789a3125
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Aug 13 10:26:33 2009 +1000
+
+ comment typo fix
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d764dded18c47cec009babc075f2324cba1781ce
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Aug 5 18:57:30 2009 +1000
+
+ Skip check for EVDEV_RELATIVE_EVENTS for wheel events.
+
+ This patch fixes a regression introduced with 1f641d75e.
+ Wheel axis events are posted as button clicks, a device may have no relative
+ axes but it does need to post these button clicks.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f352598e45be86f9e24d9dba88c657f03f3b168e
Author: Michael Witten <mfwitten@gmail.com>
Date: Tue Aug 4 03:11:49 2009 -0500
@@ -68,54 +193,71 @@ Date: Tue Aug 4 03:11:49 2009 -0500
Signed-off-by: Michael Witten <mfwitten@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit f352598e45be86f9e24d9dba88c657f03f3b168e)
-commit c0bee1b4d6d3664322b2f35775675ac84354f702
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu Jul 30 11:08:59 2009 +1000
+commit 69d6ff3e01263ce2d52ed18b08f054bf3fdb923c
+Author: Oliver McFadden <oliver.mcfadden@nokia.com>
+Date: Sun Aug 2 12:03:04 2009 +0300
- evdev 2.2.3
+ evdev: Use the EvdevPost...Event() functions in the emulation code.
+
+ This is similar to commit 1f641d75edba7394201c1c53938215bae696791b.
+
+ It provides the same functionality of queuing the (in this case
+ emulated) events and waiting until an EV_SYN synchronization event is
+ received before posting them to the server.
+
+ This preserves the order of events (both real and emulated) and ensures
+ that MotionNotify events will always be posted first. It also unifies
+ the event posting into a few small functions which improves
+ maintainability.
+
+ From this point on, you should never use the xf86Post...Event()
+ functions in new code, but rather the EvdevPost...Event() versions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit 8acc999d404b9b6012588e2021324553dda9405d
+commit 6f4634111a83808bc52e7e53733cf2d3bab0cccd
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu Jul 30 09:38:31 2009 +1000
+Date: Thu Jul 30 09:27:27 2009 +1000
Evdev doesn't require inputproto.
None of the inputproto headers seem to be included anywhere.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 6f4634111a83808bc52e7e53733cf2d3bab0cccd)
-
- Conflicts:
-
- configure.ac
-commit 3cce7fa38a152ba66d379591e6e3ece60bd73fdd
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri Jun 26 09:37:29 2009 +1000
+commit 1f641d75edba7394201c1c53938215bae696791b
+Author: Oliver McFadden <oliver.mcfadden@nokia.com>
+Date: Thu Jul 23 13:19:49 2009 +0300
- If a device fails to initialize relative axes, init the abs. axes instead.
+ evdev: Only send the events at synchronization time.
- Some devices have relative axes that don't count (scroll wheels). In this
- case, don't claim we've initialized relative axes, continue with the
- absolute axes instead.
+ Instead of just posting the button/key press/release events to the
+ server as soon as they arrive, add them to an internal queue and post
+ them once we receive an EV_SYN synchronization event.
+
+ The motion events are always sent first, followed by the queued events.
+ There will be one motion event and possibly many queued button/key
+ events posted every EV_SYN event.
+
+ Note that the size of the event queue (EVDEV_MAXQUEUE) is arbitrary and
+ you may change it. If we receive more events than the queue can handle,
+ those events are dropped and a warning message printed.
+
+ Tested on my Lenovo T400 using evdev for all input devices; keyboard,
+ touchpad, and trackpoint.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit b07ab6ea97b779b26e7ae8326528c262cc9907a1)
-commit c793aa27381dc346d88a3e7d8bdb90dd8d3ed39c
+commit 2994825665790dc8e35b2944e0d411f3cc9f76fd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 20 14:52:34 2009 +1000
Don't register middle mouse button emulation handlers for keyboards.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 2994825665790dc8e35b2944e0d411f3cc9f76fd)
-commit 9f3632c0b6c181706daf661646de5994217c0bb2
+commit 9bfd9e8a3683f14860149ae9f842e88828cc0960
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu Jul 16 18:25:37 2009 +0300
@@ -125,9 +267,23 @@ Date: Thu Jul 16 18:25:37 2009 +0300
342 if (pEvdev->emulateWheel.timeout < 0)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 9bfd9e8a3683f14860149ae9f842e88828cc0960)
-commit 06b303f26d5fab17b7d82dbf2bda3f77dad2364c
+commit dcca28a59ce0a2f8a06c559eed493ca43afc20cb
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Apr 29 18:29:58 2009 +1000
+
+ Count REL_DIAL as a scrollwheel during EvdevProbe (#21457)
+
+ The Griffin Powermate only has a single axis (REL_DIAL). This axis is
+ posted as horizontal scroll wheel, so we need to ensure the scroll wheel
+ setup (including ensuring that enough buttons are available) is triggered
+ accordingly.
+
+ X.Org Bug 21457 <http://bugs.freedesktop.org/show_bug.cgi?id=21457>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit db8b1ca5cffbc48f7d9c5c166489c714ac92ea86
Author: Asbj�annes <ace@sannes.org>
Date: Wed Jul 1 09:51:12 2009 +0200
@@ -135,9 +291,91 @@ Date: Wed Jul 1 09:51:12 2009 +0200
Signed-off-by: Asbj�rn Sannes <ace@sannes.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit db8b1ca5cffbc48f7d9c5c166489c714ac92ea86)
-commit 4dda242d56a7830d5b44d7e58cf6a95f62a617ce
+commit 8cc0d0f285261b0f26d22b5b4eca9ccbd1beeb93
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jun 26 09:59:04 2009 +1000
+
+ Fix absolute axis labelling - mapping must be initialized before the labels.
+
+ 88eedea281a710008a82f1e6af4bdffd19477f46 added axis labelling to the
+ valuator initialization. This requires the axis mapping to be established
+ before the absolute axis labels are initialized.
+
+ 88eedea did this for relative axes, but missed out on the absolute ones. As
+ a result, all abs. labels were initialized to "None".
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit aa1609285dfa51570f74671a9f4240bccc1516c2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jun 26 09:42:36 2009 +1000
+
+ Message "found absolute touchpad" also applies to tablets - fix.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b07ab6ea97b779b26e7ae8326528c262cc9907a1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jun 26 09:37:29 2009 +1000
+
+ If a device fails to initialize relative axes, init the abs. axes instead.
+
+ Some devices have relative axes that don't count (scroll wheels). In this
+ case, don't claim we've initialized relative axes, continue with the
+ absolute axes instead.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 7bc48c666d702e649dc529b5d928b6a8549514c3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jun 23 15:43:16 2009 +1000
+
+ Fix wrong axis label index causing OOB reads/writes.
+
+ The atoms array is filled with each axis atom in mapping order (i.e. after
+ the driver mapping has been applied). 'axis' OTOH is from 0 to ABS_MAX.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 880ad1e19afd83ac115948b67d4049e16cb12df0
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jun 23 14:48:17 2009 +1000
+
+ Initialize the axis labels to 0, not "misc".
+
+ If we don't know what an axis label is, then don't initialize it. None is a
+ valid label.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6ab23e4519ed4ce07b745c573ddf544a2a1ee1b2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jun 18 16:15:16 2009 +1000
+
+ Add missing checks for ABI_XINPUT_VERSION 7.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 88eedea281a710008a82f1e6af4bdffd19477f46
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jun 18 15:33:33 2009 +1000
+
+ Cope with ABI_XINPUT_VERSION 7 - requires button + axes labels.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9a5a4fed3acae87c89694a9ef8bf905ca0d6a6dd
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jun 18 15:15:57 2009 +1000
+
+ Split axes and button labels into separate function.
+
+ We'll re-use this bit very soon.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0a3657d2ee62f4086e9687218cb33835ba61a0b3
Author: Derek Upham <sand@blarg.net>
Date: Thu May 21 00:15:28 2009 -0700
@@ -152,9 +390,8 @@ Date: Thu May 21 00:15:28 2009 -0700
Signed-off-by: Derek Upham <sand@blarg.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 0a3657d2ee62f4086e9687218cb33835ba61a0b3)
-commit 4efe0d272ed6ef7bda4cc005ad6033f2b1916fdc
+commit dc2191285e799be891787e1f64d10c1cba271240
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 13:30:10 2009 +1000
@@ -170,9 +407,8 @@ Date: Thu May 21 13:30:10 2009 +1000
once we actually see devices affected by this.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit dc2191285e799be891787e1f64d10c1cba271240)
-commit 1432b5153ec2666845c2017eedc3c166fd8c8e3c
+commit 255b9f6bbf374a315750019c6fadc5f82fb7d41d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 10:23:37 2009 +1000
@@ -183,9 +419,16 @@ Date: Thu May 21 10:23:37 2009 +1000
option, the X server will think the device has result 25 buttons.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 255b9f6bbf374a315750019c6fadc5f82fb7d41d)
-commit b8519930e415043545e87ea660f6f0b3109537bf
+commit aa117d49a5139bcc453e6ab022b67347464a8acd
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu May 21 09:51:57 2009 +1000
+
+ Rename pEvdev->buttons to pEvdev->num_buttons for clarity.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b358f1eb3a4ef8fdee099114d6c70d6ea06eba95
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 11:57:01 2009 +1000
@@ -204,9 +447,8 @@ Date: Wed May 20 11:57:01 2009 +1000
BTN_0 is mapped to 8. 8 is mapped to 2. num_buttons remains 7.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit b358f1eb3a4ef8fdee099114d6c70d6ea06eba95)
-commit 6d43a45b99e07325c74cbe1d20b04094ba99950d
+commit 33cc112ca1af377a85cfeb05dfb72f07d3850a95
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 11:47:37 2009 +1000
@@ -221,24 +463,52 @@ Date: Wed May 20 11:47:37 2009 +1000
(same with BTN_MIDDLE and BTN_1 or BTN_RIGHT and BTN_2).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 33cc112ca1af377a85cfeb05dfb72f07d3850a95)
-commit 40d3ad3ac00fc21f2561c906d1246648a9f74087
+commit 3c43d880f13725a04fcd7c0c8d5978a36208e373
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 11:42:35 2009 +1000
Only label axes and buttons if the device has axes or buttons.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 3c43d880f13725a04fcd7c0c8d5978a36208e373)
-commit cf887a2b7cff9eb99c872a9cf5a9382ff6317899
+commit 54628989356793828fcbb5f62a091b962c7da4f9
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed May 13 12:51:52 2009 +1000
+
+ Use xf86DisableDevice instead of the DIX' DisableDevice.
+
+ DisableDevice has changed API in xi2, xf86DisableDevice hasn't. So let's use
+ this one so we can have one version for master and xi2.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9243d338d1de7df8afb1e254590cd4bf84888c7e
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Sun May 10 08:29:21 2009 -0700
+
+ Fix copy-paste error when probing type name
+
+ A minor copy and paste error was introduced in 71e9a69e leaving an "if"
+ where an "else if" should be. Without this, any device configured as
+ XI_TOUCHPAD or XI_TABLET will end up having the type_name reset to
+ either XI_TOUCHSCREEN or XI_MOUSE.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 71e9a69ed68257e5ded26c062a9797de571bb880
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu Apr 30 16:39:15 2009 +1000
+Date: Wed Apr 29 18:03:18 2009 +1000
- evdev 2.2.2
+ Revamp the whole "has_axes" definition.
+
+ Since we can now deal with multiple axes, etc. we might as well print it
+ properly.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit 1cc0651e1b44af505d7177b22c6083eae9b118cc
+commit 220e2dfb8f6aa08bd5f59e81c6883c057b945721
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 13:23:50 2009 +1000
@@ -249,18 +519,16 @@ Date: Thu Apr 16 13:23:50 2009 +1000
signal handler.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 220e2dfb8f6aa08bd5f59e81c6883c057b945721)
-commit 48a747ea8603ece6bd25ba5b1ce92c2eb91a7c01
+commit ddc126637404cb3d9356b7698779dcd8849f8718
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 12:01:03 2009 +1000
Pre-allocate the reopen timer so we don't allocate during sigio handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit ddc126637404cb3d9356b7698779dcd8849f8718)
-commit aa58eb609617beb5d3199dab262f96003f57ab97
+commit 98ecb5233bb3b899bd696a90d2733c6a345676dd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 6 10:22:25 2009 +1000
@@ -270,15 +538,28 @@ Date: Mon Apr 6 10:22:25 2009 +1000
Reported-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 98ecb5233bb3b899bd696a90d2733c6a345676dd)
-commit aff7228d972eedd556b13f06d8db0b5ffb622b46
+commit 92ca3dc2e759759545c0e0adea4277b3bddb05e5
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue Mar 24 15:13:23 2009 +1000
+Date: Thu Mar 26 13:40:07 2009 +1000
- evdev 2.2.1
+ Fix wrong reference to axis and button label atom list.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit c695234c5c5fd54a6afd12db46a0926ccdd83301
+commit 3fa28c8acd3aad054f9c74e94c1411654d709dca
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Mar 26 10:11:26 2009 +1000
+
+ Remove test/ directory.
+
+ This shouldn't really be part of the driver source, it's better to just have
+ it as a separate repository. Code has moved to
+ git://people.freedesktop.org/~whot/testdevices.git
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d9809d7edd2be714a15115b990286554e2979fb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 17 14:08:29 2009 +1000
@@ -291,18 +572,16 @@ Date: Tue Mar 17 14:08:29 2009 +1000
were actually reported.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit d9809d7edd2be714a15115b990286554e2979fb6)
-commit 79d4956add44d1150e835cbb0d44d3d1c9077203
+commit b11439a1763b5f210460b492dd4f47e973f90a3a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 17 13:25:58 2009 +1000
If we have a touchpad, print so, don't claim we're configuring a tablet.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit b11439a1763b5f210460b492dd4f47e973f90a3a)
-commit 7e9809837c41a9ad0822a9bbc59362a3ba666696
+commit 740dc202f735106532dce581deabe2b95c52759f
Author: Jeremy Jay <dinkumator@gmail.com>
Date: Mon Mar 16 23:19:54 2009 -0400
@@ -312,9 +591,8 @@ Date: Mon Mar 16 23:19:54 2009 -0400
Signed-off-by: Jeremy Jay <dinkumator@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 740dc202f735106532dce581deabe2b95c52759f)
-commit d07692a4af507504b2d3c5a2172b8b23a4d7e2f4
+commit 7ac0c4456dc0846f7e09f334a26f9536e20065df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 17 08:02:00 2009 +1000
@@ -324,9 +602,16 @@ Date: Tue Mar 17 08:02:00 2009 +1000
Touchscreens have either pressure or touch, but no finger.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 7ac0c4456dc0846f7e09f334a26f9536e20065df)
-commit 1073cd4fdca2152898d9e27d7d237452a37d9f81
+commit b4f6ab126dfc897759559aae7ae32fbc0efe24d8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 13 13:40:16 2009 +1000
+
+ Move keymap/modifier initialization behind the ABI < 5 ifdefs.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a3ea979c2b70d166d62422b4ba450ce2910389c3
Author: Jeremy Jay <dinkumator@gmail.com>
Date: Mon Mar 16 08:36:53 2009 +1000
@@ -338,9 +623,8 @@ Date: Mon Mar 16 08:36:53 2009 +1000
X.Org Bug 20661 <http://bugs.freedesktop.org/show_bug.cgi?id=20661>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit a3ea979c2b70d166d62422b4ba450ce2910389c3)
-commit 486bbdc481a6eb337b57a7b85a99267cf2879aae
+commit a7fb654a68a26ad5f019a902312c6b94dbe9c3ea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 10 15:17:53 2009 +1000
@@ -352,13 +636,12 @@ Date: Tue Mar 10 15:17:53 2009 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Marty Jack <martyj19@comcast.net>
- (cherry picked from commit a7fb654a68a26ad5f019a902312c6b94dbe9c3ea)
-commit 73e5eba8cd9ef885542c94b72b783366228ce0df
+commit 3f06825a446e317485c2e2d1880c1886684d8742
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon Mar 9 09:27:19 2009 +1000
+Date: Mon Mar 9 09:26:51 2009 +1000
- evdev 2.2.0
+ Bump to 2.2.99.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/debian/changelog b/debian/changelog
index 15a1002..f29cbe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.2.99.1-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 29 Sep 2009 20:45:28 +0200
+
xserver-xorg-input-evdev (1:2.2.5-1) unstable; urgency=low
* New upstream release.
commit 61b4e88e01f32e976f85e7970a7f5b21fcd84f97
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 21 16:56:28 2009 +1000
emuWheel: fix signed/unsigned screwup
This patch fixes wheel emulation on buttons other than 0.
Reported-by: Andy Neitzke
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/emuWheel.c b/src/emuWheel.c
index 178b01b..e7b2f98 100644
--- a/src/emuWheel.c
+++ b/src/emuWheel.c
@@ -110,9 +110,11 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv)
*/
if (pEvdev->emulateWheel.button_state || !pEvdev->emulateWheel.button) {
/* Just return if the timeout hasn't expired yet */
- if (pEvdev->emulateWheel.button &&
- pEvdev->emulateWheel.expires - GetTimeInMillis() > 0) {
- return TRUE;
+ if (pEvdev->emulateWheel.button)
+ {
+ int ms = pEvdev->emulateWheel.expires - GetTimeInMillis();
+ if (ms > 0)
+ return TRUE;
}
/* We don't want to intercept real mouse wheel events */
commit 9ee70943ec304b08b8e4651c512a8e65fa13cc9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 11 09:57:22 2009 +1000
Require xorg-macros 1.3 and XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ee706a1..8eb2ada 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,16 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
AH_TOP([#include "xorg-server.h"])
@@ -70,10 +70,6 @@ AC_HEADER_STDC
DRIVER_NAME=evdev
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile
src/Makefile
man/Makefile
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;
Reply to: