xserver-xorg-input-evdev: Changes to 'debian-unstable'
.cvsignore | 19
.gitignore | 25
ChangeLog | 475 +++
Makefile.am | 11
Makefile.in | 40
aclocal.m4 | 265 +
config.guess | 32
config.sub | 44
configure | 781 ++++-
configure.ac | 5
debian/changelog | 18
debian/control | 6
debian/patches/evdev_no_flush_on_init.diff | 20
debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch | 21
debian/patches/series | 2
debian/rules | 6
debian/xsfbs/xsfbs-autoreconf.mk | 150 -
debian/xsfbs/xsfbs.mk | 79
debian/xsfbs/xsfbs.sh | 387 +-
depcomp | 33
install-sh | 228 -
ltmain.sh | 58
man/.cvsignore | 2
man/.gitignore | 3
man/Makefile.in | 6
man/evdev.man | 323 --
src/.cvsignore | 6
src/.gitignore | 6
src/Makefile.am | 5
src/Makefile.in | 77
src/emuMB.c | 334 ++
src/evdev.c | 1330 +++++++---
src/evdev.h | 323 --
src/evdev_axes.c | 930 ------
src/evdev_btn.c | 477 ---
src/evdev_key.c | 549 ----
36 files changed, 3169 insertions(+), 3907 deletions(-)
New commits:
commit b809c20bec5be95db5f9278586ca0965b1b4d6a7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 15:37:15 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index aa4bd65..5ba992c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low
[ Julien Cristau, Timo Aaltonen ]
* New upstream release.
@@ -14,7 +14,7 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
dpkg-dev >= 1.14.17.
* Fix target dependencies in debian/rules.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Jul 2008 19:26:00 +0300
+ -- Julien Cristau <jcristau@debian.org> Sun, 13 Jul 2008 15:37:13 +0200
xserver-xorg-input-evdev (1:1.2.0-1) unstable; urgency=low
commit abce57373bd789036f1f960fbe68c36ba56d4126
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 15:32:08 2008 +0200
fix attribution in changelog
diff --git a/debian/changelog b/debian/changelog
index 739e01c..aa4bd65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
+ [ Julien Cristau, Timo Aaltonen ]
+ * New upstream release.
+
[ Julien Cristau ]
* Drop the XS- prefix from Vcs-* control fields.
- * New upstream release.
* Drop evdev_no_flush_on_init.diff, obsolete.
* New patch include-the-proper-header-for-XkbSetRulesDflts-and-X.patch, fix
a 'missing declaration' compiler warning by including the right header.
commit 0a43b67e7dd432e891610590d409122ae3ef5992
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 15:31:27 2008 +0200
Fix target dependencies in debian/rules.
diff --git a/debian/changelog b/debian/changelog
index 8dfa877..739e01c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
/usr/bin/Xorg and other modules, and that's not a bug, so we want
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
dpkg-dev >= 1.14.17.
+ * Fix target dependencies in debian/rules.
-- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Jul 2008 19:26:00 +0300
diff --git a/debian/rules b/debian/rules
index 9d27e8f..620884c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,8 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
commit d8a36f90aaab34c386564cf351ac787d713435a5
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 15:28:09 2008 +0200
update patch for new upstream
diff --git a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
index 8c80497..8b3d7d4 100644
--- a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
+++ b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
@@ -4,15 +4,13 @@ Date: Thu, 22 May 2008 20:54:02 +0200
Subject: [PATCH] include the proper header for XkbSetRulesDflts and XkbInitKeyboardDeviceStruct
---
- src/evdev.c | 3 +--
+ src/evdev.h | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
-diff --git a/src/evdev.c b/src/evdev.c
-index e212c14..18999f4 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -45,8 +45,7 @@
- #include <mipointer.h>
+--- xserver-xorg-input-evdev.orig/src/evdev.h
++++ xserver-xorg-input-evdev/src/evdev.h
+@@ -36,8 +36,7 @@
+ #include <xf86_OSproc.h>
#if defined(XKB)
-/* XXX VERY WRONG. this is a client side header. */
@@ -20,7 +18,4 @@ index e212c14..18999f4 100644
+#include <xkbsrv.h>
#endif
- #include <xf86Module.h>
---
-1.5.5.1
-
+ typedef struct {
commit 66e28c41fd0932dbd7c98ec2dfd6d531cae9d030
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 10 18:30:03 2008 +0200
Revert "Remove the patch, not needed anymore."
This reverts commit 1e99025632815c565dd24ca3328ff304cb763e50.
diff --git a/debian/changelog b/debian/changelog
index cc9fd60..8dfa877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
* Drop the XS- prefix from Vcs-* control fields.
* New upstream release.
* Drop evdev_no_flush_on_init.diff, obsolete.
+ * New patch include-the-proper-header-for-XkbSetRulesDflts-and-X.patch, fix
+ a 'missing declaration' compiler warning by including the right header.
* Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
/usr/bin/Xorg and other modules, and that's not a bug, so we want
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
diff --git a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
new file mode 100644
index 0000000..8c80497
--- /dev/null
+++ b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
@@ -0,0 +1,26 @@
+From 9007585c1fce21e786372c2f1ca1c7776f3eafdb Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Thu, 22 May 2008 20:54:02 +0200
+Subject: [PATCH] include the proper header for XkbSetRulesDflts and XkbInitKeyboardDeviceStruct
+
+---
+ src/evdev.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/evdev.c b/src/evdev.c
+index e212c14..18999f4 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -45,8 +45,7 @@
+ #include <mipointer.h>
+
+ #if defined(XKB)
+-/* XXX VERY WRONG. this is a client side header. */
+-#include <X11/extensions/XKBstr.h>
++#include <xkbsrv.h>
+ #endif
+
+ #include <xf86Module.h>
+--
+1.5.5.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0bc726b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
commit 3096936f2473c873ddc747da160cc0895f8f96ed
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 10 18:29:45 2008 +0200
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 12c37bb..340dc01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,168 @@
+commit b125b834f4ce4877204b9c8e98ad2641e2c7b082
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sun Jun 22 17:52:58 2008 +0930
+
+ evdev 2.0.1
+
+commit 05b20db8dbfb47bc370fe24e50ef563f1879be61
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sat Jun 21 16:42:12 2008 +0930
+
+ No need to finalize MB emulation after EvdevProbe anymore.
+
+ Follow-up to 76800bfa75807e49398380b902f6c0f547cd4c0e.
+ (cherry picked from commit 5a0ea39b79b27b7c3117661a21e7ab5eba3c9b24)
+
+commit 43768d59da2c519dde5a8efaf0ff2b12b6c47fcc
+Author: Simon Munton <simon@munton.demon.co.uk>
+Date: Sat Jun 21 10:19:07 2008 +0930
+
+ Close file descriptor if EvdevProbe fails.
+
+ Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+ (cherry picked from commit 373e13ae353d1e0022f8821adc528ebc5411d47d)
+
+commit 9c524f6963645bf42bbd41d4189d6319020a133d
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jun 20 18:20:55 2008 -0700
+
+ Enable middle button emulation at DEVICE_ON instead of DEVICE_INIT.
+
+ This ensures that the middle button emulation is re-enabled after VT switch,
+ otherwise the block handler that deals with the timeouts would not get
+ re-registered.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 76800bfa75807e49398380b902f6c0f547cd4c0e)
+
+commit 04003a98a9ca1b4b0c32d319fab07ee7afc83c75
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 17 14:01:49 2008 +0930
+
+ evdev 2.0.0
+
+commit 0443fb430f2481c1f0d0d83730a9145b5794f559
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 17 13:59:15 2008 +0930
+
+ Shut up compiler warning "implicit declaration of function 'xf86Msg'"
+
+commit 998f52010f92dc79f2ace6048a2f3fd600a97582
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Jun 12 11:23:10 2008 +0930
+
+ Finalize MB emulation if EvdevProbe fails.
+
+ This avoids segfaults when HAL is restarted behind our backs. Also, only init
+ MB emulation when the device actually has a button.
+
+commit de07c04f5c2874b8e407913c3121e715e46653d2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Wed Jun 11 11:24:07 2008 +0930
+
+ evdev 1.99.4
+
+ 1.99.3 had a nasty bug, so here's a quick update.
+
+commit 01355b9d4b3ed92da42f90fb69384eb22cdcb3d9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Wed Jun 11 11:19:04 2008 +0930
+
+ If Emulate3Buttons is specified in the config, don't auto-deactivate it.
+
+ Default setting is still "on" until middle button is pressed. If the options
+ is however explicitly stated in the config file, it takes the value from the
+ config file, no matter if a middle button is present.
+
+commit 9591dc1f6cc89208805b120eabd055e8dabd3e40
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Wed Jun 11 10:36:00 2008 +0930
+
+ Remove wakeup handlers when device is closed.
+
+ Less SIGABRTs are less exciting, but sometimes boredom is what we want.
+
+commit 08ba40b2532bd61b60c9cf994b21300f596f7ebd
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 10 17:35:33 2008 -0400
+
+ evdev 1.99.3
+
+commit 39dc453691804648f34dbd856bd7e66cfdc59d66
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 10 22:48:01 2008 +0930
+
+ Disable middle mouse button emulation when a real middle MB event is detected.
+
+ Devices may report middle mouse buttons even if they don't have one (PS/2
+ devices just don't know any better), so we can't be sure until we see the
+ event.
+
+commit e8887435ac065ec3071b2d8bf0895e8cb196ec3d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 10 15:55:40 2008 +0930
+
+ Enable middle-mouse button emulation.
+
+ Ported from xf86-input-mouse, with a few cleanups.
+
+commit b0f6987ee6b133e28f3af18da62cfb5ca79fbe07
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 10 22:41:43 2008 +0930
+
+ Plug a memory leak, we allocated pEvdev twice, dropping the first memory area.
+
+commit fec73e1418a4da1b64496faca27b06fef0aa5206
+Author: Sven Wegener <swegener@gentoo.org>
+Date: Sat Jun 7 13:01:22 2008 +0200
+
+ evdev: Port b4a5a204 "Fix pointer crossing screen bug." to current master branch
+
+ The commit b4a5a204 fixed an issue, where we can't move the pointer to
+ other screens and this happens in current master branch again. This commit
+ ports the old commit to the current master branch.
+
+ Signed-off-by: Sven Wegener <swegener@gentoo.org>
+ Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit da112737eb109dc263169e820b7ef903b7f8624f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sun Jun 8 00:12:03 2008 +0930
+
+ Check for XINPUT ABI < 3 (corrected version)
+
+ Thanks to Sven Wegener for pointing out the incorrect previous version.
+
+commit d40125ea8c2ce6ec0f98bdc0655f79aa7274152e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sun Jun 8 00:09:40 2008 +0930
+
+ Revert "Check for XINPUT ABI, parameters of InitValuatorClassRec have changed."
+
+ GetMotionEvents() doesn't exist, led to compile errors with servers pre-MPX
+ merge. Thanks to Sven Wegener for pointing this out.
+
+ This reverts commit 42422d8f69e6806e1adfd93017cac064a75041c7.
+
+commit 42422d8f69e6806e1adfd93017cac064a75041c7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Mon May 26 19:17:19 2008 +0930
+
+ Check for XINPUT ABI, parameters of InitValuatorClassRec have changed.
+
+commit 15e0091f0b4b0d7dff29da143d405255a1c3bc12
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Wed May 21 16:48:32 2008 +0930
+
+ Fail if the device cannot be grabbed during the probe.
+
+ If the grab fails, this is most likely a sign that the device has been grabbed
+ already (probably by a device specified in xorg.conf). So let's not add the
+ device to the server's input device list, since it won't generate events
+ anyway.
+
+ Exception: keyboards and kernel 2.4 are not affected.
+
commit d45f315845e19a720af25dc5f6c8a4c654c6e225
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 15:05:10 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index f5e3a07..cc9fd60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Drop the XS- prefix from Vcs-* control fields.
- * New upstream release candidate.
+ * New upstream release.
* Drop evdev_no_flush_on_init.diff, obsolete.
* Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
/usr/bin/Xorg and other modules, and that's not a bug, so we want
commit 884793eaadc6543537e6d1290dbd50d11b54f71a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 10 18:24:18 2008 +0200
autoreconf
diff --git a/configure b/configure
index 531db2f..2e5c368 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-evdev 1.99.2.
+# Generated by GNU Autoconf 2.61 for xf86-input-evdev 2.0.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-evdev'
PACKAGE_TARNAME='xf86-input-evdev'
-PACKAGE_VERSION='1.99.2'
-PACKAGE_STRING='xf86-input-evdev 1.99.2'
+PACKAGE_VERSION='2.0.1'
+PACKAGE_STRING='xf86-input-evdev 2.0.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1416,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-evdev 1.99.2 to adapt to many kinds of systems.
+\`configure' configures xf86-input-evdev 2.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1486,7 +1486,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-evdev 1.99.2:";;
+ short | recursive ) echo "Configuration of xf86-input-evdev 2.0.1:";;
esac
cat <<\_ACEOF
@@ -1598,7 +1598,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-evdev configure 1.99.2
+xf86-input-evdev configure 2.0.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1612,7 +1612,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-evdev $as_me 1.99.2, which was
+It was created by xf86-input-evdev $as_me 2.0.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2304,7 +2304,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-evdev'
- VERSION='1.99.2'
+ VERSION='2.0.1'
cat >>confdefs.h <<_ACEOF
@@ -21712,7 +21712,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-evdev $as_me 1.99.2, which was
+This file was extended by xf86-input-evdev $as_me 2.0.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21765,7 +21765,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-evdev config.status 1.99.2
+xf86-input-evdev config.status 2.0.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/src/Makefile.in b/src/Makefile.in
index cd96f8f..db7896c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -71,7 +71,7 @@ am__installdirs = "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)"
@DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(@DRIVER_NAME@_drv_la_LTLIBRARIES)
@DRIVER_NAME@_drv_la_LIBADD =
-am_@DRIVER_NAME@_drv_la_OBJECTS = @DRIVER_NAME@.lo
+am_@DRIVER_NAME@_drv_la_OBJECTS = @DRIVER_NAME@.lo emuMB.lo
@DRIVER_NAME@_drv_la_OBJECTS = $(am_@DRIVER_NAME@_drv_la_OBJECTS)
@DRIVER_NAME@_drv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -228,7 +228,10 @@ top_srcdir = @top_srcdir@
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@
-@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c
+@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \
+ @DRIVER_NAME@.h \
+ emuMB.c
+
all: all-am
.SUFFIXES:
@@ -299,6 +302,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/@DRIVER_NAME@.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emuMB.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
commit 1e99025632815c565dd24ca3328ff304cb763e50
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Tue Jul 1 20:11:31 2008 +0300
Remove the patch, not needed anymore.
diff --git a/debian/changelog b/debian/changelog
index 68d3c54..f5e3a07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
* Drop the XS- prefix from Vcs-* control fields.
* New upstream release candidate.
* Drop evdev_no_flush_on_init.diff, obsolete.
- * New patch include-the-proper-header-for-XkbSetRulesDflts-and-X.patch, fix
- a 'missing declaration' compiler warning by including the right header.
* Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
/usr/bin/Xorg and other modules, and that's not a bug, so we want
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
diff --git a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
deleted file mode 100644
index 8c80497..0000000
--- a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9007585c1fce21e786372c2f1ca1c7776f3eafdb Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Thu, 22 May 2008 20:54:02 +0200
-Subject: [PATCH] include the proper header for XkbSetRulesDflts and XkbInitKeyboardDeviceStruct
-
----
- src/evdev.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index e212c14..18999f4 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -45,8 +45,7 @@
- #include <mipointer.h>
-
- #if defined(XKB)
--/* XXX VERY WRONG. this is a client side header. */
--#include <X11/extensions/XKBstr.h>
-+#include <xkbsrv.h>
- #endif
-
- #include <xf86Module.h>
---
-1.5.5.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0bc726b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
commit d03266926a5ac587ec6d93b3dd3805f62cced43f
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Tue Jul 1 19:27:40 2008 +0300
2.0.1
diff --git a/debian/changelog b/debian/changelog
index c27e9eb..68d3c54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-input-evdev (1:1.99.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Drop the XS- prefix from Vcs-* control fields.
* New upstream release candidate.
* Drop evdev_no_flush_on_init.diff, obsolete.
@@ -10,7 +11,7 @@ xserver-xorg-input-evdev (1:1.99.2-1) UNRELEASED; urgency=low
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
dpkg-dev >= 1.14.17.
- -- Julien Cristau <jcristau@debian.org> Fri, 21 Mar 2008 22:04:25 +0100
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Jul 2008 19:26:00 +0300
xserver-xorg-input-evdev (1:1.2.0-1) unstable; urgency=low
commit b125b834f4ce4877204b9c8e98ad2641e2c7b082
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 22 17:52:58 2008 +0930
evdev 2.0.1
diff --git a/configure.ac b/configure.ac
index c7df2a2..f7db989 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 2.0.0,
+ 2.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit 05b20db8dbfb47bc370fe24e50ef563f1879be61
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jun 21 16:42:12 2008 +0930
No need to finalize MB emulation after EvdevProbe anymore.
Follow-up to 76800bfa75807e49398380b902f6c0f547cd4c0e.
(cherry picked from commit 5a0ea39b79b27b7c3117661a21e7ab5eba3c9b24)
diff --git a/src/evdev.c b/src/evdev.c
index f029e8b..0078881 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1052,7 +1052,6 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
/* parse the XKB options during kbd setup */
if (EvdevProbe(pInfo)) {
- EvdevMBEmuFinalize(pInfo);
close(pInfo->fd);
xf86DeleteInput(pInfo, 0);
return NULL;
commit 43768d59da2c519dde5a8efaf0ff2b12b6c47fcc
Author: Simon Munton <simon@munton.demon.co.uk>
Date: Sat Jun 21 10:19:07 2008 +0930
Close file descriptor if EvdevProbe fails.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
(cherry picked from commit 373e13ae353d1e0022f8821adc528ebc5411d47d)
diff --git a/src/evdev.c b/src/evdev.c
index fa0545f..f029e8b 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1053,6 +1053,7 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
if (EvdevProbe(pInfo)) {
EvdevMBEmuFinalize(pInfo);
+ close(pInfo->fd);
xf86DeleteInput(pInfo, 0);
return NULL;
}
commit 9c524f6963645bf42bbd41d4189d6319020a133d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 20 18:20:55 2008 -0700
Enable middle button emulation at DEVICE_ON instead of DEVICE_INIT.
This ensures that the middle button emulation is re-enabled after VT switch,
otherwise the block handler that deals with the timeouts would not get
re-registered.
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 76800bfa75807e49398380b902f6c0f547cd4c0e)
diff --git a/src/evdev.c b/src/evdev.c
index 65b7185..fa0545f 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -835,6 +835,8 @@ EvdevProc(DeviceIntPtr device, int what)
xf86Msg(X_WARNING, "%s: Grab failed (%s)\n", pInfo->name,
strerror(errno));
xf86AddEnabledDevice(pInfo);
+ if (pEvdev->flags & EVDEV_BUTTON_EVENTS)
+ EvdevMBEmuPreInit(pInfo);
device->public.on = TRUE;
break;
@@ -941,7 +943,6 @@ EvdevProbe(InputInfoPtr pInfo)
if (TestBit(BTN_LEFT, key_bitmask)) {
xf86Msg(X_INFO, "%s: Found mouse buttons\n", pInfo->name);
- EvdevMBEmuPreInit(pInfo);
pEvdev->flags |= EVDEV_BUTTON_EVENTS;
has_buttons = TRUE;
}
commit 04003a98a9ca1b4b0c32d319fab07ee7afc83c75
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 17 14:01:49 2008 +0930
evdev 2.0.0
diff --git a/configure.ac b/configure.ac
index f366c9c..c7df2a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 1.99.4,
+ 2.0.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit 0443fb430f2481c1f0d0d83730a9145b5794f559
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 17 13:59:15 2008 +0930
Shut up compiler warning "implicit declaration of function 'xf86Msg'"
diff --git a/src/emuMB.c b/src/emuMB.c
index f24a721..5def36b 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -34,6 +34,8 @@
#include "config.h"
#endif
+#include <xf86.h>
+
#include "evdev.h"
enum {
commit 998f52010f92dc79f2ace6048a2f3fd600a97582
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 12 11:23:10 2008 +0930
Finalize MB emulation if EvdevProbe fails.
This avoids segfaults when HAL is restarted behind our backs. Also, only init
MB emulation when the device actually has a button.
diff --git a/src/evdev.c b/src/evdev.c
index 4d20b76..65b7185 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -941,6 +941,7 @@ EvdevProbe(InputInfoPtr pInfo)
if (TestBit(BTN_LEFT, key_bitmask)) {
xf86Msg(X_INFO, "%s: Found mouse buttons\n", pInfo->name);
+ EvdevMBEmuPreInit(pInfo);
pEvdev->flags |= EVDEV_BUTTON_EVENTS;
has_buttons = TRUE;
}
@@ -1025,8 +1026,6 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
*/
pEvdev->tool = 1;
- EvdevMBEmuPreInit(pInfo);
-
device = xf86CheckStrOption(dev->commonOptions, "Path", NULL);
if (!device)
device = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
@@ -1052,6 +1051,7 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
/* parse the XKB options during kbd setup */
if (EvdevProbe(pInfo)) {
+ EvdevMBEmuFinalize(pInfo);
xf86DeleteInput(pInfo, 0);
return NULL;
}
commit de07c04f5c2874b8e407913c3121e715e46653d2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 11 11:24:07 2008 +0930
evdev 1.99.4
1.99.3 had a nasty bug, so here's a quick update.
diff --git a/configure.ac b/configure.ac
index 1b2f2fb..f366c9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 1.99.3,
+ 1.99.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit 01355b9d4b3ed92da42f90fb69384eb22cdcb3d9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 11 11:19:04 2008 +0930
If Emulate3Buttons is specified in the config, don't auto-deactivate it.
Default setting is still "on" until middle button is pressed. If the options
is however explicitly stated in the config file, it takes the value from the
config file, no matter if a middle button is present.
diff --git a/src/emuMB.c b/src/emuMB.c
index b2974b7..f24a721 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -36,6 +36,12 @@
#include "evdev.h"
+enum {
+ MBEMU_DISABLED = 0,
+ MBEMU_ENABLED,
+ MBEMU_AUTO
+};
+
/*
* Lets create a simple finite-state machine for 3 button emulation:
*
@@ -288,9 +294,17 @@ void
EvdevMBEmuPreInit(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
+ pEvdev->emulateMB.enabled = MBEMU_AUTO;
+
+ if (xf86FindOption(pInfo->options, "Emulate3Buttons"))
+ {
+ pEvdev->emulateMB.enabled = xf86SetBoolOption(pInfo->options,
+ "Emulate3Buttons",
+ MBEMU_ENABLED);
+ xf86Msg(X_INFO, "%s: Forcing middle mouse button emulation.\n",
+ pInfo->name);
+ }
- pEvdev->emulateMB.enabled = xf86SetBoolOption(pInfo->options,
- "Emulate3Buttons", TRUE);
pEvdev->emulateMB.timeout = xf86SetIntOption(pInfo->options,
"Emulate3Timeout", 50);
RegisterBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
@@ -313,5 +327,6 @@ void
EvdevMBEmuEnable(InputInfoPtr pInfo, BOOL enable)
{
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
- pEvdev->emulateMB.enabled = enable;
+ if (pEvdev->emulateMB.enabled == MBEMU_AUTO)
+ pEvdev->emulateMB.enabled = enable;
}
commit 9591dc1f6cc89208805b120eabd055e8dabd3e40
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 11 10:36:00 2008 +0930
Remove wakeup handlers when device is closed.
Less SIGABRTs are less exciting, but sometimes boredom is what we want.
diff --git a/src/emuMB.c b/src/emuMB.c
index 2855632..b2974b7 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -299,6 +299,15 @@ EvdevMBEmuPreInit(InputInfoPtr pInfo)
}
+void
+EvdevMBEmuFinalize(InputInfoPtr pInfo)
+{
+ RemoveBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
+ EvdevMBEmuWakeupHandler,
+ (pointer)pInfo);
+
+}
+
/* Enable/disable middle mouse button emulation. */
void
EvdevMBEmuEnable(InputInfoPtr pInfo, BOOL enable)
diff --git a/src/evdev.c b/src/evdev.c
index 05eb760..4d20b76 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -843,6 +843,7 @@ EvdevProc(DeviceIntPtr device, int what)
xf86Msg(X_WARNING, "%s: Release failed (%s)\n", pInfo->name,
strerror(errno));
xf86RemoveEnabledDevice(pInfo);
+ EvdevMBEmuFinalize(pInfo);
device->public.on = FALSE;
break;
diff --git a/src/evdev.h b/src/evdev.h
index 9b88e16..cad1eed 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -75,6 +75,7 @@ BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL);
void EvdevMBEmuWakeupHandler(pointer, int, pointer);
void EvdevMBEmuBlockHandler(pointer, struct timeval**, pointer);
void EvdevMBEmuPreInit(InputInfoPtr);
+void EvdevMBEmuFinalize(InputInfoPtr);
void EvdevMBEmuEnable(InputInfoPtr, BOOL);
#endif
commit 08ba40b2532bd61b60c9cf994b21300f596f7ebd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 10 17:35:33 2008 -0400
evdev 1.99.3
diff --git a/configure.ac b/configure.ac
index b2da490..1b2f2fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 1.99.2,
+ 1.99.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit 39dc453691804648f34dbd856bd7e66cfdc59d66
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 10 22:48:01 2008 +0930
Disable middle mouse button emulation when a real middle MB event is detected.
Devices may report middle mouse buttons even if they don't have one (PS/2
devices just don't know any better), so we can't be sure until we see the
event.
diff --git a/man/evdev.man b/man/evdev.man
index b8807f0..f438f78 100644
--- a/man/evdev.man
+++ b/man/evdev.man
@@ -60,8 +60,8 @@ one of \*qPath\*q or \*qDevice\*q must be given.
.BI "Option \*qEmulate3Buttons\*q \*q" boolean \*q
Enable/disable the emulation of the third (middle) mouse button for mice
which only have two physical buttons. The third button is emulated by
-pressing both buttons simultaneously. Default: on, unless the device reports
-the presence of a physical button 3.
+pressing both buttons simultaneously. Default: on, until a middle mouse
+button event is registered.
.TP 7
.BI "Option \*qEmulate3Timeout\*q \*q" integer \*q
Sets the timeout (in milliseconds) that the driver waits before deciding
diff --git a/src/evdev.c b/src/evdev.c
index 27d75dc..05eb760 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -226,6 +226,7 @@ EvdevReadInput(InputInfoPtr pInfo)
xf86PostButtonEvent(pInfo->dev, 0, 3, value, 0, 0);
break;
case BTN_MIDDLE:
+ EvdevMBEmuEnable(pInfo, FALSE);
xf86PostButtonEvent(pInfo->dev, 0, 2, value, 0, 0);
break;
@@ -943,12 +944,6 @@ EvdevProbe(InputInfoPtr pInfo)
has_buttons = TRUE;
}
Reply to: