diff options
| author | emersion <contact@emersion.fr> | 2017-12-11 16:14:03 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-12-11 16:14:03 +0100 |
| commit | c67a5824b8831b50e9f3b09cc182f496fb973321 (patch) | |
| tree | 0a4f6090819e680bcd611388c8cbe867fbb4983a /rootston/desktop.c | |
| parent | 6001235b0465ba1961f8abd66a860bcf1f14fc22 (diff) | |
| parent | 808ab5aa1bd990776ae30d5f9bb171ca7b42d6ef (diff) | |
Merge branch 'master' into display-destroy
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, |