Add xproto patches from upstream adding XF86Keyboard and XF86RFKill keysyms
This commit is contained in:
Hans de Goede
parent
1e02980db9
commit
cc4dd71c59
@ -7,7 +7,7 @@
|
||||
Summary: X.Org X11 Protocol headers
|
||||
Name: xorg-x11-proto-devel
|
||||
Version: 7.7
|
||||
Release: 21%{?dist}
|
||||
Release: 22%{?dist}
|
||||
License: MIT
|
||||
Group: Development/System
|
||||
URL: http://www.x.org
|
||||
@ -46,6 +46,8 @@ Source30: http://xorg.freedesktop.org/archive/individual/proto/xproxymanagementp
|
||||
Source40: make-git-snapshot.sh
|
||||
|
||||
Patch1: presentproto-0001-Force-Window-and-Pixmap-to-be-CARD32-on-the-wire.patch
|
||||
# Already upstream can be dropped at the next xproto release rebase
|
||||
Patch2: xproto-extra-XF86keysyms.patch
|
||||
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-util-macros >= 1.0.2-1
|
||||
@ -67,6 +69,9 @@ X.Org X11 Protocol headers
|
||||
pushd presentproto-*
|
||||
%patch1 -p1
|
||||
popd
|
||||
pushd xproto-*
|
||||
%patch2 -p1
|
||||
popd
|
||||
|
||||
%build
|
||||
|
||||
@ -281,6 +286,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
|
||||
%{_datadir}/pkgconfig/xproxymngproto.pc
|
||||
|
||||
%changelog
|
||||
* Fri May 12 2017 Hans de Goede <hdegoede@redhat.com> - 7.7-22
|
||||
- Add xproto patches from upstream adding XF86Keyboard and XF86RFKill keysyms
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
||||
107
xproto-extra-XF86keysyms.patch
Normal file
107
xproto-extra-XF86keysyms.patch
Normal file
@ -0,0 +1,107 @@
|
||||
From 9019240a9a5c869875ff6c5c28e6fca75fa90580 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Kellner <christian@kellner.me>
|
||||
Date: Wed, 19 Apr 2017 15:26:41 +0200
|
||||
Subject: [PATCH xproto v2 1/3] Add XF86XK_Keyboard
|
||||
|
||||
The 2017 Thinkpad models have a new hotkey with a keyboard symbols
|
||||
on it, which is mapped to KEY_KEYBOARD in the kernel.
|
||||
|
||||
Signed-off-by: Christian Kellner <christian@kellner.me>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
XF86keysym.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/XF86keysym.h b/XF86keysym.h
|
||||
index 8b5646e..89d40b8 100644
|
||||
--- a/XF86keysym.h
|
||||
+++ b/XF86keysym.h
|
||||
@@ -197,6 +197,8 @@
|
||||
|
||||
#define XF86XK_AudioMicMute 0x1008FFB2 /* Mute the Mic from the system */
|
||||
|
||||
+#define XF86XK_Keyboard 0x1008FFB3 /* User defined keyboard related action */
|
||||
+
|
||||
/* Keys for special action keys (hot keys) */
|
||||
/* Virtual terminals on some operating systems */
|
||||
#define XF86XK_Switch_VT_1 0x1008FE01
|
||||
--
|
||||
2.12.2
|
||||
|
||||
From 98a32d328e7195e12c38baa877917335bceffbaf Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Wed, 10 May 2017 15:26:45 +0200
|
||||
Subject: [PATCH xproto v2 2/3] Add XF86XK_WWAN and XF86XK_RFKill
|
||||
|
||||
Add Keysyms corresponding to the evdev WWAN and RFKILL keys, we already
|
||||
have Keysyms for WLAN and UWB from linux/input-event-codes.h:
|
||||
|
||||
#define KEY_WLAN 238
|
||||
#define KEY_UWB 239
|
||||
|
||||
But not for the WWAN and generic RFKILL keys:
|
||||
|
||||
#define KEY_WWAN 246 /* Wireless WAN (LTE, UMTS, GSM, etc.) */
|
||||
#define KEY_WIMAX KEY_WWAN
|
||||
#define KEY_RFKILL 247 /* Key that controls all radios */
|
||||
|
||||
This commits add Keysyms for these so that we can add proper mappings for
|
||||
them to xkb.
|
||||
|
||||
Cc: Bastien Nocera <bnocera@redhat.com>
|
||||
Cc: Benjamin Berg <bberg@redhat.com>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
XF86keysym.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/XF86keysym.h b/XF86keysym.h
|
||||
index 89d40b8..8576358 100644
|
||||
--- a/XF86keysym.h
|
||||
+++ b/XF86keysym.h
|
||||
@@ -199,6 +199,9 @@
|
||||
|
||||
#define XF86XK_Keyboard 0x1008FFB3 /* User defined keyboard related action */
|
||||
|
||||
+#define XF86XK_WWAN 0x1008FFB4 /* Toggle WWAN (LTE, UMTS, etc.) radio */
|
||||
+#define XF86XK_RFKill 0x1008FFB5 /* Toggle radios on/off */
|
||||
+
|
||||
/* Keys for special action keys (hot keys) */
|
||||
/* Virtual terminals on some operating systems */
|
||||
#define XF86XK_Switch_VT_1 0x1008FE01
|
||||
--
|
||||
2.12.2
|
||||
|
||||
From ab8666661fc68f075b8d6ffabe22c6b577c30ac1 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Wed, 10 May 2017 15:39:12 +0200
|
||||
Subject: [PATCH xproto v2 3/3] Add XF86XK_AudioPreset
|
||||
|
||||
Add XF86XK_AudioPreset keysym, to be used as mapping for evdev's
|
||||
KEY_SOUND keycode which is generated on some devices by a button which
|
||||
on windows selects equalizer presets switching between settings such as
|
||||
e.g. theatre-mode / game-mode / voice-mode.
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
XF86keysym.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/XF86keysym.h b/XF86keysym.h
|
||||
index 8576358..c0d12c1 100644
|
||||
--- a/XF86keysym.h
|
||||
+++ b/XF86keysym.h
|
||||
@@ -202,6 +202,8 @@
|
||||
#define XF86XK_WWAN 0x1008FFB4 /* Toggle WWAN (LTE, UMTS, etc.) radio */
|
||||
#define XF86XK_RFKill 0x1008FFB5 /* Toggle radios on/off */
|
||||
|
||||
+#define XF86XK_AudioPreset 0x1008FFB6 /* Select equalizer preset, e.g. theatre-mode */
|
||||
+
|
||||
/* Keys for special action keys (hot keys) */
|
||||
/* Virtual terminals on some operating systems */
|
||||
#define XF86XK_Switch_VT_1 0x1008FE01
|
||||
--
|
||||
2.12.2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user