diff options
| author | emersion <contact@emersion.fr> | 2017-11-19 22:28:51 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-11-19 22:28:51 +0100 |
| commit | 7904b625f0c6a8cef684d60ba136de1ba48e848e (patch) | |
| tree | 3d7001509a6229e1b17a0f4c26960e720857c8a9 /rootston/desktop.c | |
| parent | 7375931686e6a58c08a7727ce2f5d88e0be9adfa (diff) | |
| parent | fae8d6289a470b8abcf36a5f4b0030ef504caf0b (diff) | |
Merge branch 'master' into laggy-move-resize
Diffstat (limited to 'rootston/desktop.c')
| -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 fca801bb..b3287ed0 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -343,10 +343,18 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->server = server; desktop->config = config; - desktop->xcursor_manager = wlr_xcursor_manager_create(NULL, + const char *cursor_theme = NULL; + struct roots_cursor_config *cc = + roots_config_get_cursor(config, ROOTS_CONFIG_DEFAULT_SEAT_NAME); + if (cc != NULL) { + cursor_theme = cc->theme; + } + + desktop->xcursor_manager = wlr_xcursor_manager_create(cursor_theme, ROOTS_XCURSOR_SIZE); if (desktop->xcursor_manager == NULL) { - wlr_log(L_ERROR, "Cannot create XCursor manager"); + wlr_log(L_ERROR, "Cannot create XCursor manager for theme %s", + cursor_theme); wlr_list_free(desktop->views); free(desktop); return NULL; |