rpms/xorg-x11-drv-keyboard/devel keyboard-1.3.2-terminate.patch, NONE, 1.1 xorg-x11-drv-keyboard.spec, 1.28, 1.29

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14661

Modified Files:
	xorg-x11-drv-keyboard.spec 
Added Files:
	keyboard-1.3.2-terminate.patch 
Log Message:
* Wed Apr 08 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.3.2-3
- keyboard-1.3.2-terminate.patch: dont handle C-A-B zapping in the driver.



keyboard-1.3.2-terminate.patch:

--- NEW FILE keyboard-1.3.2-terminate.patch ---
>From 3515e8edb8eeb8da2850e428b9493f6445c7ad16 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 7 Apr 2009 11:02:44 +1000
Subject: [PATCH] Remote TERMINATE_FALLBACK handling.

Don't let the driver handle C-A-B for zapping, this should be done in xkb.
---
 src/kbd.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/src/kbd.c b/src/kbd.c
index 3560a65..a9526c4 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -679,15 +679,8 @@ PostKbdEvent(InputInfoPtr pInfo, unsigned int scanCode, Bool down)
      }
   }
 
-#ifndef TERMINATE_FALLBACK
-#define TERMINATE_FALLBACK 0
-#endif
 #ifdef XKB
-  if (noXkbExtension
-#if TERMINATE_FALLBACK
-      || specialkey == KEY_BackSpace
-#endif
-     )
+  if (noXkbExtension)
 #endif
   {    
       if (CommonSpecialKey(specialkey, down, keyc->state))
-- 
1.6.0.6



Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-drv-keyboard.spec	26 Feb 2009 10:54:40 -0000	1.28
+++ xorg-x11-drv-keyboard.spec	8 Apr 2009 12:26:28 -0000	1.29
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 keyboard input driver
 Name:	    xorg-x11-drv-keyboard
 Version:    1.3.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -17,6 +17,9 @@
 #Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 
+# special key handling is removed in git, 1.4 won't need this patch
+Patch001:   keyboard-1.3.2-terminate.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -32,6 +35,8 @@
 #%setup -q -n %{tarball}-%{gitdate}
 %setup -q -n %{tarball}-%{version}
 
+%patch001 -p1 -b .terminate
+
 %build
 autoreconf -v --install || exit 1
 %configure --disable-static
@@ -57,6 +62,9 @@
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Wed Apr 08 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.3.2-3
+- keyboard-1.3.2-terminate.patch: dont handle C-A-B zapping in the driver.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild