| 1 |
From 587df9f9958e148a9063a75ea58bb7ad63f055e8 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Colin Guthrie <cguthrie@mandriva.org> |
| 3 |
Date: Thu, 1 Jan 2009 17:36:22 +0000 |
| 4 |
Subject: [PATCH 402/403] RH: xserver-1.5.99.3-ddx-rules v1.1 |
| 5 |
|
| 6 |
--- |
| 7 |
hw/xfree86/common/xf86Config.c | 6 ++++++ |
| 8 |
1 files changed, 6 insertions(+), 0 deletions(-) |
| 9 |
|
| 10 |
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c |
| 11 |
index 40f65bd..88f3dc3 100644 |
| 12 |
--- a/hw/xfree86/common/xf86Config.c |
| 13 |
+++ b/hw/xfree86/common/xf86Config.c |
| 14 |
@@ -985,6 +985,12 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) |
| 15 |
#endif |
| 16 |
XkbSetRulesDflts(&set); |
| 17 |
|
| 18 |
+ /* AEI on? Then we're not using kbd, so use the evdev rules set. */ |
| 19 |
+#ifdef XKB |
| 20 |
+ XkbSetRulesDflts(((xf86Info.allowEmptyInput) ? "evdev" : "base"), |
| 21 |
+ "pc105", "us", NULL, NULL); |
| 22 |
+#endif |
| 23 |
+ |
| 24 |
xf86Info.useDefaultFontPath = TRUE; |
| 25 |
xf86Info.useDefaultFontPathFrom = X_DEFAULT; |
| 26 |
if (xf86GetOptValBool(FlagOptions, FLAG_USE_DEFAULT_FONT_PATH, &value)) { |
| 27 |
-- |
| 28 |
1.6.4.4 |
| 29 |
|
Parent Directory
| 
Revision Log