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 7991b88..584dea6 100644 (file)
--- a/src/text.h
+++ b/src/text.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009  Dan Nicholson
+ * Copyright © 2009 Dan Nicholson
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -8,52 +8,69 @@
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the names of the authors or their
- * institutions shall not be used in advertising or otherwise to promote the
- * sale, use or other dealings in this Software without prior written
- * authorization from the authors.
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef TEXT_H
 #define TEXT_H
 
-#include "xkb-priv.h"
+typedef struct {
+    const char *name;
+    unsigned int value;
+} LookupEntry;
+
+bool
+LookupString(const LookupEntry tab[], const char *string,
+              unsigned int *value_rtrn);
 
 const char *
-VModMaskText(struct xkb_keymap *keymap, xkb_mod_mask_t cmask);
+LookupValue(const LookupEntry tab[], unsigned int value);
 
-xkb_mod_index_t
-ModNameToIndex(const char *name);
+extern const LookupEntry ctrlMaskNames[];
+extern const LookupEntry modComponentMaskNames[];
+extern const LookupEntry groupComponentMaskNames[];
+extern const LookupEntry groupMaskNames[];
+extern const LookupEntry groupNames[];
+extern const LookupEntry levelNames[];
+extern const LookupEntry buttonNames[];
+extern const LookupEntry useModMapValueNames[];
+extern const LookupEntry actionTypeNames[];
+extern const LookupEntry symInterpretMatchMaskNames[];
+
+const char *
+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[XkbKeyNameLength]);
+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 */