Merge branch 'release-4.16.1'

[i3/i3] / i3-config-wizard / xcb.h

diff --git a/i3-config-wizard/xcb.h b/i3-config-wizard/xcb.h
index e66d3fa94df77fd448d9ca7b28440557590084a1..f3e204e8ecf2c60891e56f64d04096a827cef6fa 100644 (file)
--- a/i3-config-wizard/xcb.h
+++ b/i3-config-wizard/xcb.h
@@ -1,15 +1,8 @@
-#ifndef _XCB_H
-#define _XCB_H
+#pragma once
 
 /* from X11/keysymdef.h */
-#define XCB_NUM_LOCK                    0xff7f
+#define XCB_NUM_LOCK 0xff7f
 
-extern unsigned int xcb_numlock_mask;
-
-void xcb_change_gc_single(xcb_connection_t *conn, xcb_gcontext_t gc, uint32_t mask, uint32_t value);
-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);
-
-#endif
+#define xmacro(atom) xcb_atom_t A_##atom;
+#include "atoms.xmacro"
+#undef xmacro