summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <michael@stapelberg.de>2013-07-13 08:58:06 (GMT)
committerMichael Stapelberg <michael@stapelberg.de>2013-08-17 07:44:20 (GMT)
commitda20cd397c5079d1950211610134ced41034d2af (patch)
tree649e1a8ce0cbab0f536fa2ba178a186d8dc5df7a
parent3216cc79deb9bfc2258220e7b18f994c7d261474 (diff)
downloadi3-da20cd397c5079d1950211610134ced41034d2af.tar.gz
i3-da20cd397c5079d1950211610134ced41034d2af.tar.bz2
switch from libXcursor to xcb-util-cursor
-rw-r--r--DEPENDS3
-rw-r--r--common.mk4
-rw-r--r--debian/control2
-rw-r--r--include/xcursor.h6
-rw-r--r--src/floating.c2
-rw-r--r--src/xcursor.c57
6 files changed, 37 insertions, 37 deletions
diff --git a/DEPENDS b/DEPENDS
index 4b09027..94bfd26 100644
--- a/DEPENDS
+++ b/DEPENDS
@@ -10,6 +10,7 @@
│ pkg-config │ 0.25 │ 0.26 │ http://pkgconfig.freedesktop.org/ │
│ libxcb │ 1.1.93 │ 1.7 │ http://xcb.freedesktop.org/dist/ │
│ xcb-util │ 0.3.3 │ 0.3.8 │ http://xcb.freedesktop.org/dist/ │
+│ util-cursor³│ 0.0.99 │ 0.0.99 │ http://xcb.freedesktop.org/dist/ │
│ libev │ 4.0 │ 4.11 │ http://libev.schmorp.de/ │
│ yajl │ 1.0.8 │ 2.0.1 │ http://lloyd.github.com/yajl/ │
│ asciidoc │ 8.3.0 │ 8.6.4 │ http://www.methods.co.nz/asciidoc/ │
@@ -26,6 +27,8 @@
¹ libsn = libstartup-notification
² Pod::Simple is a Perl module required for converting the testsuite
documentation to HTML. See http://michael.stapelberg.de/cpan/#Pod::Simple
+ ³ xcb-util-cursor, to be precise. Might be considered part of xcb-util, or not
+ :-).
i3bar, i3-msg, i3-input, i3-nagbar and i3-config-wizard do not introduce any
new dependencies.
diff --git a/common.mk b/common.mk
index de5c7e9..0214abf 100644
--- a/common.mk
+++ b/common.mk
@@ -111,8 +111,8 @@ X11_CFLAGS := $(call cflags_for_lib, x11)
X11_LIBS := $(call ldflags_for_lib, x11,X11)
# Xcursor
-XCURSOR_CFLAGS := $(call cflags_for_lib, xcursor)
-XCURSOR_LIBS := $(call ldflags_for_lib, xcursor,Xcursor)
+XCURSOR_CFLAGS := $(call cflags_for_lib, xcb-cursor)
+XCURSOR_LIBS := $(call ldflags_for_lib, xcb-cursor,xcb-cursor)
# yajl
YAJL_CFLAGS := $(call cflags_for_lib, yajl)
diff --git a/debian/control b/debian/control
index ede8650..558b012 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7.0.50~),
libxcb-xinerama0-dev (>= 1.1),
libxcb-randr0-dev,
libxcb-icccm4-dev,
- libxcursor-dev,
+ libxcb-cursor-dev,
asciidoc (>= 8.4.4),
xmlto,
docbook-xml,
diff --git a/include/xcursor.h b/include/xcursor.h
index bfe37c3..868fee7 100644
--- a/include/xcursor.h
+++ b/include/xcursor.h
@@ -2,7 +2,7 @@
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
*
* xcursor.c: libXcursor support for themed cursors.
*
@@ -10,7 +10,7 @@
#ifndef I3_XCURSOR_CURSOR_H
#define I3_XCURSOR_CURSOR_H
-#include <X11/Xlib.h>
+#include <xcb/xcb_cursor.h>
enum xcursor_cursor_t {
XCURSOR_CURSOR_POINTER = 0,
@@ -26,7 +26,7 @@ enum xcursor_cursor_t {
};
void xcursor_load_cursors(void);
-Cursor xcursor_get_cursor(enum xcursor_cursor_t c);
+xcb_cursor_t xcursor_get_cursor(enum xcursor_cursor_t c);
int xcursor_get_xcb_cursor(enum xcursor_cursor_t c);
/**
diff --git a/src/floating.c b/src/floating.c
index 643f204..97b7d88 100644
--- a/src/floating.c
+++ b/src/floating.c
@@ -569,7 +569,7 @@ void drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t
if (con != NULL)
memcpy(&old_rect, &(con->rect), sizeof(Rect));
- Cursor xcursor = (cursor && xcursor_supported) ?
+ xcb_cursor_t xcursor = (cursor && xcursor_supported) ?
xcursor_get_cursor(cursor) : XCB_NONE;
/* Grab the pointer */
diff --git a/src/xcursor.c b/src/xcursor.c
index 90fd69d..dcbe2ad 100644
--- a/src/xcursor.c
+++ b/src/xcursor.c
@@ -4,20 +4,20 @@
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
*
- * xcursor.c: libXcursor support for themed cursors.
+ * xcursor.c: xcursor support for themed cursors.
*
*/
#include <assert.h>
-#include <X11/Xcursor/Xcursor.h>
-#include <X11/cursorfont.h>
+#include <xcb/xcb_cursor.h>
#include "i3.h"
#include "xcb.h"
#include "xcursor.h"
-static Cursor cursors[XCURSOR_CURSOR_MAX];
+static xcb_cursor_context_t *ctx;
+static xcb_cursor_t cursors[XCURSOR_CURSOR_MAX];
static const int xcb_cursors[XCURSOR_CURSOR_MAX] = {
XCB_CURSOR_LEFT_PTR,
@@ -26,23 +26,26 @@ static const int xcb_cursors[XCURSOR_CURSOR_MAX] = {
XCB_CURSOR_WATCH
};
-static Cursor load_cursor(const char *name) {
- Cursor c = XcursorLibraryLoadCursor(xlibdpy, name);
- if (c == None)
- xcursor_supported = false;
- return c;
-}
-
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");
- cursors[XCURSOR_CURSOR_MOVE] = load_cursor("fleur");
- cursors[XCURSOR_CURSOR_TOP_LEFT_CORNER] = load_cursor("top_left_corner");
- cursors[XCURSOR_CURSOR_TOP_RIGHT_CORNER] = load_cursor("top_right_corner");
- cursors[XCURSOR_CURSOR_BOTTOM_LEFT_CORNER] = load_cursor("bottom_left_corner");
- cursors[XCURSOR_CURSOR_BOTTOM_RIGHT_CORNER] = load_cursor("bottom_right_corner");
+ if (xcb_cursor_context_new(conn, root_screen, &ctx) < 0) {
+ ELOG("xcursor support unavailable\n");
+ xcursor_supported = false;
+ return;
+ }
+#define LOAD_CURSOR(constant, name) \
+ do { \
+ cursors[constant] = xcb_cursor_load_cursor(ctx, name); \
+ } while (0)
+ LOAD_CURSOR(XCURSOR_CURSOR_POINTER, "left_ptr");
+ LOAD_CURSOR(XCURSOR_CURSOR_RESIZE_HORIZONTAL, "sb_h_double_arrow");
+ LOAD_CURSOR(XCURSOR_CURSOR_RESIZE_VERTICAL, "sb_v_double_arrow");
+ LOAD_CURSOR(XCURSOR_CURSOR_WATCH, "watch");
+ LOAD_CURSOR(XCURSOR_CURSOR_MOVE, "fleur");
+ LOAD_CURSOR(XCURSOR_CURSOR_TOP_LEFT_CORNER, "top_left_corner");
+ LOAD_CURSOR(XCURSOR_CURSOR_TOP_RIGHT_CORNER, "top_right_corner");
+ LOAD_CURSOR(XCURSOR_CURSOR_BOTTOM_LEFT_CORNER, "bottom_left_corner");
+ LOAD_CURSOR(XCURSOR_CURSOR_BOTTOM_RIGHT_CORNER, "bottom_right_corner");
+#undef LOAD_CURSOR
}
/*
@@ -51,19 +54,13 @@ void xcursor_load_cursors(void) {
* 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);
+ xcb_change_window_attributes(conn, root, XCB_CW_CURSOR,
+ (uint32_t[]){ xcursor_get_cursor(cursor_id) });
}
-Cursor xcursor_get_cursor(enum xcursor_cursor_t c) {
+xcb_cursor_t xcursor_get_cursor(enum xcursor_cursor_t c) {
assert(c >= 0 && c < XCURSOR_CURSOR_MAX);
return cursors[c];
}