Merge branch 'master' into next

[i3/i3] / include / xcursor.h

diff --git a/include/xcursor.h b/include/xcursor.h
index 4b5326d5e61021eb4d3811653288ce69d050fc80..e129a36fe11a39db36f3378e7b102647d1f2f149 100644 (file)
--- a/include/xcursor.h
+++ b/include/xcursor.h
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ */
 #ifndef _XCURSOR_CURSOR_H
 #define _XCURSOR_CURSOR_H
 
@@ -10,8 +13,21 @@ enum xcursor_cursor_t {
     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();
+Cursor xcursor_get_cursor(enum xcursor_cursor_t c);
+int xcursor_get_xcb_cursor(enum xcursor_cursor_t c);
+
+/**
+ * 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();
 
 #endif