fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-04-28 18:10:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfree86: Only use the evdev ruleset on linux.

Browse source 
As suggested by Julien Cristau

This is an follow-up to
commit 9c5dd7337f
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date:   Wed Dec 3 14:24:25 2008 +1000

    Let the DDX decide on the XkbRulesDefaults.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Acked-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit 13de7511b1)

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2008-12-04 10:30:02 +10:00 • committed by Keith Packard
parent cc78f04b22
commit 93e510d3ab
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hw/xfree86/common/xf86Config.c
View file

@ -855,6 +855,9 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
Bool value;
MessageType from;
const char *s;
#ifdef XKB
char *rules = "base";
#endif
/*
* Merge the ServerLayout and ServerFlags options. The former have
@ -1034,8 +1037,11 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
/* AEI on? Then we're not using kbd, so use the evdev rules set. */
#ifdef XKB
XkbSetRulesDflts(((xf86Info.allowEmptyInput) ? "evdev" : "base"),
"pc105", "us", NULL, NULL);
#if defined(linux)
if (xf86Info.allowEmptyInput)
rules = "evdev";
#endif
XkbSetRulesDflts(rules, "pc105", "us", NULL, NULL);
#endif
xf86Info.useDefaultFontPath = TRUE;