From af26e2e0d76ef4f82cbc2dc8100abf9e8bc25c0b Mon Sep 17 00:00:00 2001
From: Ran Benita <ran234@gmail.com>
Date: Tue, 1 Oct 2013 11:45:24 +0300
Subject: [PATCH xkbcomp] When a file contains several maps, look for a default map

Rather than always taking the first one in the file. This is exactly the
intended use of the 'default' flag.

Note that pretty much the same code is duplicated in xkbcomp.c when
compiling a single file from the command line, but there it is
implemented correctly (look for XkbLC_Default).

https://bugs.freedesktop.org/show_bug.cgi?id=69950

Signed-off-by: Ran Benita <ran234@gmail.com>
Tested-by: Benno Schulenberg <bensberg@justemail.net>
Acked-by: Sergey Udaltsov <sergey.udaltsov@gmail.com>
---
 misc.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/misc.c b/misc.c
index 4990a74..848ed8c 100644
--- a/misc.c
+++ b/misc.c
@@ -82,41 +82,62 @@ ProcessIncludeFile(IncludeStmt * stmt,
             setScanState(oldFile, oldLine);
             ERROR1("Error interpreting include file \"%s\"\n", stmt->file);
             ACTION("Exiting\n");
             fclose(file);
             return False;
         }
         fclose(file);
         XkbAddFileToCache(stmt->file, file_type, stmt->path, rtrn);
     }
+
+    /*
+     * A single file may contain several maps. Here's how we choose the map:
+     * - If a specific map was requested, look for it exclusively.
+     * - Otherwise, if the file only contains a single map, return it.
+     * - Otherwise, if the file has maps tagged as default, return the
+     *   first one.
+     * - If all fails, return the first map in the file.
+     */
     mapToUse = rtrn;
     if (stmt->map != NULL)
     {
         while ((mapToUse) && ((!uStringEqual(mapToUse->name, stmt->map)) ||
                               (mapToUse->type != file_type)))
         {
             mapToUse = (XkbFile *) mapToUse->common.next;
         }
         if (!mapToUse)
         {
             ERROR3("No %s named \"%s\" in the include file \"%s\"\n",
                    XkbConfigText(file_type, XkbMessage), stmt->map,
                    stmt->file);
             ACTION("Exiting\n");
             return False;
         }
     }
-    else if ((rtrn->common.next != NULL) && (warningLevel > 5))
+    else if (rtrn->common.next != NULL)
     {
-        WARN1("No map in include statement, but \"%s\" contains several\n",
-              stmt->file);
-        ACTION1("Using first defined map, \"%s\"\n", rtrn->name);
+        while ((mapToUse) && !(mapToUse->flags & XkbLC_Default))
+        {
+            mapToUse = (XkbFile *) mapToUse->common.next;
+        }
+        if (!mapToUse)
+        {
+            if (warningLevel > 5)
+            {
+                WARN1("No map in include statement, but \"%s\" contains several without a default map\n",
+                      stmt->file);
+                ACTION1("Using first defined map, \"%s\"\n", rtrn->name);
+            }
+            mapToUse = rtrn;
+        }
     }
+
     setScanState(oldFile, oldLine);
     if (mapToUse->type != file_type)
     {
         ERROR2("Include file wrong type (expected %s, got %s)\n",
                XkbConfigText(file_type, XkbMessage),
                XkbConfigText(mapToUse->type, XkbMessage));
         ACTION1("Include file \"%s\" ignored\n", stmt->file);
         return False;
     }
-- 
1.8.4