Fix the keyboard config to match Tizen 2.0 alpha

[profile/ivi/libxkbcommon.git] / src / xkbcomp / keymap.c

diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c
index f73eeff..f3bf821 100644 (file)
--- a/src/xkbcomp/keymap.c
+++ b/src/xkbcomp/keymap.c
@@ -24,12 +24,7 @@
 
  ********************************************************/
 
-#include "xkbcomp.h"
-#include "xkbmisc.h"
-#include "expr.h"
-#include "vmod.h"
-#include "action.h"
-#include "misc.h"
+#include "xkbcomp-priv.h"
 #include "indicators.h"
 
 /**
@@ -37,15 +32,16 @@
  * @param file A list of XkbFiles, each denoting one type (e.g.
  * XkmKeyNamesIdx, etc.)
  */
-Bool
-CompileKeymap(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
+struct xkb_keymap *
+CompileKeymap(struct xkb_context *ctx, XkbFile *file)
 {
     unsigned have;
-    Bool ok;
+    bool ok;
     unsigned required, legal;
     unsigned mainType;
-    char *mainName;
-    LEDInfo *unbound = NULL;
+    const char *mainName;
+    LEDInfo *unbound = NULL, *next;
+    struct xkb_keymap *keymap = XkbcAllocKeyboard(ctx);
     struct {
         XkbFile *keycodes;
         XkbFile *types;
@@ -53,51 +49,41 @@ CompileKeymap(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
         XkbFile *symbols;
     } sections;
 
+    if (!keymap)
+        return NULL;
+
     memset(&sections, 0, sizeof(sections));
     mainType = file->type;
-    mainName = file->name;
+    mainName = file->name ? file->name : "(unnamed)";
     switch (mainType)
     {
-    case XkmSemanticsFile:
-        required = XkmSemanticsRequired;
-        legal = XkmSemanticsLegal;
-        break;
-    case XkmLayoutFile:        /* standard type  if setxkbmap -print */
-        required = XkmLayoutRequired;
-        legal = XkmKeymapLegal;
-        break;
     case XkmKeymapFile:
-        required = XkmKeyNamesIndex | XkmTypesIndex | XkmSymbolsIndex | \
-                   XkmCompatMapIndex | XkmVirtualModsIndex;
+        required = XkmKeyNamesIndex | XkmTypesIndex | XkmSymbolsIndex |
+                   XkmCompatMapIndex;
         legal = XkmKeymapLegal;
         break;
     default:
         ERROR("Cannot compile %s alone into an XKM file\n",
                XkbcConfigText(mainType));
-        return False;
+        return false;
     }
     have = 0;
-    ok = 1;
+
     /* Check for duplicate entries in the input file */
     for (file = (XkbFile *) file->defs; file; file = (XkbFile *) file->common.next)
     {
-        if (file->topName != mainName) {
-            free(file->topName);
-            file->topName = strdup(mainName);
-        }
-
         if ((have & (1 << file->type)) != 0)
         {
             ERROR("More than one %s section in a %s file\n",
                    XkbcConfigText(file->type), XkbcConfigText(mainType));
             ACTION("All sections after the first ignored\n");
-            return False;
+            continue;
         }
         else if ((1 << file->type) & (~legal))
         {
             ERROR("Cannot define %s in a %s file\n",
                    XkbcConfigText(file->type), XkbcConfigText(mainType));
-            return False;
+            continue;
         }
 
         switch (file->type)
@@ -116,17 +102,10 @@ CompileKeymap(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
             break;
         case XkmGeometryIndex:
             continue;
-        case XkmVirtualModsIndex:
-        case XkmIndicatorsIndex:
-            WSGO("Found an isolated %s section\n", XkbcConfigText(file->type));
-            ACTION("Ignored\n");
-            continue;
         default:
             WSGO("Unknown file type %d\n", file->type);
             ACTION("Ignored\n");
             continue;
-        case XkmSemanticsFile:
-        case XkmLayoutFile:
         case XkmKeymapFile:
             WSGO("Illegal %s configuration in a %s file\n",
                   XkbcConfigText(file->type), XkbcConfigText(mainType));
@@ -134,6 +113,11 @@ CompileKeymap(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
             continue;
         }
 
+        if (!file->topName || strcmp(file->topName, mainName) != 0) {
+            free(file->topName);
+            file->topName = strdup(mainName);
+        }
+
         have |= (1 << file->type);
     }
 
@@ -146,32 +130,56 @@ CompileKeymap(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
         {
             if (missing & bit)
             {
-                ERROR("Missing %s section in a %s file\n",
-                       XkbcConfigText(i), XkbcConfigText(mainType));
+                ERROR("Required section %s missing from keymap\n", XkbcConfigText(i));
                 missing &= ~bit;
             }
         }
-        ACTION("Description of %s not compiled\n",
-                XkbcConfigText(mainType));
-        return False;
+        goto err;
     }
 
     /* compile the sections we have in the file one-by-one, or fail. */
-    if (sections.keycodes != NULL &&
-        !CompileKeycodes(sections.keycodes, xkb, MergeOverride))
-        return False;
-    if (sections.types != NULL &&
-        !CompileKeyTypes(sections.types, xkb, MergeOverride))
-        return False;
-    if (sections.compat != NULL &&
-        !CompileCompatMap(sections.compat, xkb, MergeOverride, &unbound))
-        return False;
-    if (sections.symbols != NULL &&
-        !CompileSymbols(sections.symbols, xkb, MergeOverride))
-        return False;
-
-    xkb->defined = have;
-
-    ok = BindIndicators(xkb, True, unbound, NULL);
-    return ok;
+    if (sections.keycodes == NULL ||
+        !CompileKeycodes(sections.keycodes, keymap, MergeOverride))
+    {
+        ERROR("Failed to compile keycodes\n");
+        goto err;
+    }
+    if (sections.types == NULL ||
+        !CompileKeyTypes(sections.types, keymap, MergeOverride))
+    {
+        ERROR("Failed to compile key types\n");
+        goto err;
+    }
+    if (sections.compat == NULL ||
+        !CompileCompatMap(sections.compat, keymap, MergeOverride, &unbound))
+    {
+        ERROR("Failed to compile compat map\n");
+        goto err;
+    }
+    if (sections.symbols == NULL ||
+        !CompileSymbols(sections.symbols, keymap, MergeOverride))
+    {
+        ERROR("Failed to compile symbols\n");
+        goto err;
+    }
+
+    ok = BindIndicators(keymap, true, unbound, NULL);
+    if (!ok)
+        goto err;
+
+    ok = UpdateModifiersFromCompat(keymap);
+    if (!ok)
+        goto err;
+
+    return keymap;
+
+err:
+    ACTION("Failed to compile keymap\n");
+    xkb_map_unref(keymap);
+    while (unbound) {
+        next = (LEDInfo *) unbound->defs.next;
+        free(unbound);
+        unbound = next;
+    }
+    return NULL;
 }