Fix autorepeat for <=xorg-server-1.5.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 92 insertions, 5 deletions

diff --git a/x11-drivers/xf86-input-evdev/ChangeLog b/x11-drivers/xf86-input-evdev/ChangeLog
index e169bc5cceab..e514791ec0dd 100644
--- a/x11-drivers/xf86-input-evdev/ChangeLog
+++ b/x11-drivers/xf86-input-evdev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-evdev
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.96 2009/03/09 23:00:24 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.97 2009/03/10 17:09:08 dberkholz Exp $
+
+*xf86-input-evdev-2.2.0-r1 (10 Mar 2009)
+
+  10 Mar 2009; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/2.2.0-Restore-repeat-filtering-for-server-1.5-and-earlier.patch,
+  +xf86-input-evdev-2.2.0-r1.ebuild:
+  Fix autorepeat for <=xorg-server-1.5.
 
 *xf86-input-evdev-2.2.0 (09 Mar 2009)
 
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index a96664885b09..1089fb7dd97c 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -8,6 +8,7 @@ AUX 1.99.2/0002-Check-for-XINPUT-ABI-parameters-of-InitValuatorClas.patch 1360 R
 AUX 1.99.2/0003-Revert-Check-for-XINPUT-ABI-parameters-of-InitValu.patch 1560 RMD160 8c84ffded3528aa8b4bc6adfa55be66031d48dd9 SHA1 333c0ffbdf9f285d181c3e7ac441cfae2a62006a SHA256 072563e5988970ce69ab6b51891364d8ce13008ab7347ab9de4081dd9b9b496f
 AUX 1.99.2/0004-Check-for-XINPUT-ABI-3-corrected-version.patch 1403 RMD160 c127f5a55e7bd5ec204510b3fa7919a44552b68b SHA1 3d9079586ef579348f8418e6115bd83cc851b3f6 SHA256 557fe159843393d91d56d41308f7556e566f26284c847f469829d62de81f586e
 AUX 1.99.2/0005-evdev-Port-b4a5a204-Fix-pointer-crossing-screen-bu.patch 1249 RMD160 103a5a78688b3f4754ef14d90e85d40778249c6a SHA1 56b7cf3f8053fe25dc73f3b89663a24f607235cd SHA256 503a3555f8d3db44ce7cc5f2550dd3c3f01e4c5bbc06184ab97521c8285e0e8b
+AUX 2.2.0-Restore-repeat-filtering-for-server-1.5-and-earlier.patch 1534 RMD160 ec88db7f0ac21366207ba58784b2abdf1400ce92 SHA1 3f51f36f9fcd32bb1e471b0b5a743363ace7f9d2 SHA256 533ad215deaa9744fa6407933e9d200c130d01ebe5d4c9f3778a71b17591eb41
 DIST xf86-input-evdev-1.1.5.tar.bz2 242307 RMD160 13292abea84654828af720c720988a3f6c7f9ac8 SHA1 70650b58c69afdd0ef22e6c647944fc6b5b12e0f SHA256 52b7daab86dade2d189f0378ddf196c018cdc9dd47ade0b3b8fc7591cb4bbe9e
 DIST xf86-input-evdev-1.2.0.tar.bz2 259428 RMD160 f5c414d9154a3d130fecf183e71e2b75a476dd02 SHA1 c1ff9c377978158790b5522735743b09090ad8f5 SHA256 b23b231d754cab717a4b145ee3a5f3e73db46d877d23502326e9794d92d976ba
 DIST xf86-input-evdev-1.99.2.tar.bz2 241747 RMD160 7878417e4e2988de92b1322f153202c2978c9d1f SHA1 04edb8dc741bc4b5be4a6eef4f723c61869a6beb SHA256 79bf0df91eba04aabae762ca5da3b47e571b04e715bced03035b1d0dd0ad3933
@@ -38,13 +39,14 @@ EBUILD xf86-input-evdev-2.1.0.ebuild 1086 RMD160 d3df03868389bdc47ca224fc7755f66
 EBUILD xf86-input-evdev-2.1.1.ebuild 1086 RMD160 934f1751cf646df3c7a95bad1256dd9d9cece695 SHA1 4ddf3c4468a345fda825faf8ccb02e0c79f4e9f6 SHA256 a6de7f9d5faf9a4b82a4319bc9a5a92283a2fde3cc26b870deb7f35ad9fac613
 EBUILD xf86-input-evdev-2.1.2.ebuild 1081 RMD160 62fc117f7eecc6ed1b1094c225d79efcf5f8364f SHA1 9e09402a34a6bbedff0d90858862b1d6f475dc73 SHA256 87c5d19855c97c23d893f1ad558c7a72503e35cd3e3b42e49c7b9c3a7c5965bb
 EBUILD xf86-input-evdev-2.1.3.ebuild 1086 RMD160 0f9326482d720433eefed6b603f1b205be3a5274 SHA1 d1f9378e78a8d6cc21158ee56ca8043626990b7b SHA256 45a811e45775da2745db7eb7c15c78d5a78953201911ed3b3b55256145cb0eee
+EBUILD xf86-input-evdev-2.2.0-r1.ebuild 1176 RMD160 6654224b3ace8c51a5b9ddc261e278987498a001 SHA1 023fd8b584909c32c6dad7c11e398d2d0af5dbcf SHA256 c75b69d3c039ee0f7846ef8f2f69d02fdf841591d388ce8553601f5ca5eb1c1f
 EBUILD xf86-input-evdev-2.2.0.ebuild 1086 RMD160 22ef4a41aa43a04f7de87eec4fccbf116830331e SHA1 1e79635ac2ffca6ecdec7a8011b40aa6faf0443a SHA256 e814787a9e5de7e865c01102ab3820079664d003ac4c79ea558a51a51adda9d6
-MISC ChangeLog 15492 RMD160 ac971afa7513d9d78c01b9566777e9a497e767e0 SHA1 5a1c6664ff1a61c69a11d2945023cee79415d204 SHA256 6283096fde2aeda42495dcf8d9c8203a578214850754e3bb72cc51414e1cee06
+MISC ChangeLog 15741 RMD160 fdbaf0e798d9a42558d7d365aff37b3350baa5d4 SHA1 b3abfe30f9460c5fc67bdcf1d13ee960d0eef04c SHA256 908a46c0415ae4555c9dd67384b846c6132caa7a07b8bb0dc27351f1cecea085
 MISC metadata.xml 254 RMD160 4c78a3f1774bde4ae8506ab4619cd8b3f4ae2dde SHA1 3a5ad14cd125c6473ac6784ff8b64106d2d3f9b2 SHA256 b579362a5f108a6f8ba3ea99fcba0b7fa4fa91838428fba80e8c66ef12530cc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm1n44ACgkQXVaO67S1rtvi9QCg1kfVcYioywi63pdBPzfL17DQ
-SsgAn0KtyeHlvyNyrJjlz9k3OWr5x884
-=mZiS
+iEYEARECAAYFAkm2nroACgkQXVaO67S1rtvDXgCgnzMU5ria997ZDeVWqZxRg0T9
+h4IAn3AxNCVRe4g21DEJ4mmiseFOzX77
+=zqon
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-evdev/files/2.2.0-Restore-repeat-filtering-for-server-1.5-and-earlier.patch b/x11-drivers/xf86-input-evdev/files/2.2.0-Restore-repeat-filtering-for-server-1.5-and-earlier.patch
new file mode 100644
index 000000000000..01217bfb7d6e
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/files/2.2.0-Restore-repeat-filtering-for-server-1.5-and-earlier.patch
@@ -0,0 +1,42 @@
+From 7cdb200dbef87d10a455cc4fdc6d29bf3aacc1d8 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 10 Mar 2009 15:17:53 +1000
+Subject: [PATCH] Restore repeat-filtering for server 1.5 and earlier.
+
+Letting the server deal with key repeats is fine if we have server 1.6. For
+earlier servers, we need to pass on the repeat events (except for modifier
+keys).
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Tested-by: Marty Jack <martyj19@comcast.net>
+---
+ src/evdev.c |   13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/evdev.c b/src/evdev.c
+index 04bce96..bc29ac9 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -263,8 +263,17 @@ PostKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value)
+     static char warned[KEY_CNT];
+ 
+     /* Filter all repeated events from device.
+-       We'll do softrepeat in the server */
+-    if (value == 2)
++       We'll do softrepeat in the server, but only since 1.6 */
++    if (value == 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) <= 2
++        && (ev->code == KEY_LEFTCTRL || ev->code == KEY_RIGHTCTRL ||
++            ev->code == KEY_LEFTSHIFT || ev->code == KEY_RIGHTSHIFT ||
++            ev->code == KEY_LEFTALT || ev->code == KEY_RIGHTALT ||
++            ev->code == KEY_LEFTMETA || ev->code == KEY_RIGHTMETA ||
++            ev->code == KEY_CAPSLOCK || ev->code == KEY_NUMLOCK ||
++            ev->code == KEY_SCROLLLOCK) /* XXX windows keys? */
++#endif
++            )
+ 	return;
+ 
+     if (code > 255)
+-- 
+1.6.1.3
+
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.0-r1.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..88c084d1c79a
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.2.0-r1.ebuild,v 1.1 2009/03/10 17:09:08 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Generic Linux input driver"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="hal"
+RDEPEND=">=x11-base/xorg-server-1.5.3
+	hal? ( >=sys-apps/hal-0.5.10 )"
+DEPEND="${RDEPEND}
+	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
+	>=x11-proto/inputproto-1.4
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES="${FILESDIR}/${PV}-Restore-repeat-filtering-for-server-1.5-and-earlier.patch"
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+	pkg_info
+}
+
+pkg_info() {
+	if use hal; then
+		elog "If your XKB (keyboard settings) stopped working,"
+		elog "you may uninstall this driver or move your XKB configuration."
+		elog "Download an example from http://dev.gentoo.org/~compnerd/temp/hal-config-examples/"
+		elog "(these will be installed with sys-apps/hal soon),"
+		elog "and drop it into /etc/hal/fdi/policy/"
+	fi
+}