[xorg-x11-proto-devel/f14/master] - Add XF86XK_TouchpadOn/Off keysyms

[Bastien Nocera]

commit fc1e0babf8023d115cb8d99e487caff62b82bd38
Author: Bastien Nocera <hadess at hadess.net>
Date:   Thu Nov 25 16:34:45 2010 +0000

    - Add XF86XK_TouchpadOn/Off keysyms

 0001-Add-XF86XK_TouchpadOn-Off.patch |   32 ++++++++++++++++++++++++++++++++
 xorg-x11-proto-devel.spec            |   10 +++++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-Add-XF86XK_TouchpadOn-Off.patch b/0001-Add-XF86XK_TouchpadOn-Off.patch
new file mode 100644
index 0000000..b2517b6
--- /dev/null
+++ b/0001-Add-XF86XK_TouchpadOn-Off.patch
@@ -0,0 +1,32 @@
+From 5d3428de974d15357b0ad407f4c5222cfaa8f9f3 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 8 Nov 2010 15:24:55 +1000
+Subject: [PATCH] Add XF86XK_TouchpadOn/Off
+
+Those keysyms will be used to report events from the hardware. Hardware
+like the HP laptops emit 2 separate keycodes when the touchpad is enabled
+or disabled. So we can catch those in user-space and display a popup.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=31300
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ XF86keysym.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/XF86keysym.h b/XF86keysym.h
+index 200f5c1..fd3af4f 100644
+--- a/XF86keysym.h
++++ b/XF86keysym.h
+@@ -207,6 +207,8 @@
+ #define XF86XK_Suspend		0x1008FFA7   /* Sleep to RAM                */
+ #define XF86XK_Hibernate	0x1008FFA8   /* Sleep to disk               */
+ #define XF86XK_TouchpadToggle	0x1008FFA9   /* Toggle between touchpad/trackstick */
++#define XF86XK_TouchpadOn	0x1008FFB0   /* The touchpad got switched on */
++#define XF86XK_TouchpadOff	0x1008FFB1   /* The touchpad got switched off */
+ 
+ /* Keys for special action keys (hot keys) */
+ /* Virtual terminals on some operating systems */
+-- 
+1.7.3.2
+
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 88084e1..90d4e66 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -43,6 +43,7 @@ Source29: http://www.x.org/pub/individual/proto/xproto-7.0.17.tar.bz2
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
 
 Patch0: glproto-1.4.11-hyperpipe.patch
+Patch1: 0001-Add-XF86XK_TouchpadOn-Off.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
@@ -62,6 +63,10 @@ X.Org X11 Protocol headers
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31
 %patch0 -p0
 
+pushd xproto-*
+%patch1 -p1 -b .xf86touchpad
+popd
+
 %build
 
 # Proceed through each proto package directory, building them all
@@ -264,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Nov 25 2010 Bastien Nocera <bnocera at redhat.com> 7.4-39
+- Add XF86XK_TouchpadOn/Off keysyms
+
 * Wed Aug 04 2010 Adam Jackson <ajax at redhat.com> 7.4-38
 - glproto-1.4.11-hyperpipe.patch: Fix conflict with glxext.h