ChangeLog | 13 +++++++++++++
debian/changelog | 31 +++++++++++++++++++++++++++++++
debian/control | 21 ++++++++++++++++++++-
debian/patches/0004-xi22-ubuntu.patch | 13 -------------
debian/patches/series | 1 -
debian/rules | 4 ++++
src/evdev.c | 2 +-
7 files changed, 69 insertions(+), 16 deletions(-)
New commits:
commit 5daf922c478e431fd0c18e32543ebf3874352f95
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Fri Jul 20 10:48:03 2012 +0200
Sync to debian-experimental
* Remove no longer needed patches:
- 0001-configure.ac-Fix-udev-libudev-dependency.patch
- 0004-xi22-ubuntu.patch
* I messed up the tree, manually unapply debian/patches/0005*
if you build directly from git, this will be fixed by
a new point release
diff --git a/debian/changelog b/debian/changelog
index 89739a8..ce05fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-xserver-xorg-input-evdev (1:2.7.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.7.0-2ubuntu1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* Bump build-dep to xorg 2:1.12.99.901
- * Remove upstreamed 0001-configure.ac-Fix-udev-libudev-dependency.patch
+ * Remove no longer needed patches:
+ - 0001-configure.ac-Fix-udev-libudev-dependency.patch
+ - 0004-xi22-ubuntu.patch
+ * I messed up the tree, manually unapply debian/patches/0005*
+ if you build directly from git, this will be fixed by
+ a new point release
-- Maarten Lankhorst <maarten.lankho...@canonical.com> Mon, 16 Jul 2012
13:24:29 +0200
diff --git a/debian/control b/debian/control
index 2b06c50..3df1ed6 100644
--- a/debian/control
+++ b/debian/control
@@ -71,3 +71,22 @@ Description: X.Org X server -- evdev input driver
(development headers)
<URL:http://www.X.org>
.
This package is built from the X.org xf86-input-evdev driver module.
+
+Package: xserver-xorg-input-evdev-dbg
+Architecture: linux-any
+Depends:
+ ${misc:Depends},
+ xserver-xorg-input-evdev (= ${binary:Version}),
+Section: debug
+Priority: extra
+Description: X.Org X server -- evdev input driver (development headers)
+ This package provides the development headers for the evdev input driver
+ found in xserver-xorg-input-evdev. Non-developers likely have little use
+ for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package is built from the X.org xf86-input-evdev driver module.
+ .
+ This package provides debugging symbols for this Xorg X driver.
diff --git a/debian/patches/0004-xi22-ubuntu.patch
b/debian/patches/0004-xi22-ubuntu.patch
deleted file mode 100644
index bd086dd..0000000
--- a/debian/patches/0004-xi22-ubuntu.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xserver-xorg-input-evdev/configure.ac
-===================================================================
---- xserver-xorg-input-evdev.orig/configure.ac 2012-01-10 14:57:49.029713001
+0100
-+++ xserver-xorg-input-evdev/configure.ac 2012-01-10 14:58:02.917713000
+0100
-@@ -48,7 +48,7 @@ XORG_DEFAULT_OPTIONS
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto)
- PKG_CHECK_MODULES(UDEV, udev)
-
--PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >=
1.11.99.901], HAVE_XI22="yes", HAVE_XI22="no")
-+PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >= 1.11.3],
HAVE_XI22="yes", HAVE_XI22="no")
-
- if test "x$HAVE_XI22" = xyes; then
- # Obtain compiler/linker options for mtdev
diff --git a/debian/rules b/debian/rules
index 3d192dc..52d3737 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,3 +15,7 @@ override_dh_shlibdeps:
%:
dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+
+# Debug package:
+override_dh_strip:
+ dh_strip --dbg-package=xserver-xorg-input-evdev-dbg
commit ff743c7977ae8e0e48d8f4c247e301c13127363d
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Jul 16 13:43:18 2012 +0200
Remove upstreamed 0001-configure.ac-Fix-udev-libudev-dependency.patch
diff --git a/debian/changelog b/debian/changelog
index c3d8334..19588e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.7.0-2) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* Bump build-dep to xorg 2:1.12.99.901
+ * Remove upstreamed 0001-configure.ac-Fix-udev-libudev-dependency.patch
-- Maarten Lankhorst <maarten.lankho...@canonical.com> Mon, 16 Jul 2012
13:24:29 +0200
diff --git a/debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch
b/debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch
deleted file mode 100644
index b3fb246..0000000
--- a/debian/patches/0001-configure.ac-Fix-udev-libudev-dependency.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6f639c450c513c44b6eb7ddfd31e207ca83bcd39 Mon Sep 17 00:00:00 2001
-From: Cyril Brulebois <k...@debian.org>
-Date: Sat, 31 Dec 2011 19:35:17 +0100
-Subject: [PATCH:xf86-input-evdev 1/2] configure.ac: Fix udev/libudev
- dependency.
-
-In 683a55e504f4fc2d1c847c54986439a0c61b2f20, a dependency on libudev was
-added, but documented in configure.ac as a dependency on udev (which
-also happens to ship a pkg-config file).
-
-Signed-off-by: Cyril Brulebois <k...@debian.org>
----
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 57690c4..47f70b4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,7 +46,7 @@ XORG_DEFAULT_OPTIONS
-
- # Obtain compiler/linker options from server and required extensions
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto)
--PKG_CHECK_MODULES(UDEV, udev)
-+PKG_CHECK_MODULES(UDEV, libudev)
-
- PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >=
1.11.99.901], HAVE_XI22="yes", HAVE_XI22="no")
-
---
-1.7.7.3
-
diff --git a/debian/patches/series b/debian/patches/series
index e6f3ebc..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-configure.ac-Fix-udev-libudev-dependency.patch
commit f7759b8615f7db7e27f4a1415c33777dba31d413
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Jul 16 13:41:43 2012 +0200
Bump build-dep to xorg 2:1.12.99.901
diff --git a/debian/changelog b/debian/changelog
index edcad8e..c3d8334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.7.0-2) UNRELEASED; urgency=low
+
+ [ Maarten Lankhorst ]
+ * Bump build-dep to xorg 2:1.12.99.901
+
+ -- Maarten Lankhorst <maarten.lankho...@canonical.com> Mon, 16 Jul 2012
13:24:29 +0200
+
xserver-xorg-input-evdev (1:2.7.0-1) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 7989b8b..8fe99e5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-autoreconf,
pkg-config,
quilt,
- xserver-xorg-dev (>= 2:1.11.99.901),
+ xserver-xorg-dev (>= 2:1.12.99.901),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-input-dev (>= 2.1.99.3),
commit 985dd1d5f604769617c0138d8bc18cdc0121cbc9
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Mar 20 00:40:42 2012 +0000
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f7954cb..fd723f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.7.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.7.0-1) unstable; urgency=low
[ Timo Aaltonen ]
* Remove obsolete .manpages.
@@ -14,7 +14,7 @@ xserver-xorg-input-evdev (1:2.7.0-1) UNRELEASED; urgency=low
* Bump xserver-xorg-dev build-dep to 2:1.10, now required.
* Add libudev-dev build-dep.
- -- Cyril Brulebois <k...@debian.org> Tue, 20 Mar 2012 00:32:26 +0000
+ -- Cyril Brulebois <k...@debian.org> Tue, 20 Mar 2012 00:40:39 +0000
xserver-xorg-input-evdev (1:2.6.0-2) unstable; urgency=low
commit 5350f4720d7bfe0efaec574c02f66731fc2736da
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Mar 20 00:39:13 2012 +0000
Add libudev-dev build-dep.
diff --git a/debian/changelog b/debian/changelog
index 293e34b..f7954cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xserver-xorg-input-evdev (1:2.7.0-1) UNRELEASED; urgency=low
That would require a newer input proto package, along with a newer
server, anyway.
* Bump xserver-xorg-dev build-dep to 2:1.10, now required.
+ * Add libudev-dev build-dep.
-- Cyril Brulebois <k...@debian.org> Tue, 20 Mar 2012 00:32:26 +0000
diff --git a/debian/control b/debian/control
index 0a2fcae..ff0fd36 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
x11proto-kb-dev,
libxkbfile-dev,
xutils-dev (>= 1:7.5+4),
+ libudev-dev,
Standards-Version: 3.9.1
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 83c41d097961c2adfce296a6783816aaa1b0c126
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Mar 20 00:37:22 2012 +0000
Bump xserver-xorg-dev build-dep to 2:1.10, now required.
diff --git a/debian/changelog b/debian/changelog
index 4e8152d..293e34b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xserver-xorg-input-evdev (1:2.7.0-1) UNRELEASED; urgency=low
too many bugs still need fixes so let's keep that for another day.
That would require a newer input proto package, along with a newer
server, anyway.
+ * Bump xserver-xorg-dev build-dep to 2:1.10, now required.
-- Cyril Brulebois <k...@debian.org> Tue, 20 Mar 2012 00:32:26 +0000
diff --git a/debian/control b/debian/control
index f45858a..0a2fcae 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-autoreconf,
pkg-config,
quilt,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.10),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-input-dev,
commit 6bbdfb16ab35f17f19ea039ba9bfbb1e57d80e64
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Mar 20 00:37:11 2012 +0000
Document we are avoiding XI2.2 for now.
diff --git a/debian/changelog b/debian/changelog
index 228e057..4e8152d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ xserver-xorg-input-evdev (1:2.7.0-1) UNRELEASED; urgency=low
* New upstream release.
* Actually merge upstream master up to 99340147b9 (one extra commit) to
avoid inverted horizontal scroll.
+ * Don't merge from debian-experimental to avoid picking up XI2.2 fun:
+ too many bugs still need fixes so let's keep that for another day.
+ That would require a newer input proto package, along with a newer
+ server, anyway.
-- Cyril Brulebois <k...@debian.org> Tue, 20 Mar 2012 00:32:26 +0000
commit 451d77dc9c780a5cdc10ece06b79eace7186a222
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Mar 20 00:34:36 2012 +0000
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 3c729ea..c7775ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,956 @@
+commit 99340147b9092a5aaec997eca407282a51e1f063
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Mar 15 15:46:32 2012 +1000
+
+ Fix inverted horizontal scroll (#46205)
+
+ REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL.
+
+ X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205>
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+
+commit 76b1d58a9791257fa8b4e6d3322fcb082c86b18a
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Mar 7 20:39:09 2012 +1000
+
+ evdev 2.7.0
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 224a28de25fda654040a9fd4e5c4d748c9e29809
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Jan 25 16:03:34 2012 +1000
+
+ Only force REL_X/Y if no ABS_X/Y exists
+
+ 5c5b2c8db851df7921cedd888222a6630a007fd8 added forced x/y axes if a device
+ has any axes of the same mode. This was too broad a brush, some devices
have
+ a relative wheel but absolute x/y axes and would now get misdetected as
+ purely relative device.
+
+ Only force relative axes if a device no rel x/y _and_ no abs x/y.
+
+ Reproducible: virtual machine with QEMU USB Tablet will stop working
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+
+commit bc2f01ab838119a962f5e5eabb36e33d4c084f2c
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Thu Jan 19 14:17:34 2012 -0800
+
+ Copy last valuator values into new touch valuator masks
+
+ Evdev is a 100% stateful protocol. The following represents three
+ touches. Two touches begin and end at the same time at (500, 500) and
+ (1000, 1000). The third touch begins after the first two end, and is at
+ (500, 500).
+
+ ABS_MT_SLOT 0 /* Set touch slot */
+ ABS_MT_TRACKING_ID 0 /* New touch with ID 0 in slot 0 */
+ ABS_MT_POSITION_X 500 /* Initial X position */
+ ABS_MT_POSITION_Y 500 /* Initial Y position */
+ ABS_MT_SLOT 1 /* Set touch slot */
+ ABS_MT_TRACKING_ID 1 /* New touch with ID 1 in slot 1 */
+ ABS_MT_POSITION_X 1000 /* Initial X position */
+ ABS_MT_POSITION_Y 1000 /* Initial Y position */
+ SYNC /* End of frame */
+ ABS_MT_SLOT 0 /* Go back to slot 0 */
+ ABS_MT_TRACKING_ID -1 /* Touch in slot 0 ended */
+ ABS_MT_SLOT 1 /* Go to slot 1 */
+ ABS_MT_TRACKING_ID -1 /* Touch in slot 1 ended */
+ SYNC /* End of frame */
+ ABS_MT_SLOT 0 /* Go back to slot 0 */
+ ABS_MT_TRACKING_ID 2 /* New touch in slot 0 with ID 2 */
+ SYNC /* End of frame */
+ ABS_MT_TRACKING_ID -1 /* Touch in last slot (0) ended */
+ SYNC /* End of frame */
+
+ Note that touch 2 has the same X and Y position as touch 0. This is
+ implied because no new value was emitted for slot 0. In fact, Linux will
+ not emit an event in the same slot with the same event type and code
+ unless the value has changed. Thus, we can only assume that all the MT
+ valuators have the same values as they were when they were last sent for
+ the given slot.
+
+ This change adds an array of valuator mask to hold all the last valuator
+ values that came from evdev for each slot. When a new touch begins, all
+ the last values are copied into it.
+
+ This patch assumes initial axis values of 0 in each slot. Linux and
+ mtdev do not provide a facility to query the current values of axes in
+ each slot yet. This may cause spurious incorrect touch valuator values
+ at the beginning of an X session, but there's nothing we can do about it
+ right now.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 9d9c9870c88f2c636799a68cde8efcab59a4a2a5
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Jan 13 09:51:36 2012 +1000
+
+ Prefere relative axis labelling over absolute axis labelling
+
+ If a device has both relative and absolute axes, we'd initialise the
+ relative axes but label them with the absolute labels.
+
+ The current code is broken for mixed mode devices. Most of these devices
+ operate primarily in relative mode, but have some absolute axes available
+ for secondary functionality. For now, label the relative axes properly. We
+ can fix the absolute axes later.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+
+commit 5c5b2c8db851df7921cedd888222a6630a007fd8
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Jan 12 11:03:30 2012 +1000
+
+ Force x/y axes to exist on devices with any other axes (#44655)
+
+ Too much in the server relies on x/y to exist and to be axes 0 and 1. So if
+ any relative axes exist, initialize REL_X/Y or ABS_X/Y as well.
+
+ For servers up to 1.11: a scrollwheel-only device now has relative axes
+ where it only had buttons before.
+
+ For servers 1.12 or later: the device now has x/y in addition to the scroll
+ axes.
+
+ X.Org Bug 44655 <http://bugs.freedesktop.org/show_bug.cgi?id=44655>
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 854df75f4908bee66e1057f6f04817a1c47124bc
+Author: Pete Beardmore <pete.beardm...@msn.com>
+Date: Mon Jan 9 23:47:45 2012 +0000
+
+ missing multitouch related define tests
+
+ addition of two missing define tests required when no multitouch related
+ symbols are available in user-space
+
+ Fixes X.Org Bug 44578 <https://bugs.freedesktop.org/show_bug.cgi?id=44578>
+
+ Signed-off-by: Pete Beardmore <pete.beardm...@msn.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 8c55e94a6ac91fa856d37206c8a7eda1adcc6b9d
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Tue Jan 3 15:31:43 2012 -0800
+
+ Set the default resolution to 0
+
+ If we don't know the resolution, set it to 0. This is invalid, and tells
+ the X client that we don't know the resolution, rather than reporting an
+ incorrect value.
+
+ This value was originally from commit
+ 6271494faa4c45f4fa10509f72e0515f2cef36c6, which is the initial commit
+ from Adam Jackson adding absolute axis support.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 965338e9d0ee5e2a6135a930347e9dab4b8db0dd
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Jan 3 08:44:27 2012 +1000
+
+ Remove unused udev.c
+
+ Added in 683a55e504f4fc2d1c847c54986439a0c61b2f20 due to a botched up
+ rebase -i. The contents of udev.c and EvdevIsVirtual are identical, there
is
+ no need for an extra file for this one function.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 0075da20d691e451f32bdf3c8ba0f270a6c8b0e1
+Author: Cyril Brulebois <k...@debian.org>
+Date: Sat Dec 31 19:46:08 2011 +0100
+
+ configure.ac: Fix udev/libudev dependency.
+
+ In 683a55e504f4fc2d1c847c54986439a0c61b2f20, a dependency on libudev was
+ added, but documented in configure.ac as a dependency on udev (which
+ also happens to ship a pkg-config file).
+
+ Signed-off-by: Cyril Brulebois <k...@debian.org>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 009ac94a8e6d084c13f15ed8b2e1b22f86530c9f
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat Dec 31 21:28:53 2011 -0500
+
+ Remove redundant redeclaration of Evdev3BEmuPreInit
+
+ Found-by: Tinderbox
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 4b76d80e934f5503c712289ce73d4e10cc79bba6
+Author: Cyril Brulebois <k...@debian.org>
+Date: Sat Dec 31 18:38:30 2011 +0100
+
+ evdev 2.6.99.901
+
+ Signed-off-by: Cyril Brulebois <k...@debian.org>
+
+commit 6dd6f2d3c6b2fee5f78b01618643c7f3ed0819c3
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Dec 29 10:37:38 2011 +1000
+
+ Require xserver 1.12 RC1
+
+ Remove the ABI check hack, just check for the server version directly now
+ that we have one that definitely has the multitouch APIs.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 0c7c087f77132657dd8ee342963bb1b51d659571
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Dec 29 10:19:48 2011 +1000
+
+ Test for mtdev before assuming multitouch
+
+ If the XI2.2 headers are present but mtdev isn't, build without MULTITOUCH
+ defined.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit ba9377c6d9e6d0d2813e471b516bb36902dae2ce
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Sat Dec 24 12:19:40 2011 +1000
+
+ Remove need for --enable-multitouch
+
+ If we spot inputproto 2.1.99.3, we assume we have a capable X server. This
+ should really be a server version check, but the server version hasn't been
+ bumped yet.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 7f7606fc461dca1f087a756c85e22f2cc773d008
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Sat Dec 24 12:31:34 2011 +1000
+
+ Include config.h from evdev.h
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 0ba58f483e564bd815bae36f6272029693c1fd5c
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Sat Dec 24 12:18:16 2011 +1000
+
+ Always include mt_mask in the evdev struct
+
+ Even if MT support isn't available, include it in the build. The checks in
+ the code check whether mt_mask is non-NULL but they would all need ifdef
+ escaping otherwise.
+
+ Leave the mtdev part inside the ifdef however, so that we don't need the
+ mtdev header if we don't build with multitouch.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 5fb48757477b2effd69c8fe8722ad95b21dbf7f5
+Merge: 7909975 e99ab23
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Dec 23 08:16:54 2011 +1000
+
+ Merge branch 'multitouch'
+
+commit e99ab2314f712df8dd705b16008755f8b3095707
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Dec 20 15:08:06 2011 +1000
+
+ Don't count legacy and MT axes twice
+
+ The kernel exports both ABS_X and ABS_MT_POSITION_X (and a couple others)
+ for a multi-touch capable device. For such devices, only count the axis
once
+ since we submit ABS_MT_POSITION_X through ABS_X.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 191660189a01b9c96bb4c0fa1a2e5008ae666238
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Dec 20 14:14:16 2011 +1000
+
+ Add is_blacklisted_axis() helper
+
+ The kernel exports a bunch of information as axis that shouldn't be an axis
+ and we don't treat it as axis in the server. Add this helper instead of
+ checking for the axis codes manually.
+
+ No function change.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit a1c3f8efbbff7f93e216ccdb32bd176a8ba33b09
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Dec 20 13:32:06 2011 +1000
+
+ Drop now-unnecessary XI 2.1 and XI 2.2 error suppression defines
+
+ Gone since inputproto 2.1.99.3
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit f3c628acc4f7399325756590cdc72e769341243c
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Dec 20 10:56:22 2011 +1000
+
+ Map ABS_MT_POSITION_X/Y into ABS_X/Y
+
+ MT axes are the same as traditional axes, so one into the other so we get
+ x/y coordinates regardless wich axes it comes from.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 7909975b0b965fbf0935bf012987a5368ea0e67a
+Author: Paulo Zanoni <paulo.r.zan...@intel.com>
+Date: Thu Dec 15 12:26:37 2011 -0200
+
+ Fix relative events with swapped axes
+
+ After we swap the axes, we only call valuator_mask_set for axes that are
+ not zero, so we need to unset the axes that became zero when swapped.
+
+ Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 8d6dfd13b0c4177305555294218e366a6cddc83f
+Author: Paulo Zanoni <paulo.r.zan...@intel.com>
+Date: Wed Dec 14 15:23:36 2011 -0200
+
+ Fix absolute events with swapped axes
+
+ We were correctly swapping the valuator values, but we were not
+ calling valuator_mask_unset() when needed, so the cursor kept jumping
+ to the edges.
+
+ This patch does the swapping before the main "for", so we don't need to
+ store unswapped_{x,y} and unswapped_isset_{x,y} even when we don't need
+ to swap.
+
+ Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit fed454192ddc4ad94226040c657deb6abea3df88
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Dec 15 08:55:32 2011 +1000
+
+ Use xf86InitValuatorAxisStruct, the touch-specific version was dropped
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit cf93a21df1dd66118d3a1f5a0769d48f317de749
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Tue Nov 29 18:02:58 2011 -0800
+
+ Don't send pointer events for multitouch touchscreen devices
+
+ Pointer events will be emulated by the server.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+
+commit fac1a41c75a7c4bfabff34dc8ed1dff2587c6011
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Nov 11 15:57:26 2011 +1000
+
+ Add the required defines to compile against the inputproto
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 3175a2a96d448a0b2584a58ab3d05fbebb11fab1
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Nov 2 09:53:34 2011 +1000
+
+ Print to the log if we find multitouch axes.
+
+ No real effect on the code, but it helps to have that line in the log when
+ searching for driver issues.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 5e9b027807cc205dc9c4efbb8360ac4b20317682
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Oct 31 08:58:18 2011 +1000
+
+ Replace 0/1 button values with enums
+
+ BUTTON_PRESS is much harder to confuse with a button number than a simple
1.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 2ce305129ca94394096f4d697d51eb120de2940b
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Oct 26 13:21:18 2011 +1000
+
+ Skip event posting for empty slots.
+
+ ABS_MT_SLOT comes before any other events. The following order of events
+ is common for protocol B devices (and mtdev):
+
+ ...
+ EV_SYN
+ ABS_MT_SLOT → posting here means we miss on the position information
+ ABS_MT_POSITION_X
+ ABS_MT_POSITION_Y
+ ABS_MT_SLOT
+ ABS_MT_POSITION_X
+ ABS_MT_POSITION_Y
+ EV_SYN
+
+ Store the stot state as SLOT_EMPTY after posting an event (i.e. EV_SYN and
+ ABS_MT_SLOT) and then don't post until the next slot/syn event.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 9411749f76c31a8054ded62a6fb767c8135b4d4e
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Oct 26 13:09:30 2011 +1000
+
+ Replace open_slot/close_slot with a SlotState enum
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 239e972be1f2c6a984dd6c5aecce710d0b866257
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Oct 26 11:14:04 2011 +1000
+
+ Simplify a condition, only the event type differs here
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 6127923fe0d50cb9b9ac4ae0a3876ba6f180137c
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Oct 26 10:51:16 2011 +1000
+
+ When resetting the queue, don't reset the touchMask
+
+ Otherwise we segfault after the first SYN event
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit fc4f98153c2608389d87e37316036a31fb1021e7
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Oct 26 09:59:34 2011 +1000
+
+ MT axes are counted separately, make sure they're initialized too.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit fabee66bcc7260ec50c3091be3f9b503eea65e61
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Oct 25 15:06:38 2011 +1000
+
+ 0 is the value for "unknown/unlimited" number of touches
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 91d90a79593369ba1079d06a75f09ceaa9143768
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Oct 25 14:55:47 2011 +1000
+
+ Use mtdev API to allocate/free mtdev structs
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit c1b89bda12c1897120bace941625cfa27e547458
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Oct 25 14:52:26 2011 +1000
+
+ Remove duplicate line
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 907b7cad3fd892ca3349cd18e9ccdc5659027b40
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Thu Dec 2 18:01:41 2010 -0500
+
+ Ensure touchpad events are always processed with MT
+
+ Without this change, an MT touchpad in relative mode could end a touch
+ while not resetting the oldMask used to calculate relative values. This
+ fix allows a Magic Trackpad to behave as a relative mode device again.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+
+commit c9a2b4e9ce9b15e57241184df78c72ec8f6a4705
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Mon Nov 8 14:35:02 2010 -0500
+
+ Use MTDev for multitouch devices
+
+ MTDev translates all multitouch devices to the slotted evdev protocol.
+ This provides a clean and uniform interface and reduces message handling
+ inside the input module and X.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+
+commit e18abd0049421a98e61c15c2d56cfe2821cf4739
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Mon Nov 8 11:08:01 2010 -0500
+
+ Add experimental XI 2.1 multitouch support
+
+ This multitouch addition only supports slotted MT evdev protocol
+ devices. Support must be enabled at configure time using
+ --enable-multitouch.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+
+ Amendments: XI_TouchMotion -> XI_TouchUpdate, rename mtMask to mt_mask
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 683a55e504f4fc2d1c847c54986439a0c61b2f20
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Oct 25 09:59:50 2011 +1000
+
+ Use a new "Virtual Device" boolean property to mark virtual devices
+
+ Use udev to check for the device's sysfs path, if it contains LNXSYSTM it's
+ a kernel-emulated device. This property can then be used to determine if
+ there are any real devices connected, allowing the desktop environment to
+ e.g. turn off the touchpad whenever there's a mouse attached.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit a9cdb6590cdf72917cdfeb17e2fcc6a110b2c7d1
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Nov 11 07:31:02 2011 +1000
+
+ Move misplaced #endif caused by smooth-scrolling merge
+
+ Bad conflict resolution in xf86-input-evdev-2.6.0-30-g745fca0
+
+ Reported-by: Sebastian Glita <gls...@yahoo.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit dd000dd4fa118529809632e610a0a439d7467096
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Nov 9 16:04:06 2011 +1000
+
+ Bump to 2.6.99
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 745fca03a20117583bc18c7134583311ff52c29c
+Merge: eede8cc b450efd
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Nov 9 16:01:48 2011 +1000
+
+ Merge branch 'smooth-scrolling'
+
+ Conflicts:
+ src/evdev.c
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit b450efdf95999cad08de23ce069f04a66bdae24b
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Aug 19 11:15:09 2011 +1000
+
+ Support smooth scrolling on REL_WHEEL, REL_HWHEEL and REL_DIAL
+
+ Automatic smooth scrolling setup for these axes, with REL_WHEEL and
REL_DIAL
+ both mapping into vscrolling. REL_WHEEL is the preferred axis.
+
+ Mouse wheel emulation is not yet updated for smooth scrolling.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+
+commit eede8ccffc1a831f4de89403edc8dffd52494e8b
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Oct 25 15:43:38 2011 +1000
+
+ Don't crop long value from EvdevBitIsSet.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+ Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 2aba790ed3acc3ece5e56dac088e0a0a4a04b45d
+Author: Jools Wills <jo...@oxfordinspire.co.uk>
+Date: Sun Oct 30 23:19:21 2011 +0000
+
+ emuThird: Use xf86SetIntOption, not xf86SetBoolOption for integer values
+
+ Signed-off-by: Jools Wills <jo...@oxfordinspire.co.uk>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 49693892ce35e95674fbb3d2a067c8fa0227da87
+Author: Max Schwarz <m...@x-quadraht.de>
+Date: Mon Oct 17 21:01:22 2011 +0200
+
+ type-safe inline functions for bitmask manipulation
+
+ We can't use BitIsSet/SetBit from the server (inputstr.h) since they
+ operate on byte arrays. EvdevSetBit is added in preparation for the
+ "smooth-scrolling on wheel emulation" patch.
+
+ Signed-off-by: Max Schwarz <m...@x-quadraht.de>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 070f30e08956e7fa8b7f9ca6b94fee3ef39caa1e
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Aug 15 11:34:12 2011 +1000
+
+ Exit axis labelling if axes are neither rel nor abs
+
+ No actual effect since labels_len is always 0 anyway but let's make the
+ return more explicit.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit ffe35b6c2566fc2a3f418185a61a12c7f377affd
+Author: Terry Lambert <tlamb...@chromium.org>
+Date: Fri Jul 15 17:23:20 2011 -0700
+
+ xf86-input-evdev: Return proper default for unknown values in
pInfo->device_control.
+
+ Signed-off-by: Terry Lambert <tlamb...@chromium.org>
+ Reviewed-by: Stephane Marchesin <marc...@chromium.org>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 5069e053354ad6adfcbb08c962bff93b607dec3d
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri May 27 16:20:03 2011 +1000
+
+ Remove unused misc_label and val
+
+ evdev.c: In function 'EvdevInitAxesLabels':
+ evdev.c:2192:11: warning: variable 'misc_label' set but not used
+ [-Wunused-but-set-variable]
+ obsolete with 880ad1e19afd83ac115948b67d4049e16cb12df0
+
+ emuWheel.c: In function 'EvdevWheelEmuPreInit':
+ emuWheel.c:252:10: warning: variable 'val' set but not used
+ [-Wunused-but-set-variable]
+ obsolete with b0737bdbd1f6e601eb4984b6f4cb49279190984c
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 0b9fad23a3d464ac064521d0e29f036b0ffdc9b8
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri May 27 16:17:12 2011 +1000
+
+ Print abs axes ranges on verbosity 6.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+
+commit b79776cf8caa2b8db2984177661698da862befa6
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Jun 15 10:22:39 2011 +1000
+
+ Require server 1.10
+
+ We require ABI 12.2 in the driver, enforce it through pkg-config.
+ Technically ABI 12.2 is first available in 1.9.99.902 but 1.10 looks so
much
+ nicer.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+
+commit a52cd1cab2ae84442758de5155c5ec1417a7d16d
+Author: Daniel Kurtz <djku...@google.com>
+Date: Tue Jun 14 18:09:00 2011 +0800
+
+ Set prop_product_id undeletable
+
+ prop_invert was accidentally being set undeletable twice.
+
+ Signed-off-by: Daniel Kurtz <djku...@google.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit eaf202531f2bb2b3da6d4769769f76da5489ae68
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Jan 31 14:11:44 2011 +1000
+
+ Export device node as property.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ss9vt-0002gv...@vasks.debian.org
