diff options
| author | emersion <contact@emersion.fr> | 2017-12-14 11:20:38 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-12-14 11:20:38 +0100 |
| commit | 6ef021976384163cf9fde90d635a2e22479d107a (patch) | |
| tree | 2c426fa4ce6b30b29bed1fb567ffc74a7d60009f /rootston/desktop.c | |
| parent | 4da404818957d37fba4c0d6346a5f2f8a8e6db38 (diff) | |
| parent | a9fb071d49b244b72846b384a9e2ef2d9b03a05f (diff) | |
Merge branch 'master' into xwm-selection
Diffstat (limited to 'rootston/desktop.c')
| -rw-r--r-- | rootston/desktop.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 244f7c94..ef459e69 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -408,10 +408,14 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->config = config; const char *cursor_theme = NULL; + const char *cursor_default = ROOTS_XCURSOR_DEFAULT; struct roots_cursor_config *cc = roots_config_get_cursor(config, ROOTS_CONFIG_DEFAULT_SEAT_NAME); if (cc != NULL) { cursor_theme = cc->theme; + if (cc->default_image != NULL) { + cursor_default = cc->default_image; + } } desktop->xcursor_manager = wlr_xcursor_manager_create(cursor_theme, @@ -449,7 +453,7 @@ struct roots_desktop *desktop_create(struct roots_server *server, wlr_log(L_ERROR, "Cannot load XWayland XCursor theme"); } struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor( - desktop->xcursor_manager, ROOTS_XCURSOR_DEFAULT, 1); + desktop->xcursor_manager, cursor_default, 1); if (xcursor != NULL) { struct wlr_xcursor_image *image = xcursor->images[0]; wlr_xwayland_set_cursor(desktop->xwayland, image->buffer, |