Merge branch 'master' into next

[i3/i3] / i3-input / i3-input.h

diff --git a/i3-input/i3-input.h b/i3-input/i3-input.h
index 581203d4b19682683954200142eb42852de5cd7b..fcf9edc3d3138ac24a644cee60adb8f85b9e6bdf 100644 (file)
--- a/i3-input/i3-input.h
+++ b/i3-input/i3-input.h
@@ -1,28 +1,14 @@
-#ifndef _I3_INPUT
-#define _I3_INPUT
+#pragma once
 
 #include <err.h>
 
 #define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
-#define FREE(pointer) do { \
+#define FREE(pointer)          \
+    do {                       \
         if (pointer != NULL) { \
-                free(pointer); \
-                pointer = NULL; \
-        } \
-} \
-while (0)
+            free(pointer);     \
+            pointer = NULL;    \
+        }                      \
+    } while (0)
 
 extern xcb_window_t root;
-
-char *convert_ucs_to_utf8(char *input);
-char *convert_utf8_to_ucs2(char *input, int *real_strlen);
-uint32_t get_colorpixel(xcb_connection_t *conn, char *hex);
-uint32_t get_mod_mask(xcb_connection_t *conn, uint32_t keycode);
-int connect_ipc(char *socket_path);
-void ipc_send_message(int sockfd, uint32_t message_size,
-                      uint32_t message_type, uint8_t *payload);
-xcb_window_t open_input_window(xcb_connection_t *conn, uint32_t width, uint32_t height);
-int get_font_id(xcb_connection_t *conn, char *pattern, int *font_height);
-void xcb_change_gc_single(xcb_connection_t *conn, xcb_gcontext_t gc, uint32_t mask, uint32_t value);
-
-#endif