Merge branch 'fix-split-indicator'

[i3/i3] / src / xcursor.c

diff --git a/src/xcursor.c b/src/xcursor.c
index 2e21aab1b38ba0b66fe9b5b78f67c96c884fa79c..7683b0d37ed8fd76c0330200b4650440ea8b53ab 100644 (file)
--- a/src/xcursor.c
+++ b/src/xcursor.c
@@ -1,3 +1,14 @@
+#undef I3__FILE__
+#define I3__FILE__ "xcursor.c"
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * xcursor.c: libXcursor support for themed cursors.
+ *
+ */
 #include <assert.h>
 #include <X11/Xcursor/Xcursor.h>
 #include <X11/cursorfont.h>
@@ -11,32 +22,48 @@ static Cursor cursors[XCURSOR_CURSOR_MAX];
 static const int xcb_cursors[XCURSOR_CURSOR_MAX] = {
     XCB_CURSOR_LEFT_PTR,
     XCB_CURSOR_SB_H_DOUBLE_ARROW,
-    XCB_CURSOR_SB_V_DOUBLE_ARROW
+    XCB_CURSOR_SB_V_DOUBLE_ARROW,
+    XCB_CURSOR_WATCH
 };
 
-static Cursor load_cursor(const char *name, int font)
-{
+static Cursor load_cursor(const char *name) {
     Cursor c = XcursorLibraryLoadCursor(xlibdpy, name);
     if (c == None)
-        c = XCreateFontCursor(xlibdpy, font);
+        xcursor_supported = false;
     return c;
 }
 
-void xcursor_load_cursors()
-{
-    cursors[XCURSOR_CURSOR_POINTER] = load_cursor("left_ptr", XC_left_ptr);
-    cursors[XCURSOR_CURSOR_RESIZE_HORIZONTAL] = load_cursor("sb_h_double_arrow", XC_sb_h_double_arrow);
-    cursors[XCURSOR_CURSOR_RESIZE_VERTICAL] = load_cursor("sb_v_double_arrow", XC_sb_v_double_arrow);
+void xcursor_load_cursors(void) {
+    cursors[XCURSOR_CURSOR_POINTER] = load_cursor("left_ptr");
+    cursors[XCURSOR_CURSOR_RESIZE_HORIZONTAL] = load_cursor("sb_h_double_arrow");
+    cursors[XCURSOR_CURSOR_RESIZE_VERTICAL] = load_cursor("sb_v_double_arrow");
+    cursors[XCURSOR_CURSOR_WATCH] = load_cursor("watch");
 }
 
-Cursor xcursor_get_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(int cursor_id) {
+    XSetWindowAttributes attributes;
+    attributes.cursor = xcursor_get_cursor(cursor_id);
+    XChangeWindowAttributes(xlibdpy, DefaultRootWindow(xlibdpy), CWCursor, &attributes);
+    XFlush(xlibdpy);
+}
+
+Cursor xcursor_get_cursor(enum xcursor_cursor_t c) {
     assert(c >= 0 && c < XCURSOR_CURSOR_MAX);
     return cursors[c];
 }
 
-int xcursor_get_xcb_cursor(enum xcursor_cursor_t c)
-{
+int xcursor_get_xcb_cursor(enum xcursor_cursor_t c) {
     assert(c >= 0 && c < XCURSOR_CURSOR_MAX);
     return xcb_cursors[c];
 }