diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-12-03 14:24:25 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-12-03 16:10:40 +1000 |
| commit | 9c5dd7337fa93fb1650cc017e523b939dcbf482a (patch) | |
| tree | 82687e11b23e3354fee5560c430d6237b35417f1 /hw | |
| parent | 463e02e7de5da3e582a3a049110a476713c7210e (diff) | |
Let the DDX decide on the XkbRulesDefaults.
Rather than assuming rules in the CoreKeyboardProc, init the default rules in
InitCoreDevices, then re-use them later.
In the xfree86 DDX, set the rules to "base" or "evdev", depending on whether
we'll load kbd or evdev.
If we create a new MD, use pc105,us as default and re-use the rules file used
previously.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 1210a8fcc..9bf18b555 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1008,6 +1008,12 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices); xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput); + /* 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); +#endif + xf86Info.useDefaultFontPath = TRUE; xf86Info.useDefaultFontPathFrom = X_DEFAULT; if (xf86GetOptValBool(FlagOptions, FLAG_USE_DEFAULT_FONT_PATH, &value)) { |