#ifndef XKBCOMP_H
#define XKBCOMP_H 1
-#include "utils.h"
-
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
-#include "xkbmisc.h"
+#include "xkb-priv.h"
#define TypeUnknown 0
#define TypeBoolean 1
int nSyms;
int szSyms;
char **syms;
+ int nLevels;
+ int szLevels;
+ int *symsMapIndex;
+ unsigned int *symsNumEntries;
} list;
struct _Expr *child;
xkb_atom_t str;
unsigned merge;
int ndx;
ExprDef *name;
- Bool virtual;
+ bool virtual;
} IndicatorNameDef;
typedef struct _IndicatorMapDef
ParseCommon *defs;
int id;
unsigned flags;
- Bool compiled;
} XkbFile;
-extern struct xkb_desc *
-CompileKeymap(struct xkb_context *context, XkbFile *file, unsigned merge);
+extern struct xkb_keymap *
+CompileKeymap(struct xkb_ctx *ctx, XkbFile *file);
-extern Bool
-CompileKeycodes(XkbFile *file, struct xkb_desc * xkb, unsigned merge);
+extern bool
+CompileKeycodes(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
-extern Bool
-CompileKeyTypes(XkbFile *file, struct xkb_desc * xkb, unsigned merge);
+extern bool
+CompileKeyTypes(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
typedef struct _LEDInfo *LEDInfoPtr;
-extern Bool
-CompileCompatMap(XkbFile *file, struct xkb_desc * xkb, unsigned merge,
+extern bool
+CompileCompatMap(XkbFile *file, struct xkb_keymap *keymap, unsigned merge,
LEDInfoPtr *unboundLEDs);
-extern Bool
-CompileSymbols(XkbFile *file, struct xkb_desc * xkb, unsigned merge);
-
-extern Bool
-UpdateModifiersFromCompat(struct xkb_desc *xkb);
+extern bool
+CompileSymbols(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
#endif /* XKBCOMP_H */