From d5c354f723e3f71901e55a15c54a4ba334ff27a0 Mon Sep 17 00:00:00 2001 From: Alexander Kerner Date: Fri, 8 Apr 2011 00:28:48 +0200 Subject: [PATCH] Revert "xkb: if the keymap failed to compile, load the default keymap instead." This reverts commit d3499556d8d83396fa2585bd00371a81e086be36. --- xkb/ddxLoad.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 22fcdf7a2..34df88c4d 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -512,34 +512,13 @@ XkbDescPtr XkbCompileKeymap(DeviceIntPtr dev, XkbRMLVOSet *rmlvo) { XkbDescPtr xkb; - unsigned int need; if (!dev || !rmlvo) { LogMessage(X_ERROR, "XKB: No device or RMLVO specified\n"); return NULL; } - /* These are the components we really really need */ - need = XkmSymbolsMask | XkmCompatMapMask | XkmTypesMask | - XkmKeyNamesMask | XkmVirtualModsMask; - - - xkb = XkbCompileKeymapForDevice(dev, rmlvo, need); - - if (!xkb) { - XkbRMLVOSet dflts; - - /* we didn't get what we really needed. And that will likely leave - * us with a keyboard that doesn't work. Use the defaults instead */ - LogMessage(X_ERROR, "XKB: Failed to load keymap. Loading default " - "keymap instead.\n"); - - XkbGetRulesDflts(&dflts); - - xkb = XkbCompileKeymapForDevice(dev, &dflts, 0); - - XkbFreeRMLVOSet(&dflts, FALSE); - } + xkb = XkbCompileKeymapForDevice(dev, rmlvo, 0); return xkb; }