Move ComputeEffectiveMap code and avoid some duplication

The ComputeEffectiveMap function is only called from keytypes.c, with
the last argument NULL, so we can move it there and remove some code.
The function XkbcVirtualModsToRealMods, of which the above is the only
user, is already implemented more simply in compat.c, so make this one
non-static and use it. This leaves src/xkb.c empty, so remove it.

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 3e41ba6..78e7621 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,6 @@ libxkbcommon_la_SOURCES = \
        src/text.h \
        src/utils.c \
        src/utils.h \
-       src/xkb.c \
        src/xkb-priv.h
 
 BUILT_SOURCES = \

diff --git a/src/xkb-priv.h b/src/xkb-priv.h
index 41dc3c6..1d75043 100644 (file)
--- a/src/xkb-priv.h
+++ b/src/xkb-priv.h
@@ -457,10 +457,6 @@ xkb_map_new_from_kccgst(struct xkb_context *ctx,
 extern int
 xkb_context_take_file_id(struct xkb_context *ctx);
 
-extern bool
-XkbcComputeEffectiveMap(struct xkb_keymap *keymap, struct xkb_key_type *type,
-                        unsigned char *map_rtrn);
-
 extern int
 XkbcInitCanonicalKeyTypes(struct xkb_keymap *keymap, unsigned which,
                           int keypadVMod);

diff --git a/src/xkb.c b/src/xkb.c
deleted file mode 100644 (file)
index 9d9d0ba..0000000
--- a/src/xkb.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#include "xkb-priv.h"
-
-static bool
-VirtualModsToReal(struct xkb_keymap *keymap, unsigned virtual_mask,
-                  unsigned *mask_rtrn)
-{
-    int i, bit;
-    unsigned mask;
-
-    if (!keymap)
-        return false;
-    if (virtual_mask == 0) {
-        *mask_rtrn = 0;
-        return true;
-    }
-    if (!keymap->server)
-        return false;
-
-    for (i = mask = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) {
-        if (virtual_mask & bit)
-            mask |= keymap->server->vmods[i];
-    }
-
-    *mask_rtrn = mask;
-    return true;
-}
-
-bool
-XkbcComputeEffectiveMap(struct xkb_keymap *keymap, struct xkb_key_type *type,
-                        unsigned char *map_rtrn)
-{
-    unsigned tmp;
-    struct xkb_kt_map_entry * entry = NULL;
-
-    if (!keymap || !type || !keymap->server)
-        return false;
-
-    if (type->mods.vmods != 0) {
-        if (!VirtualModsToReal(keymap, type->mods.vmods, &tmp))
-            return false;
-
-        type->mods.mask = tmp | type->mods.real_mods;
-        darray_foreach(entry, type->map) {
-            tmp = 0;
-            if (entry->mods.vmods != 0) {
-                if (!VirtualModsToReal(keymap, entry->mods.vmods, &tmp))
-                    return false;
-                if (tmp == 0) {
-                    entry->active = false;
-                    continue;
-                }
-            }
-            entry->active = true;
-            entry->mods.mask = (entry->mods.real_mods | tmp) & type->mods.mask;
-        }
-    }
-    else
-        type->mods.mask = type->mods.real_mods;
-
-    if (map_rtrn) {
-        memset(map_rtrn, 0, type->mods.mask + 1);
-        if (entry && entry->active)
-            darray_foreach(entry, type->map)
-                map_rtrn[entry->mods.mask] = entry->level;
-    }
-
-    return true;
-}

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index f9fed35..99ed570 100644 (file)
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -838,7 +838,7 @@ err_info:
     return false;
 }
 
-static uint32_t
+uint32_t
 VModsToReal(struct xkb_keymap *keymap, uint32_t vmodmask)
 {
     uint32_t ret = 0;

diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c
index 5b0cd82..8801e6f 100644 (file)
--- a/src/xkbcomp/keytypes.c
+++ b/src/xkbcomp/keytypes.c
@@ -988,6 +988,34 @@ HandleKeyTypesFile(XkbFile *file, struct xkb_keymap *keymap,
 }
 
 static bool
+ComputeEffectiveMap(struct xkb_keymap *keymap, struct xkb_key_type *type)
+{
+    uint32_t tmp;
+    struct xkb_kt_map_entry *entry = NULL;
+
+    if (type->mods.vmods != 0) {
+        tmp = VModsToReal(keymap, type->mods.vmods);
+        type->mods.mask = tmp | type->mods.real_mods;
+        darray_foreach(entry, type->map) {
+            tmp = 0;
+            if (entry->mods.vmods != 0) {
+                tmp = VModsToReal(keymap, entry->mods.vmods);
+                if (tmp == 0) {
+                    entry->active = false;
+                    continue;
+                }
+            }
+            entry->active = true;
+            entry->mods.mask = (entry->mods.real_mods | tmp) & type->mods.mask;
+        }
+    }
+    else
+        type->mods.mask = type->mods.real_mods;
+
+    return true;
+}
+
+static bool
 CopyDefToKeyType(struct xkb_keymap *keymap, struct xkb_key_type *type,
                  KeyTypeInfo *def)
 {
@@ -1055,7 +1083,7 @@ CopyDefToKeyType(struct xkb_keymap *keymap, struct xkb_key_type *type,
     }
 
     darray_init(def->entries);
-    return XkbcComputeEffectiveMap(keymap, type, NULL);
+    return ComputeEffectiveMap(keymap, type);
 }
 
 bool

diff --git a/src/xkbcomp/xkbcomp-priv.h b/src/xkbcomp/xkbcomp-priv.h
index 9d10597..35d59d4 100644 (file)
--- a/src/xkbcomp/xkbcomp-priv.h
+++ b/src/xkbcomp/xkbcomp-priv.h
@@ -80,4 +80,7 @@ FindKeyNameForAlias(struct xkb_keymap *keymap, unsigned long lname,
 extern bool
 UpdateModifiersFromCompat(struct xkb_keymap *keymap);
 
+uint32_t
+VModsToReal(struct xkb_keymap *keymap, uint32_t vmodmask);
+
 #endif /* XKBCOMP_PRIV_H */