xserver-xorg-input-evdev: Changes to 'debian-unstable'
.gitignore | 26 ++++++++++++++++++++++++++
ChangeLog | 43 +++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 12 ++++++++++++
Makefile.in | 40 +++++++++++++++++++++++++++-------------
configure | 20 ++++++++++----------
configure.ac | 2 +-
debian/changelog | 7 +++++++
src/evdev.c | 22 ++++++++++++++++------
8 files changed, 142 insertions(+), 30 deletions(-)
New commits:
commit cbb612173b074e7dcf13f77498c9d9ea3a271cbb
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jul 18 22:21:30 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 3dffb84..b7199e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-evdev (1:2.0.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.2-1) unstable; urgency=low
* New upstream release
+ fixes mice with lots of buttons (Closes: #491061)
- -- Julien Cristau <jcristau@debian.org> Fri, 18 Jul 2008 22:00:06 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 18 Jul 2008 22:21:17 +0200
xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low
commit 164dc67a23e5197566a63a85b4e2d238cd5e3a0a
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jul 18 22:15:09 2008 +0200
update changelog
diff --git a/debian/changelog b/debian/changelog
index 5ba992c..3dffb84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.0.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + fixes mice with lots of buttons (Closes: #491061)
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 18 Jul 2008 22:00:06 +0200
+
xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low
[ Julien Cristau, Timo Aaltonen ]
commit 788172f9215fe10fdf80c4cafdd21a0a6680d3db
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jul 18 22:00:00 2008 +0200
autoreconf
diff --git a/Makefile.in b/Makefile.in
index 3199d0a..5d47b13 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -218,6 +218,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+EXTRA_DIST = ChangeLog autogen.sh
+MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -457,6 +459,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -589,6 +594,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@@ -653,19 +659,27 @@ uninstall-am:
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am
-
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am
+
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
+ (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/configure b/configure
index 2e5c368..4580e5f 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 2.0.1.
+# Generated by GNU Autoconf 2.61 for xf86-input-evdev 2.0.2.
#
# 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='2.0.1'
-PACKAGE_STRING='xf86-input-evdev 2.0.1'
+PACKAGE_VERSION='2.0.2'
+PACKAGE_STRING='xf86-input-evdev 2.0.2'
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 2.0.1 to adapt to many kinds of systems.
+\`configure' configures xf86-input-evdev 2.0.2 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 2.0.1:";;
+ short | recursive ) echo "Configuration of xf86-input-evdev 2.0.2:";;
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 2.0.1
+xf86-input-evdev configure 2.0.2
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 2.0.1, which was
+It was created by xf86-input-evdev $as_me 2.0.2, 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='2.0.1'
+ VERSION='2.0.2'
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 2.0.1, which was
+This file was extended by xf86-input-evdev $as_me 2.0.2, 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 2.0.1
+xf86-input-evdev config.status 2.0.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
commit f135e074629c7cba01bbe9ff6bce77883c22bb29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 14 13:34:36 2008 +0930
evdev 2.0.2
diff --git a/configure.ac b/configure.ac
index f7db989..c9a58c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 2.0.1,
+ 2.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit e926356eb0dfd218e88d47d8ed1e3ccfb2f1c85a
Author: Peter Hutterer <whot@possum.(none)>
Date: Mon Jul 14 13:06:32 2008 +0930
Don't enable the device if the grab failed with ENODEV.
After suspend/resume, sometimes the device doesn't come back up on the same
node. Since we do not call PreInit for the device (which would detect this
situation), we continue to try to read a nonexisting file, spamming the log
file with "Read Error".
(cherry picked from commit bf0d81011e19a8bb5bbd80c6b496c8ae257b4f2c)
diff --git a/src/evdev.c b/src/evdev.c
index da6fa3b..471bb51 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -841,12 +841,15 @@ EvdevProc(DeviceIntPtr device, int what)
if (!pEvdev->kernel24 && ioctl(pInfo->fd, EVIOCGRAB, (void *)1))
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;
+ if (errno != ENODEV)
+ {
+ xf86AddEnabledDevice(pInfo);
+ if (pEvdev->flags & EVDEV_BUTTON_EVENTS)
+ EvdevMBEmuPreInit(pInfo);
+ device->public.on = TRUE;
+ }
break;
-
+
case DEVICE_OFF:
if (!pEvdev->kernel24 && ioctl(pInfo->fd, EVIOCGRAB, (void *)0))
xf86Msg(X_WARNING, "%s: Release failed (%s)\n", pInfo->name,
commit bd56ab3d72c7baafd2ecd27cdadcef333fb39262
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 19:32:22 2008 +0930
Add .gitignore file.
(cherry picked from commit ef4bb69c1a64e784fef1c758ee439372ba329b0a)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38eebd9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+*.patch
+ChangeLog
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+man/evdev.4
+missing
+.deps
+.libs
+*.lo
+*.la
+stamp-h1
+*.bz2
+*.gz
commit 2b30413598663b75acff0cafb21c2e3d8a727c9a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 3 15:01:32 2008 +0930
Remove static ChangeLog, autogenerate as part of make dist.
Hook taken from xserver's Makefile.am
(cherry picked from commit ec23c6b2f550f2679226da907c1d022295d453f1)
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 2c448ae..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,47 +0,0 @@
-2006-01-09 David Nusinow,,, <set EMAIL_ADDRESS environment variable>
-
- * man/Makefile.am:
- * man/evdev.man:
- Bugzilla #968 <https://bugs.freedesktop.org/show_bug.cgi?id=968>
- Patch #4301 <https://bugs.freedesktop.org/attachment.cgi?id=4301>
- Add evdev manpage
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..11064e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,15 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+
+EXTRA_DIST = ChangeLog autogen.sh
+
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
+ (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
commit 52fc8ee84656728a82073eae16da9e878cc3b39f
Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
Date: Thu Jun 26 14:36:58 2008 -0300
Mice with a lot of buttons (e.g. Logitech MX1000) generate button events greater than BTN_TASK.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
(cherry picked from commit 0830676a0ce3618eae9cf4c072998c16e164c687)
diff --git a/src/evdev.c b/src/evdev.c
index 0078881..da6fa3b 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -252,8 +252,15 @@ EvdevReadInput(InputInfoPtr pInfo)
break;
default:
- if (ev.code > BTN_TASK && ev.code < KEY_OK)
+ if (ev.code > BTN_TASK && ev.code < KEY_OK) {
+ /* Some fancy mice with a lot of buttons generate
+ * button events between BTN_TASK and BTN_JOYSTICK */
+ if (ev.code < BTN_JOYSTICK)
+ xf86PostButtonEvent(pInfo->dev, 0,
+ ev.code - BTN_LEFT + 5,
+ value, 0, 0);
break;
+ }
PostKbdEvent(pInfo, &ev, value);
break;
Reply to: