*
********************************************************/
-#ifndef VMOD_H
-#define VMOD_H 1
+#ifndef XKBCOMP_VMOD_H
+#define XKBCOMP_VMOD_H
-#include "xkbcomp-priv.h"
-#include "expr.h"
+bool
+HandleVModDef(struct xkb_context *ctx, struct xkb_mod_set *mods,
+ VModDef *stmt, enum merge_mode merge);
-typedef struct _VModInfo {
- unsigned defined;
- unsigned available;
- unsigned newlyDefined;
- int errorCount;
-} VModInfo;
-
-extern void
-InitVModInfo(VModInfo *info, struct xkb_keymap *keymap);
-
-extern void
-ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap);
-
-extern bool
-HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
- enum merge_mode mergeMode,
- VModInfo *info);
-
-extern bool
-ApplyVModDefs(VModInfo *info, struct xkb_keymap *keymap);
-
-extern int
-FindKeypadVMod(struct xkb_keymap *keymap);
-
-extern bool
-ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *keymap,
- ExprResult *value_rtrn,
- VModInfo *info);
-
-#endif /* VMOD_H */
+#endif