summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-12-04 00:30:02 (GMT)
committerPeter Hutterer <peter.hutterer@who-t.net>2008-12-08 02:05:48 (GMT)
commit13de7511b17b57a28668e1a60b196ccfe61dbcbe (patch)
treef303b78f8b668470905314d608350b63de86fc6f
parent8e3279134987a45f2a89c963ef2d33bc3d3c8179 (diff)
xfree86: Only use the evdev ruleset on linux.
As suggested by Julien Cristau This is an follow-up to commit 9c5dd7337fa93fb1650cc017e523b939dcbf482a 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>
-rw-r--r--hw/xfree86/common/xf86Config.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index a03d977..48d8efd 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -846,6 +846,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
@@ -1010,8 +1013,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;