xserver-xorg-input-evdev: Changes to 'upstream-unstable'
.gitignore | 26 ++++++++++++++++++++++++++
ChangeLog | 47 -----------------------------------------------
Makefile.am | 12 ++++++++++++
configure.ac | 2 +-
src/evdev.c | 22 ++++++++++++++++------
5 files changed, 55 insertions(+), 54 deletions(-)
New commits:
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: