diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-12-09 13:46:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 13:46:27 -0500 |
| commit | b1b1533d94621cf3048a9d74511af172407b44e6 (patch) | |
| tree | 8cb9092aceb2ff295ad5bb84d534c4c97a25a7b0 | |
| parent | eb4e91f96d206ff05ac7f6bb1972bf48f45e5e5e (diff) | |
| parent | b275d44bc3226fdd38ee1f983769697751af5740 (diff) | |
Merge pull request #477 from acrisci/bug/xcursor-fixes
rootston xcursor fixes
| -rw-r--r-- | rootston/output.c | 7 | ||||
| -rw-r--r-- | rootston/seat.c | 14 |
2 files changed, 8 insertions, 13 deletions
diff --git a/rootston/output.c b/rootston/output.c index aace1991..cf2ffdc3 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -6,7 +6,6 @@ #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_wl_shell.h> -#include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xdg_shell_v6.h> #include <wlr/render/matrix.h> #include <wlr/util/log.h> @@ -324,12 +323,6 @@ void output_add_notify(struct wl_listener *listener, void *data) { struct roots_seat *seat; wl_list_for_each(seat, &input->seats, link) { - if (wlr_xcursor_manager_load(seat->cursor->xcursor_manager, - wlr_output->scale)) { - wlr_log(L_ERROR, "Cannot load xcursor theme for output '%s' " - "with scale %d", wlr_output->name, wlr_output->scale); - } - roots_seat_configure_cursor(seat); roots_seat_configure_xcursor(seat); } diff --git a/rootston/seat.c b/rootston/seat.c index 1fa09ad6..cb245ca8 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -444,12 +444,14 @@ void roots_seat_configure_xcursor(struct roots_seat *seat) { cursor_theme = cc->theme; } - seat->cursor->xcursor_manager = - wlr_xcursor_manager_create(cursor_theme, ROOTS_XCURSOR_SIZE); - if (seat->cursor->xcursor_manager == NULL) { - wlr_log(L_ERROR, "Cannot create XCursor manager for theme %s", - cursor_theme); - return; + if (!seat->cursor->xcursor_manager) { + seat->cursor->xcursor_manager = + wlr_xcursor_manager_create(cursor_theme, ROOTS_XCURSOR_SIZE); + if (seat->cursor->xcursor_manager == NULL) { + wlr_log(L_ERROR, "Cannot create XCursor manager for theme %s", + cursor_theme); + return; + } } struct roots_output *output; |