From 900d3287f9b63df6320fa159aa0a842e8e8afd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 5 Jun 2019 17:34:28 +0200 Subject: [PATCH] swaybar/nag: use xcursor theme defined by XCURSOR_THEME/SIZE If the XCURSOR_THEME and/or XCURSOR_SIZE environment variables are set, use the theme and size they define. If they're not set, use the same defaults as before (system default theme, size=24). --- swaybar/input.c | 14 ++++++++++++-- swaynag/swaynag.c | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/swaybar/input.c b/swaybar/input.c index 929721465..8a83f38f8 100644 --- a/swaybar/input.c +++ b/swaybar/input.c @@ -67,9 +67,19 @@ void update_cursor(struct swaybar_seat *seat) { if (pointer->cursor_theme) { wl_cursor_theme_destroy(pointer->cursor_theme); } + const char *cursor_theme = getenv("XCURSOR_THEME"); + unsigned cursor_size = 24; + const char *env_cursor_size = getenv("XCURSOR_SIZE"); + if (env_cursor_size) { + char *end; + unsigned size = strtoul(env_cursor_size, &end, 10); + if (!*end) { + cursor_size = size; + } + } int scale = pointer->current ? pointer->current->scale : 1; - pointer->cursor_theme = wl_cursor_theme_load(NULL, 24 * scale, - seat->bar->shm); + pointer->cursor_theme = wl_cursor_theme_load( + cursor_theme, cursor_size * scale, seat->bar->shm); struct wl_cursor *cursor; cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr"); pointer->cursor_image = cursor->images[0]; diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c index 26411ab31..87199a741 100644 --- a/swaynag/swaynag.c +++ b/swaynag/swaynag.c @@ -129,8 +129,18 @@ static void update_cursor(struct swaynag *swaynag) { if (swaynag->pointer.cursor_theme) { wl_cursor_theme_destroy(swaynag->pointer.cursor_theme); } - pointer->cursor_theme = wl_cursor_theme_load(NULL, 24 * swaynag->scale, - swaynag->shm); + const char *cursor_theme = getenv("XCURSOR_THEME"); + unsigned cursor_size = 24; + const char *env_cursor_size = getenv("XCURSOR_SIZE"); + if (env_cursor_size) { + char *end; + unsigned size = strtoul(env_cursor_size, &end, 10); + if (!*end) { + cursor_size = size; + } + } + pointer->cursor_theme = wl_cursor_theme_load( + cursor_theme, cursor_size * swaynag->scale, swaynag->shm); struct wl_cursor *cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr"); pointer->cursor_image = cursor->images[0];