koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch from libXcursor to xcb-util-cursor

Browse Source
This commit is contained in:
Michael Stapelberg
2013-07-13 10:58:06 +02:00
parent 3216cc79de
commit da20cd397c
6 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/xcursor.c
View File

@ -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];
}