Merge branch 'release-4.16.1'

[i3/i3] / include / xcursor.h

diff --git a/include/xcursor.h b/include/xcursor.h
index 1872fa0e3d628444b5b5ff0827070abc9fc0341b..804e1f84c211a20c115942ee1e0c3ac33b54abe8 100644 (file)
--- a/include/xcursor.h
+++ b/include/xcursor.h
@@ -1,20 +1,44 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * xcursor.c: libXcursor support for themed cursors.
+ *
  */
-#ifndef _XCURSOR_CURSOR_H
-#define _XCURSOR_CURSOR_H
+#pragma once
 
-#include <X11/Xlib.h>
+#include <config.h>
+
+#include <xcb/xcb_cursor.h>
 
 enum xcursor_cursor_t {
     XCURSOR_CURSOR_POINTER = 0,
     XCURSOR_CURSOR_RESIZE_HORIZONTAL,
     XCURSOR_CURSOR_RESIZE_VERTICAL,
+    XCURSOR_CURSOR_TOP_LEFT_CORNER,
+    XCURSOR_CURSOR_TOP_RIGHT_CORNER,
+    XCURSOR_CURSOR_BOTTOM_LEFT_CORNER,
+    XCURSOR_CURSOR_BOTTOM_RIGHT_CORNER,
+    XCURSOR_CURSOR_WATCH,
+    XCURSOR_CURSOR_MOVE,
     XCURSOR_CURSOR_MAX
 };
 
-extern void xcursor_load_cursors();
-extern Cursor xcursor_get_cursor(enum xcursor_cursor_t c);
-extern int xcursor_get_xcb_cursor(enum xcursor_cursor_t c);
+void xcursor_load_cursors(void);
+xcb_cursor_t xcursor_get_cursor(enum xcursor_cursor_t c);
+int xcursor_get_xcb_cursor(enum xcursor_cursor_t c);
 
-#endif
+/**
+ * Sets the cursor of the root window to the 'pointer' cursor.
+ *
+ * This function is called when i3 is initialized, because with some login
+ * managers, the root window will not have a cursor otherwise.
+ *
+ * We have a separate xcursor function to use the same X11 connection as the
+ * xcursor_load_cursors() function. If we mix the Xlib and the XCB connection,
+ * races might occur (even though we flush the Xlib connection).
+ *
+ */
+void xcursor_set_root_cursor(int cursor_id);