Modify a dependancy for install a keymap file e-tizen-data to xkb-data

[platform/upstream/libxkbcommon.git] / tools / tools-common.h

diff --git a/tools/tools-common.h b/tools/tools-common.h
index bc6fa38..cc7771b 100644 (file)
--- a/tools/tools-common.h
+++ b/tools/tools-common.h
@@ -34,11 +34,38 @@
 #include "xkbcommon/xkbcommon.h"
 #include "xkbcommon/xkbcommon-compose.h"
 
+#define ARRAY_SIZE(arr) ((sizeof(arr) / sizeof(*(arr))))
+
+/* Fields that are printed in the interactive tools. */
+enum print_state_fields {
+#ifdef ENABLE_PRIVATE_APIS
+    PRINT_MODMAPS = (1u << 1),
+#endif
+    PRINT_LAYOUT = (1u << 2),
+    PRINT_UNICODE = (1u << 3),
+    PRINT_ALL_FIELDS = ((PRINT_UNICODE << 1) - 1),
+    /*
+     * Fields that can be hidden with the option --short.
+     * NOTE: If this value is modified, remember to update the documentation of
+     *       the --short option in the corresponding tools.
+     */
+    PRINT_VERBOSE_FIELDS = (PRINT_LAYOUT | PRINT_UNICODE)
+};
+typedef uint32_t print_state_fields_mask_t;
+
+#ifdef ENABLE_PRIVATE_APIS
+void
+print_keymap_modmaps(struct xkb_keymap *keymap);
+void
+print_keys_modmaps(struct xkb_keymap *keymap);
+#endif
+
 void
 tools_print_keycode_state(struct xkb_state *state,
                           struct xkb_compose_state *compose_state,
                           xkb_keycode_t keycode,
-                          enum xkb_consumed_mode consumed_mode);
+                          enum xkb_consumed_mode consumed_mode,
+                          print_state_fields_mask_t fields);
 
 void
 tools_print_state_changes(enum xkb_state_component changed);
@@ -52,7 +79,7 @@ tools_enable_stdin_echo(void);
 int
 tools_exec_command(const char *prefix, int argc, char **argv);
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #define setenv(varname, value, overwrite) _putenv_s((varname), (value))
 #define unsetenv(varname) _putenv_s(varname, "")
 #endif