XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-03-24 09:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop evdev-specific XKB defaults

Browse Source 
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>
This commit is contained in:
Peter Hutterer
2015-02-13 08:12:38 +10:00
parent abc4a8b603
commit 39ef4444a2
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/evdev.c
View File

@@ -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