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 d0861cedabb0a61c4592d7c9bd341ecd5b06c089..f1d5f077f4cf421d184aae3f6fb897bba8a5fafd 100644 (file)
--- a/i3-input/i3-input.h
+++ b/i3-input/i3-input.h
@@ -1,5 +1,5 @@
-#ifndef _I3_INPUT
-#define _I3_INPUT
+#ifndef I3_INPUT
+#define I3_INPUT
 
 #include <err.h>
 
@@ -14,13 +14,4 @@ while (0)
 
 extern xcb_window_t root;
 
-char *convert_ucs_to_utf8(char *input);
-char *convert_utf8_to_ucs2(char *input, int *real_strlen);
-int connect_ipc(char *socket_path);
-uint32_t get_colorpixel(xcb_connection_t *conn, char *hex);
-uint32_t get_mod_mask(xcb_connection_t *conn, uint32_t keycode);
-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