diff options
author | Daniel Stone <daniel@fooishbar.org> | 2012-05-09 20:49:04 +0100 |
---|---|---|
committer | Daniel Stone <daniel@fooishbar.org> | 2012-05-09 20:49:04 +0100 |
commit | 46441b1184dfa8553409d493ae6336aabb900d79 (patch) | |
tree | 80f5f16158989651cbff13b92e7fd30d06223332 /include/xkbcommon/xkbcommon.h | |
parent | 2761b1a3327fa70d64e0da5e1a6555b7508c4597 (diff) | |
download | xorg-lib-libxkbcommon-46441b1184dfa8553409d493ae6336aabb900d79.tar.gz |
Move KcCGST API to internal-only
And don't export it. We don't need it for X11 support, let alone
anything else.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'include/xkbcommon/xkbcommon.h')
-rw-r--r-- | include/xkbcommon/xkbcommon.h | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/include/xkbcommon/xkbcommon.h b/include/xkbcommon/xkbcommon.h index 70ecb42..d98daf8 100644 --- a/include/xkbcommon/xkbcommon.h +++ b/include/xkbcommon/xkbcommon.h @@ -117,19 +117,6 @@ struct xkb_rule_names { }; /** - * Legacy names for the components of an XKB keymap, also known as KcCGST. - * This is only used in deprecated entrypoints which might be removed or - * shuffled off to a support library. - */ -struct xkb_component_names { - char *keymap; - char *keycodes; - char *types; - char *compat; - char *symbols; -}; - -/** * Opaque context object; may only be created, accessed, manipulated and * destroyed through the xkb_ctx_*() API. */ @@ -152,24 +139,6 @@ extern "C" { #endif /* - * Canonicalises component names by prepending the relevant component from - * 'old' to the one in 'names' when the latter has a leading '+' or '|', and - * by replacing a '%' with the relevant component, e.g.: - * - * names old output - * ------------------------------------------ - * +bar foo foo+bar - * |quux baz baz|quux - * foo+%|baz bar foo+bar|baz - * - * If a component in names needs to be modified, the existing value will be - * free()d, and a new one allocated with malloc(). - */ -void -xkb_canonicalise_components(struct xkb_component_names *names, - const struct xkb_component_names *old); - -/* * Returns the name for a keysym as a string; will return unknown Unicode * codepoints as "Ua1b2", and other unknown keysyms as "0xabcd1234". */ @@ -284,21 +253,6 @@ xkb_map_new_from_names(struct xkb_ctx *ctx, const struct xkb_rule_names *names, enum xkb_map_compile_flags flags); -/** - * Deprecated entrypoint for legacy users who need to be able to compile - * XKB keymaps by KcCGST (Keycodes + Compat + Geometry + Symbols + Types) - * names. - * - * You should not use this unless you are the X server. This entrypoint - * may well disappear in future releases. Please, please, don't use it. - * - * Geometry will be ignored since xkbcommon does not support it in any way. - */ -struct xkb_keymap * -xkb_map_new_from_kccgst(struct xkb_ctx *ctx, - 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. */ XKB_KEYMAP_FORMAT_TEXT_V1 = 1, |