diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-09 00:00:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 00:00:12 +0200 |
| commit | 75005fd58dcf82f8775e1216fb98c9ad3287d116 (patch) | |
| tree | 433db43681ba76903728bbd87e9aaad923f43384 | |
| parent | 885586a831437c1f9b5bff74fc48e64c2ed9669e (diff) | |
| parent | 3a181ab430997aaf03a75cbe3b79b0fc56ec96c3 (diff) | |
Merge pull request #1294 from emersion/xcursor-env-config
rootston: export XCURSOR_SIZE and XCURSOR_THEME
| -rw-r--r-- | rootston/desktop.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 7f749050..2b0cba6d 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -1,4 +1,4 @@ -#define _POSIX_C_SOURCE 199309L +#define _POSIX_C_SOURCE 200112L #include <assert.h> #include <math.h> #include <stdlib.h> @@ -881,7 +881,6 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->tablet_v2 = wlr_tablet_v2_create(server->wl_display); -#ifdef WLR_HAS_XWAYLAND const char *cursor_theme = NULL; const char *cursor_default = ROOTS_XCURSOR_DEFAULT; struct roots_cursor_config *cc = @@ -893,6 +892,15 @@ struct roots_desktop *desktop_create(struct roots_server *server, } } + char cursor_size_fmt[16]; + snprintf(cursor_size_fmt, sizeof(cursor_size_fmt), + "%d", ROOTS_XCURSOR_SIZE); + setenv("XCURSOR_SIZE", cursor_size_fmt, 1); + if (cursor_theme != NULL) { + setenv("XCURSOR_THEME", cursor_theme, 1); + } + +#ifdef WLR_HAS_XWAYLAND desktop->xcursor_manager = wlr_xcursor_manager_create(cursor_theme, ROOTS_XCURSOR_SIZE); if (desktop->xcursor_manager == NULL) { |