pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

bar: do generic cursor stuff in bar, not in backend

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-29 21:05:28 +01:00
parent 0684aaaf95
commit 7f1567c973
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bar/bar.c
View file

@ -156,6 +156,13 @@ static void
set_cursor(struct bar *bar, const char *cursor) set_cursor(struct bar *bar, const char *cursor)
{ {
struct private *b = bar->private; struct private *b = bar->private;
if (b->cursor_name != NULL && strcmp(b->cursor_name, cursor) == 0)
return;
free(b->cursor_name);
b->cursor_name = strdup(cursor);
b->backend.iface->set_cursor(bar, cursor); b->backend.iface->set_cursor(bar, cursor);
} }

6
bar/xcb.c
View file

@ -392,19 +392,13 @@ set_cursor(struct bar *_bar, const char *cursor)
struct private *bar = _bar->private; struct private *bar = _bar->private;
struct xcb_backend *backend = bar->backend.data; struct xcb_backend *backend = bar->backend.data;
if (bar->cursor_name != NULL && strcmp(bar->cursor_name, cursor) == 0)
return;
if (backend->cursor_ctx == NULL) if (backend->cursor_ctx == NULL)
return; return;
if (backend->cursor != 0) { if (backend->cursor != 0) {
xcb_free_cursor(backend->conn, backend->cursor); xcb_free_cursor(backend->conn, backend->cursor);
free(bar->cursor_name);
bar->cursor_name = NULL;
} }
bar->cursor_name = strdup(cursor);
backend->cursor = xcb_cursor_load_cursor(backend->cursor_ctx, cursor); backend->cursor = xcb_cursor_load_cursor(backend->cursor_ctx, cursor);
xcb_change_window_attributes( xcb_change_window_attributes(
backend->conn, backend->win, XCB_CW_CURSOR, &backend->cursor); backend->conn, backend->win, XCB_CW_CURSOR, &backend->cursor);