rpms/xorg-x11-drv-evdev
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop evdev-specific XKB settings, let the server chose defaults

Browse Source
This commit is contained in:
Peter Hutterer 2015-02-23 15:26:43 +10:00
parent 1e6c236361
commit d329671e02
2 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
0001-Drop-evdev-specific-XKB-defaults.patch Normal file
View File

@ -0,0 +1,76 @@
From 39ef4444a231d3b0296ba421b78f0417f18955f9 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 13 Feb 2015 08:12:38 +1000
Subject: [PATCH evdev] Drop evdev-specific XKB defaults
Just use the server defaults instead. This has very little effect, on most
systems there was some sort of default configuration applied anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
src/evdev.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/evdev.c b/src/evdev.c
index 5cbce35..9c1a4d3 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -90,13 +90,6 @@
#define XI86_SERVER_FD 0x20
#endif
-static const char *evdevDefaults[] = {
- "XkbRules", "evdev",
- "XkbModel", "pc104", /* the right model for 'us' */
- "XkbLayout", "us",
- NULL
-};
-
/* Any of those triggers a proximity event */
static int proximity_bits[] = {
BTN_TOOL_PEN,
@@ -1161,23 +1154,27 @@ static int
EvdevAddKeyClass(DeviceIntPtr device)
{
int rc = Success;
- XkbRMLVOSet rmlvo = {0};
+ XkbRMLVOSet rmlvo = {0},
+ defaults;
InputInfoPtr pInfo;
pInfo = device->public.devicePrivate;
+ XkbGetRulesDflts(&defaults);
+
/* sorry, no rules change allowed for you */
xf86ReplaceStrOption(pInfo->options, "xkb_rules", "evdev");
rmlvo.rules = xf86SetStrOption(pInfo->options, "xkb_rules", NULL);
- rmlvo.model = xf86SetStrOption(pInfo->options, "xkb_model", NULL);
- rmlvo.layout = xf86SetStrOption(pInfo->options, "xkb_layout", NULL);
- rmlvo.variant = xf86SetStrOption(pInfo->options, "xkb_variant", NULL);
- rmlvo.options = xf86SetStrOption(pInfo->options, "xkb_options", NULL);
+ rmlvo.model = xf86SetStrOption(pInfo->options, "xkb_model", defaults.model);
+ rmlvo.layout = xf86SetStrOption(pInfo->options, "xkb_layout", defaults.layout);
+ rmlvo.variant = xf86SetStrOption(pInfo->options, "xkb_variant", defaults.variant);
+ rmlvo.options = xf86SetStrOption(pInfo->options, "xkb_options", defaults.options);
if (!InitKeyboardDeviceStruct(device, &rmlvo, NULL, EvdevKbdCtrl))
rc = !Success;
XkbFreeRMLVOSet(&rmlvo, FALSE);
+ XkbFreeRMLVOSet(&defaults, FALSE);
return rc;
}
@@ -2692,7 +2689,7 @@ _X_EXPORT InputDriverRec EVDEV = {
EvdevPreInit,
EvdevUnInit,
NULL,
- evdevDefaults,
+ NULL,
#ifdef XI86_DRV_CAP_SERVER_FD
XI86_DRV_CAP_SERVER_FD
#endif
--
2.1.0

8
xorg-x11-drv-evdev.spec
View File

@ -8,7 +8,7 @@
Summary: Xorg X11 evdev input driver
Name: xorg-x11-drv-evdev
Version: 2.9.1
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@ -21,6 +21,8 @@ Source2: commitid
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
%endif
Patch01: 0001-Drop-evdev-specific-XKB-defaults.patch
ExcludeArch: s390 s390x
BuildRequires: autoconf automake libtool
@ -41,6 +43,7 @@ X.Org X11 evdev input driver.
%prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch01 -p1
%build
autoreconf --force -v --install || exit 1
@ -76,6 +79,9 @@ X.Org X11 evdev input driver development files.
%changelog
* Mon Feb 23 2015 Peter Hutterer <peter.hutterer@redhat.com> 2.9.1-2
- Drop evdev-specific XKB settings, let the server chose defaults
* Wed Nov 26 2014 Peter Hutterer <peter.hutterer@redhat.com> 2.9.1-1
- evdev 2.9.1