Rename XKBcommonint.h to xkb-priv.h and use it

Make the files in the src/* directory use their own header or a
consilidated private header. This makes the file dependencies clearer.

Also drop the pointless "xkb" file name prefix, add split a few
declarations to their own files (atom.h and text.h).

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

diff --git a/Makefile.am b/Makefile.am
index 142796f..008ff40 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/xkbcomp \
-       -Isrc/xkbcomp/ \
        -include $(top_srcdir)/src/config.h
 
 AM_CFLAGS = \
@@ -61,21 +60,22 @@ libxkbcommon_la_SOURCES = \
        src/xkbcomp/xkbcomp.h \
        src/xkbcomp/xkbcomp-priv.h \
        src/alloc.c \
+       src/alloc.h \
        src/atom.c \
+       src/atom.h \
        src/context.c \
        src/keysym.c \
        src/map.c \
-       src/maprules.c \
        src/misc.c \
+       src/rules.c \
+       src/rules.h \
        src/state.c \
        src/text.c \
+       src/text.h \
        src/utils.c \
        src/utils.h \
        src/xkb.c \
-       src/xkballoc.h \
-       src/xkbmisc.h \
-       src/xkbrules.h \
-       src/XKBcommonint.h
+       src/xkb-priv.h
 
 BUILT_SOURCES = \
        src/xkbcomp/parser.c \

diff --git a/src/alloc.c b/src/alloc.c
index 7e03795..6238f95 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -23,10 +23,8 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "utils.h"
-#include "xkballoc.h"
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
+#include "xkb-priv.h"
+#include "alloc.h"
 
 int
 XkbcAllocClientMap(struct xkb_keymap * xkb, unsigned which, unsigned nTotalTypes)

diff --git a/src/xkballoc.h b/src/alloc.h
similarity index 86%
rename from src/xkballoc.h
rename to src/alloc.h
index 6ab756b..52e7c3e 100644 (file)
--- a/src/xkballoc.h
+++ b/src/alloc.h
@@ -24,12 +24,10 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 */
 
-#ifndef _XKBALLOC_H_
-#define _XKBALLOC_H_
+#ifndef ALLOC_H
+#define ALLOC_H
 
-#include <X11/X.h>
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
+#include "xkb-priv.h"
 
 extern int
 XkbcAllocCompatMap(struct xkb_keymap *xkb, unsigned nSI);
@@ -70,9 +68,4 @@ XkbcFreeClientMap(struct xkb_keymap * xkb);
 extern void
 XkbcFreeServerMap(struct xkb_keymap * xkb);
 
-extern unsigned int
-xkb_key_get_syms_by_level(struct xkb_keymap *xkb, xkb_keycode_t key,
-                          unsigned int group, unsigned int level,
-                          const xkb_keysym_t **syms_out);
-
-#endif /* _XKBALLOC_H_ */
+#endif /* ALLOC_H */

diff --git a/src/atom.c b/src/atom.c
index 181744d..a65bfc6 100644 (file)
--- a/src/atom.c
+++ b/src/atom.c
@@ -70,9 +70,7 @@ SOFTWARE.
 
  ********************************************************/
 
-#include "xkbmisc.h"
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
+#include "atom.h"
 
 #define InitialTableSize 100
 

diff --git a/src/atom.h b/src/atom.h
new file mode 100644 (file)
index 0000000..25443fa
--- /dev/null
+++ b/src/atom.h
@@ -0,0 +1,48 @@
+/*
+Copyright 2009  Dan Nicholson
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
+*/
+
+#ifndef ATOM_H
+#define ATOM_H
+
+#include "xkb-priv.h"
+
+typedef uint32_t xkb_atom_t;
+
+#define XKB_ATOM_NONE 0
+
+extern xkb_atom_t
+xkb_intern_atom(const char *string);
+
+extern char *
+XkbcAtomGetString(xkb_atom_t atom);
+
+extern const char *
+XkbcAtomText(xkb_atom_t atm);
+
+extern void
+XkbcFreeAllAtoms(void);
+
+#endif /* ATOM_H */

diff --git a/src/context.c b/src/context.c
index 12aeed4..1c080d3 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -28,9 +28,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
-#include "utils.h"
+#include "xkb-priv.h"
 
 struct xkb_context {
     int refcnt;

diff --git a/src/keysym.c b/src/keysym.c
index 5079419..06a3b37 100644 (file)
--- a/src/keysym.c
+++ b/src/keysym.c
@@ -28,11 +28,10 @@ authorization from the authors.
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <X11/keysymdef.h>
+#include <X11/keysym.h>
 
+#include "xkb-priv.h"
 #include "ks_tables.h"
-#include "xkbmisc.h"
-#include "xkbcommon/xkbcommon.h"
 
 _X_EXPORT void
 xkb_keysym_to_string(xkb_keysym_t ks, char *buffer, size_t size)

diff --git a/src/map.c b/src/map.c
index c82fb61..197a748 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -49,10 +49,7 @@
  *
  * ********************************************************/
 
-#include "utils.h"
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
-#include "xkballoc.h"
+#include "xkb-priv.h"
 
 /**
  * Returns the total number of modifiers active in the keymap.
@@ -296,7 +293,7 @@ xkb_key_get_group(struct xkb_state *state, xkb_keycode_t key)
 /**
  * As below, but takes an explicit group/level rather than state.
  */
-_X_EXPORT unsigned int
+unsigned int
 xkb_key_get_syms_by_level(struct xkb_keymap *xkb, xkb_keycode_t key, unsigned int group,
                           unsigned int level, const xkb_keysym_t **syms_out)
 {

diff --git a/src/misc.c b/src/misc.c
index f15631e..b3053d0 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -24,12 +24,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#include "xkballoc.h"
-#include "xkbmisc.h"
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
 #include <X11/keysym.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[]= {
     { true, ShiftMask, {1, ShiftMask, 0} }
@@ -135,55 +134,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)
 {

diff --git a/src/maprules.c b/src/rules.c
similarity index 99%
rename from src/maprules.c
rename to src/rules.c
index 25cba6b..73152f9 100644 (file)
--- a/src/maprules.c
+++ b/src/rules.c
@@ -24,14 +24,10 @@
 
  ********************************************************/
 
-#include "utils.h"
-#include "xkbrules.h"
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
-
 #include <stdio.h>
 #include <ctype.h>
-#include <stdlib.h>
+
+#include "rules.h"
 
 #ifdef DEBUG
 #define PR_DEBUG(s)            fprintf(stderr,s)
@@ -851,13 +847,13 @@ XkbcRF_GetComponents(     XkbRF_RulesPtr          rules,
 
     if (names->keycodes)
        names->keycodes= XkbRF_SubstituteVars(names->keycodes, &mdefs);
-    if (names->symbols)        
+    if (names->symbols)
        names->symbols= XkbRF_SubstituteVars(names->symbols, &mdefs);
     if (names->types)
        names->types= XkbRF_SubstituteVars(names->types, &mdefs);
     if (names->compat)
        names->compat= XkbRF_SubstituteVars(names->compat, &mdefs);
-    if (names->keymap) 
+    if (names->keymap)
        names->keymap= XkbRF_SubstituteVars(names->keymap, &mdefs);
 
     FreeMultiDefs(&mdefs);

diff --git a/src/xkbrules.h b/src/rules.h
similarity index 95%
rename from src/xkbrules.h
rename to src/rules.h
index 70e3711..15e93fe 100644 (file)
--- a/src/xkbrules.h
+++ b/src/rules.h
@@ -24,13 +24,12 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 */
 
-#ifndef _XKBRULES_H_
-#define _XKBRULES_H_
+#ifndef RULES_H
+#define RULES_H
 
-#include <stdbool.h>
 #include <stdio.h>
 
-#include "xkbcommon/xkbcommon.h"
+#include "xkb-priv.h"
 
 /* From filecommon */
 
@@ -101,8 +100,6 @@ typedef struct _XkbRF_Rules {
     XkbRF_GroupPtr          groups;
 } XkbRF_RulesRec, *XkbRF_RulesPtr;
 
-/* Action structures used in the server */
-
 extern bool
 XkbcRF_GetComponents(XkbRF_RulesPtr rules, XkbRF_VarDefsPtr defs,
                      struct xkb_component_names * names);
@@ -113,4 +110,4 @@ XkbcRF_LoadRules(FILE *file, XkbRF_RulesPtr rules);
 extern void
 XkbcRF_Free(XkbRF_RulesPtr rules);
 
-#endif /* _XKBRULES_H_ */
+#endif /* RULES_H */

diff --git a/src/state.c b/src/state.c
index 8394050..8bfe30d 100644 (file)
--- a/src/state.c
+++ b/src/state.c
@@ -60,9 +60,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <assert.h>
 
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
-#include "xkbmisc.h"
+#include "xkb-priv.h"
 
 struct xkb_filter {
     struct xkb_state *state;

diff --git a/src/text.c b/src/text.c
index c4d81c5..9277268 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -24,12 +24,7 @@
 
  ********************************************************/
 
-#include "xkbmisc.h"
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+#include "text.h"
 
 #define BUFFER_SIZE 1024
 static char textBuffer[BUFFER_SIZE];

diff --git a/src/xkbmisc.h b/src/text.h
similarity index 55%
rename from src/xkbmisc.h
rename to src/text.h
index 5f2b7fb..92fe910 100644 (file)
--- a/src/xkbmisc.h
+++ b/src/text.h
@@ -24,62 +24,10 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 */
 
-#ifndef _XKBMISC_H_
-#define _XKBMISC_H_
+#ifndef TEXT_H
+#define TEXT_H
 
-#include <stdbool.h>
-#include <X11/Xfuncproto.h>
-
-#include "XKBcommonint.h"
-
-typedef uint32_t xkb_atom_t;
-
-#define XKB_ATOM_NONE 0
-
-/***====================================================================***/
-
-extern bool
-XkbcComputeEffectiveMap(struct xkb_keymap * xkb, struct xkb_key_type * type,
-                        unsigned char *map_rtrn);
-
-/***====================================================================***/
-
-extern int
-XkbcInitCanonicalKeyTypes(struct xkb_keymap * xkb, unsigned which, int keypadVMod);
-
-extern bool
-XkbcVirtualModsToReal(struct xkb_keymap * xkb, unsigned virtual_mask,
-                      unsigned *mask_rtrn);
-
-extern void
-XkbcEnsureSafeMapName(char *name);
-
-extern unsigned
-_XkbcKSCheckCase(xkb_keysym_t sym);
-
-#define _XkbKSLower (1 << 0)
-#define _XkbKSUpper (1 << 1)
-
-#define XkbcKSIsLower(k) (_XkbcKSCheckCase(k) & _XkbKSLower)
-#define XkbcKSIsUpper(k) (_XkbcKSCheckCase(k) & _XkbKSUpper)
-
-#define XkbKSIsKeypad(k) (((k) >= XK_KP_Space) && ((k) <= XK_KP_Equal))
-
-/***====================================================================***/
-
-extern xkb_atom_t
-xkb_intern_atom(const char *string);
-
-extern char *
-XkbcAtomGetString(xkb_atom_t atom);
-
-extern void
-XkbcFreeAllAtoms(void);
-
-/***====================================================================***/
-
-extern const char *
-XkbcAtomText(xkb_atom_t atm);
+#include "xkb-priv.h"
 
 extern const char *
 XkbcVModMaskText(struct xkb_keymap * xkb, unsigned modMask, unsigned mask);
@@ -105,4 +53,4 @@ XkbcKeyNameText(char *name);
 extern const char *
 XkbcSIMatchText(unsigned type);
 
-#endif /* _XKBMISC_H_ */
+#endif /* TEXT_H */

diff --git a/src/utils.c b/src/utils.c
index 7e33c8f..fcdc75d 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -25,14 +25,13 @@
    * software without specific, written prior permission.
    \*/
 
-#include "utils.h"
-#include "XKBcommonint.h"
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 
+#include "utils.h"
+
 void *
 recalloc(void *ptr, size_t old_size, size_t new_size)
 {

diff --git a/src/utils.h b/src/utils.h
index 3bb6a73..7239d6c 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -31,6 +31,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <X11/Xfuncproto.h>
 

diff --git a/src/XKBcommonint.h b/src/xkb-priv.h
similarity index 92%
rename from src/XKBcommonint.h
rename to src/xkb-priv.h
index 396c0bd..1cd07b7 100644 (file)
--- a/src/XKBcommonint.h
+++ b/src/xkb-priv.h
@@ -76,16 +76,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
-#ifndef _XKBCOMMONINT_H_
-#define _XKBCOMMONINT_H_
+#ifndef XKB_PRIV_H
+#define XKB_PRIV_H
 
 #include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <X11/extensions/XKB.h>
+#include <X11/X.h>
 
 #include "xkbcommon/xkbcommon.h"
+#include "utils.h"
 
 /* From XKM.h */
 #define        XkmSemanticsFile        20
@@ -115,12 +116,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define        XkmKeymapOptional       ((XkmSemanticsOptional|XkmLayoutOptional)&(~XkmKeymapRequired))
 #define        XkmKeymapLegal          (XkmKeymapRequired|XkmKeymapOptional)
 
-extern unsigned int xkb_key_get_group(struct xkb_state *state,
-                                      xkb_keycode_t key);
-extern unsigned int xkb_key_get_level(struct xkb_state *state,
-                                      xkb_keycode_t key,
-                                      unsigned int group);
-
 struct xkb_any_action {
     uint8_t   type;
     uint8_t   data[7];
@@ -431,4 +426,34 @@ struct xkb_state {
         struct xkb_keymap *xkb;
 };
 
-#endif /* _XKBCOMMONINT_H_ */
+extern unsigned int
+xkb_key_get_group(struct xkb_state *state, xkb_keycode_t key);
+
+extern unsigned int
+xkb_key_get_level(struct xkb_state *state, xkb_keycode_t key,
+                  unsigned int group);
+
+extern unsigned int
+xkb_key_get_syms_by_level(struct xkb_keymap *xkb, xkb_keycode_t key,
+                          unsigned int group, unsigned int level,
+                          const xkb_keysym_t **syms_out);
+extern bool
+XkbcComputeEffectiveMap(struct xkb_keymap * xkb, struct xkb_key_type * type,
+                        unsigned char *map_rtrn);
+
+extern int
+XkbcInitCanonicalKeyTypes(struct xkb_keymap * xkb, unsigned which,
+                          int keypadVMod);
+
+extern unsigned
+_XkbcKSCheckCase(xkb_keysym_t sym);
+
+#define _XkbKSLower (1 << 0)
+#define _XkbKSUpper (1 << 1)
+
+#define XkbcKSIsLower(k) (_XkbcKSCheckCase(k) & _XkbKSLower)
+#define XkbcKSIsUpper(k) (_XkbcKSCheckCase(k) & _XkbKSUpper)
+
+#define XkbKSIsKeypad(k) (((k) >= XK_KP_Space) && ((k) <= XK_KP_Equal))
+
+#endif /* XKB_PRIV_H */

diff --git a/src/xkb.c b/src/xkb.c
index ee44f15..92d74d2 100644 (file)
--- a/src/xkb.c
+++ b/src/xkb.c
@@ -24,11 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#include <stdio.h>
-
-#include "xkbmisc.h"
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
+#include "xkb-priv.h"
 
 static char *
 XkbcCanonicaliseComponent(char *name, const char *old)
@@ -94,6 +90,31 @@ xkb_canonicalise_components(struct xkb_component_names * names,
                                              old ? old->types : NULL);
 }
 
+static bool
+VirtualModsToReal(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;
+}
+
 bool
 XkbcComputeEffectiveMap(struct xkb_keymap * xkb, struct xkb_key_type * type,
                         unsigned char *map_rtrn)
@@ -106,7 +127,7 @@ XkbcComputeEffectiveMap(struct xkb_keymap * xkb, struct xkb_key_type * type,
         return false;
 
     if (type->mods.vmods != 0) {
-        if (!XkbcVirtualModsToReal(xkb, type->mods.vmods, &tmp))
+        if (!VirtualModsToReal(xkb, type->mods.vmods, &tmp))
             return false;
 
         type->mods.mask = tmp | type->mods.real_mods;
@@ -114,7 +135,7 @@ XkbcComputeEffectiveMap(struct xkb_keymap * xkb, struct xkb_key_type * type,
         for (i = 0; i < type->map_count; i++, entry++) {
             tmp = 0;
             if (entry->mods.vmods != 0) {
-                if (!XkbcVirtualModsToReal(xkb, entry->mods.vmods, &tmp))
+                if (!VirtualModsToReal(xkb, entry->mods.vmods, &tmp))
                     return false;
                 if (tmp == 0) {
                     entry->active = false;

diff --git a/src/xkbcomp/parseutils.c b/src/xkbcomp/parseutils.c
index f666462..31e478d 100644 (file)
--- a/src/xkbcomp/parseutils.c
+++ b/src/xkbcomp/parseutils.c
@@ -659,6 +659,30 @@ CheckDefaultMap(XkbFile * maps, const char *fileName)
     }
 }
 
+/*
+ * 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
+};
+
+static void
+EnsureSafeMapName(char *name)
+{
+    if (!name)
+        return;
+
+    while (*name!='\0') {
+        if ((componentSpecLegal[(*name) / 8] & (1 << ((*name) % 8))) == 0)
+            *name= '_';
+        name++;
+    }
+}
+
 XkbFile *
 CreateXKBFile(int type, char *name, ParseCommon * defs, unsigned flags)
 {
@@ -668,7 +692,7 @@ CreateXKBFile(int type, char *name, ParseCommon * defs, unsigned flags)
     file = uTypedAlloc(XkbFile);
     if (file)
     {
-        XkbcEnsureSafeMapName(name);
+        EnsureSafeMapName(name);
         memset(file, 0, sizeof(XkbFile));
         file->type = type;
         file->topName = uDupString(name);

diff --git a/src/xkbcomp/xkbcomp-priv.h b/src/xkbcomp/xkbcomp-priv.h
index 9baaaad..9aecd19 100644 (file)
--- a/src/xkbcomp/xkbcomp-priv.h
+++ b/src/xkbcomp/xkbcomp-priv.h
@@ -28,7 +28,8 @@
 #define XKBCOMP_PRIV_H
 
 #include "xkbcomp.h"
-#include "xkballoc.h"
+#include "alloc.h"
+#include "text.h"
 #include "utils.h"
 
 typedef struct _CommonInfo

diff --git a/src/xkbcomp/xkbcomp.c b/src/xkbcomp/xkbcomp.c
index 1a930ca..bbbc41e 100644 (file)
--- a/src/xkbcomp/xkbcomp.c
+++ b/src/xkbcomp/xkbcomp.c
@@ -25,7 +25,7 @@ authorization from the authors.
 */
 
 #include "xkbcomp-priv.h"
-#include "xkbrules.h"
+#include "rules.h"
 #include "parseutils.h"
 
 /* Global warning level */

diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index 1883b9d..c69c141 100644 (file)
--- a/src/xkbcomp/xkbcomp.h
+++ b/src/xkbcomp/xkbcomp.h
@@ -27,8 +27,8 @@
 #ifndef XKBCOMP_H
 #define        XKBCOMP_H 1
 
-#include "XKBcommonint.h"
-#include "xkbmisc.h"
+#include "xkb-priv.h"
+#include "atom.h"
 
 #define        TypeUnknown     0
 #define        TypeBoolean     1

diff --git a/test/state.c b/test/state.c
index d698476..0090d7c 100644 (file)
--- a/test/state.c
+++ b/test/state.c
@@ -30,7 +30,7 @@
 #include <linux/input.h>
 
 #include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
+#include "xkb-priv.h"
 
 /* Offset between evdev keycodes (where KEY_ESCAPE is 1), and the evdev XKB
  * keycode set (where ESC is 9). */