Merge remote-tracking branch 'krh/keysyms'

[platform/upstream/libxkbcommon.git] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index c2d17d5..748d83c 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -24,10 +24,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#include "xkballoc.h"
-#include "xkbmisc.h"
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
+#include "xkb-priv.h"
+#include "alloc.h"
 
 #define mapSize(m) (sizeof(m) / sizeof(struct xkb_kt_map_entry))
 static struct xkb_kt_map_entry map2Level[]= {
@@ -78,20 +76,21 @@ static struct xkb_key_type canonicalTypes[XkbNumRequiredTypes] = {
 };
 
 int
-XkbcInitCanonicalKeyTypes(struct xkb_keymap * xkb, unsigned which, int keypadVMod)
+XkbcInitCanonicalKeyTypes(struct xkb_keymap *keymap, unsigned which,
+                          int keypadVMod)
 {
     struct xkb_client_map * map;
     struct xkb_key_type *from, *to;
     int rtrn;
 
-    if (!xkb)
+    if (!keymap)
         return BadMatch;
 
-    rtrn= XkbcAllocClientMap(xkb, XkbKeyTypesMask, XkbNumRequiredTypes);
+    rtrn = XkbcAllocClientMap(keymap, XkbKeyTypesMask, XkbNumRequiredTypes);
     if (rtrn != Success)
         return rtrn;
 
-    map= xkb->map;
+    map = keymap->map;
     if ((which & XkbAllRequiredTypes) == 0)
         return Success;
 
@@ -134,55 +133,6 @@ XkbcInitCanonicalKeyTypes(struct xkb_keymap * xkb, unsigned which, int keypadVMo
     return Success;
 }
 
-bool
-XkbcVirtualModsToReal(struct xkb_keymap * xkb, unsigned virtual_mask,
-                      unsigned *mask_rtrn)
-{
-    int i, bit;
-    unsigned mask;
-
-    if (!xkb)
-        return false;
-    if (virtual_mask == 0) {
-        *mask_rtrn = 0;
-        return true;
-    }
-    if (!xkb->server)
-        return false;
-
-    for (i = mask = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) {
-        if (virtual_mask & bit)
-            mask |= xkb->server->vmods[i];
-    }
-
-    *mask_rtrn = mask;
-    return true;
-}
-
-/*
- * All latin-1 alphanumerics, plus parens, slash, minus, underscore and
- * wildcards.
- */
-static const unsigned char componentSpecLegal[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xa7, 0xff, 0x83,
-    0xfe, 0xff, 0xff, 0x87, 0xfe, 0xff, 0xff, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff
-};
-
-void
-XkbcEnsureSafeMapName(char *name)
-{
-    if (!name)
-        return;
-
-    while (*name!='\0') {
-        if ((componentSpecLegal[(*name) / 8] & (1 << ((*name) % 8))) == 0)
-            *name= '_';
-        name++;
-    }
-}
-
 unsigned
 _XkbcKSCheckCase(xkb_keysym_t ks)
 {