diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-11-18 11:53:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-18 11:53:00 -0500 |
| commit | 9f552d896f7639fca7914a9313ccb244688349e4 (patch) | |
| tree | 5428f105d70715fd9004d64f11012ec3fac710fe /rootston/desktop.c | |
| parent | bf5640db128b930b38ebca2b1d8a79e028ad9f39 (diff) | |
| parent | 5b13f51dfc72493beb1ee0e95ae1eea9e53b8681 (diff) | |
Merge pull request #429 from emersion/config-cursor-theme
Add cursor theme to rootston config
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 1695d007..3bc5e748 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -338,10 +338,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; |