alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

swaybar/nag: use xcursor theme defined by XCURSOR_THEME/SIZE

Browse source 
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).
This commit is contained in:
Daniel Eklöf 2019-06-05 17:34:28 +02:00 committed by Brian Ashworth
parent f0f5de9a9e
commit 900d3287f9
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
swaybar/input.c
View file

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

14
swaynag/swaynag.c
View file

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