xfree86: Only use the evdev ruleset on linux.
As suggested by Julien Cristau This is an follow-up to commit9c5dd7337f
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 commit13de7511b1
) Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
cc78f04b22
commit
93e510d3ab
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user