Move STRINGIFY to utils.h and add STRINGIFY2

[platform/upstream/libxkbcommon.git] / src / text.h

diff --git a/src/text.h b/src/text.h
index 32115c8..584dea6 100644 (file)
--- a/src/text.h
+++ b/src/text.h
@@ -48,20 +48,18 @@ extern const LookupEntry actionTypeNames[];
 extern const LookupEntry symInterpretMatchMaskNames[];
 
 const char *
-ModMaskText(const struct xkb_keymap *keymap, xkb_mod_mask_t mask);
+ModMaskText(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+            xkb_mod_mask_t mask);
 
 const char *
-ModIndexText(const struct xkb_keymap *keymap, xkb_mod_index_t ndx);
-
-xkb_mod_index_t
-ModNameToIndex(const struct xkb_keymap *keymap, xkb_atom_t name,
-               enum mod_type type);
+ModIndexText(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+             xkb_mod_index_t ndx);
 
 const char *
 ActionTypeText(enum xkb_action_type type);
 
 const char *
-KeysymText(xkb_keysym_t sym);
+KeysymText(struct xkb_context *ctx, xkb_keysym_t sym);
 
 const char *
 KeyNameText(struct xkb_context *ctx, xkb_atom_t name);
@@ -69,4 +67,10 @@ KeyNameText(struct xkb_context *ctx, xkb_atom_t name);
 const char *
 SIMatchText(enum xkb_match_operation type);
 
+const char *
+LedStateMaskText(struct xkb_context *ctx, enum xkb_state_component mask);
+
+const char *
+ControlMaskText(struct xkb_context *ctx, enum xkb_action_controls mask);
+
 #endif /* TEXT_H */