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 98a6374..584dea6 100644 (file)
--- a/src/text.h
+++ b/src/text.h
@@ -24,8 +24,6 @@
 #ifndef TEXT_H
 #define TEXT_H
 
-#include "xkb-priv.h"
-
 typedef struct {
     const char *name;
     unsigned int value;
@@ -50,30 +48,29 @@ extern const LookupEntry actionTypeNames[];
 extern const LookupEntry symInterpretMatchMaskNames[];
 
 const char *
-VModMaskText(struct xkb_keymap *keymap, xkb_mod_mask_t cmask);
-
-xkb_mod_index_t
-ModNameToIndex(const char *name);
+ModMaskText(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+            xkb_mod_mask_t mask);
 
 const char *
-ModIndexToName(xkb_mod_index_t ndx);
+ModIndexText(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+             xkb_mod_index_t ndx);
 
 const char *
-ModIndexText(xkb_mod_index_t ndx);
+ActionTypeText(enum xkb_action_type type);
 
 const char *
-ModMaskText(xkb_mod_mask_t mask);
+KeysymText(struct xkb_context *ctx, xkb_keysym_t sym);
 
 const char *
-ActionTypeText(unsigned type);
+KeyNameText(struct xkb_context *ctx, xkb_atom_t name);
 
 const char *
-KeysymText(xkb_keysym_t sym);
+SIMatchText(enum xkb_match_operation type);
 
 const char *
-KeyNameText(const char name[XKB_KEY_NAME_LENGTH]);
+LedStateMaskText(struct xkb_context *ctx, enum xkb_state_component mask);
 
 const char *
-SIMatchText(unsigned type);
+ControlMaskText(struct xkb_context *ctx, enum xkb_action_controls mask);
 
 #endif /* TEXT_H */