From b537b5524a238645167f370c73afa8686442463f Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 8 May 2012 17:48:29 +0100 Subject: Add flags to keymap compilation entrypoints No use as yet, but might as well ... Signed-off-by: Daniel Stone --- include/xkbcommon/xkbcommon.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/xkbcommon/xkbcommon.h b/include/xkbcommon/xkbcommon.h index 4ab9e03..ebb9aa4 100644 --- a/include/xkbcommon/xkbcommon.h +++ b/include/xkbcommon/xkbcommon.h @@ -264,6 +264,11 @@ xkb_context_unref(struct xkb_context *context); * @{ */ +enum xkb_map_compile_flags { + /** Apparently you can't have empty enums. What a drag. */ + XKB_MAP_COMPILE_PLACEHOLDER = 0, +}; + /** * The primary keymap entry point: creates a new XKB keymap from a set of * RMLVO (Rules + Model + Layout + Variant + Option) names. @@ -273,7 +278,8 @@ xkb_context_unref(struct xkb_context *context); */ struct xkb_keymap * xkb_map_new_from_names(struct xkb_context *context, - const struct xkb_rule_names *names); + const struct xkb_rule_names *names, + enum xkb_map_compile_flags flags); /** * Deprecated entrypoint for legacy users who need to be able to compile @@ -287,7 +293,8 @@ xkb_map_new_from_names(struct xkb_context *context, */ struct xkb_keymap * xkb_map_new_from_kccgst(struct xkb_context *context, - const struct xkb_component_names *kccgst); + const struct xkb_component_names *kccgst, + enum xkb_map_compile_flags flags); enum xkb_keymap_format { /** The current/classic XKB text format, as generated by xkbcomp -xkb. */ @@ -300,7 +307,8 @@ enum xkb_keymap_format { */ struct xkb_keymap * xkb_map_new_from_fd(struct xkb_context *context, - int fd, enum xkb_keymap_format format); + int fd, enum xkb_keymap_format format, + enum xkb_map_compile_flags flags); /** * Creates an XKB keymap from a full text XKB keymap serialised into one @@ -309,7 +317,8 @@ xkb_map_new_from_fd(struct xkb_context *context, struct xkb_keymap * xkb_map_new_from_string(struct xkb_context *context, const char *string, - enum xkb_keymap_format format); + enum xkb_keymap_format format, + enum xkb_map_compile_flags flags); /** * Takes a new reference on a keymap. -- cgit v1.2.1