Merge branch 'master' into next

[i3/i3] / include / xcursor.h

diff --git a/include/xcursor.h b/include/xcursor.h
index af70cf1ef44d4afb11f0d769c0cebaf7aaa19059..bfe37c3944cf098e22b91aa461cb92e7db5dde5c 100644 (file)
--- a/include/xcursor.h
+++ b/include/xcursor.h
@@ -1,8 +1,14 @@
 /*
  * 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.
+ *
  */
-#ifndef _XCURSOR_CURSOR_H
-#define _XCURSOR_CURSOR_H
+#ifndef I3_XCURSOR_CURSOR_H
+#define I3_XCURSOR_CURSOR_H
 
 #include <X11/Xlib.h>
 
@@ -10,12 +16,18 @@ 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);
+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.
@@ -28,6 +40,6 @@ extern int xcursor_get_xcb_cursor(enum xcursor_cursor_t c);
  * races might occur (even though we flush the Xlib connection).
  *
  */
-void xcursor_set_root_cursor();
+void xcursor_set_root_cursor(int cursor_id);
 
 #endif