xserver-xorg-input-evdev: Changes to 'debian-experimental'
config.h.in | 66 -------------------------------------------------------
configure.ac | 2 -
debian/changelog | 7 +++++
debian/rules | 2 -
src/evdev.c | 12 +++++++++-
5 files changed, 20 insertions(+), 69 deletions(-)
New commits:
commit dd74edd87a5f7925b2dc19b44b60c8f5aea68b5d
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 14:53:34 2008 +0300
Update changelog.
diff --git a/debian/changelog b/debian/changelog
index 3ae0e6d..9f56a3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-input-evdev (1:2.0.3-3) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.4-1) UNRELEASED; urgency=low
+ * New upstream release.
* rules: Clean config.h.in.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Fri, 12 Sep 2008 14:47:02 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Fri, 12 Sep 2008 14:52:54 +0300
xserver-xorg-input-evdev (1:2.0.3-2) experimental; urgency=low
commit caa7b61b9004573ca3825d0b26cc0808e53736fe
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 14:47:46 2008 +0300
rules: Clean config.h.in.
diff --git a/debian/changelog b/debian/changelog
index e13ac38..3ae0e6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.0.3-3) UNRELEASED; urgency=low
+
+ * rules: Clean config.h.in.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Fri, 12 Sep 2008 14:47:02 +0300
+
xserver-xorg-input-evdev (1:2.0.3-2) experimental; urgency=low
* Build against xserver 1.5 rc6.
diff --git a/debian/rules b/debian/rules
index 9c3f84a..ff63d05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ clean: xsfclean
rm -rf obj-*
rm -f $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
- rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap mkinstalldirs
+ rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap mkinstalldirs config.h.in
dh_clean
commit 47b9c64055852d56a06193e8e0e6bbccb755752b
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 14:43:56 2008 +0300
delete autogenerated config.h.in
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index a6aea89..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,66 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-#include "xorg-server.h"
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Major version of this package */
-#undef PACKAGE_VERSION_MAJOR
-
-/* Minor version of this package */
-#undef PACKAGE_VERSION_MINOR
-
-/* Patch version of this package */
-#undef PACKAGE_VERSION_PATCHLEVEL
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
commit ed1382866c54ffa34e3d0352ad65414650497f78
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 14 23:17:16 2008 +0930
evdev 2.0.4
diff --git a/configure.ac b/configure.ac
index 251c431..a04f694 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 2.0.3,
+ 2.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit 8fe38b228702bddebe26a6d2c5c170a2a91d6ebc
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 7 09:21:26 2008 +0930
Print a warning if a keycode exceeds the range accepted by the server.
Keycodes over 255 are silently ignored in the server. The least we can do is
put a warning in the logs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit c1f7f8c3d22ecae7839f82ea8b584069f54f1f5e)
diff --git a/src/evdev.c b/src/evdev.c
index 164346a..a857db3 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -131,6 +131,9 @@ PostButtonClicks(InputInfoPtr pInfo, int button, int count)
static void
PostKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value)
{
+ int code = ev->code + MIN_KEYCODE;
+ static char warned[KEY_MAX];
+
/* filter repeat events for chording keys */
if (value == 2 &&
(ev->code == KEY_LEFTCTRL || ev->code == KEY_RIGHTCTRL ||
@@ -141,7 +144,14 @@ PostKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value)
ev->code == KEY_SCROLLLOCK)) /* XXX windows keys? */
return;
- xf86PostKeyboardEvent(pInfo->dev, ev->code + MIN_KEYCODE, value);
+ if (code > 255 && ev->code < KEY_MAX) {
+ if (!warned[ev->code])
+ xf86Msg(X_WARNING, "%s: unable to handle keycode %d\n",
+ pInfo->name, ev->code);
+ warned[ev->code] = 1;
+ }
+
+ xf86PostKeyboardEvent(pInfo->dev, code, value);
}
static void
Reply to: