blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #477 from acrisci/bug/xcursor-fixes 

rootston xcursor fixes
This commit is contained in:
Drew DeVault 2017-12-09 13:46:27 -05:00 committed by GitHub
parent eb4e91f96d b275d44bc3
commit b1b1533d94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rootston/output.c
View File

@ -6,7 +6,6 @@
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_wl_shell.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/types/wlr_xdg_shell_v6.h>
#include <wlr/render/matrix.h> #include <wlr/render/matrix.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
@ -324,12 +323,6 @@ void output_add_notify(struct wl_listener *listener, void *data) {
struct roots_seat *seat; struct roots_seat *seat;
wl_list_for_each(seat, &input->seats, link) { 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_cursor(seat);
roots_seat_configure_xcursor(seat); roots_seat_configure_xcursor(seat);
} }

14
rootston/seat.c
View File

@ -444,12 +444,14 @@ void roots_seat_configure_xcursor(struct roots_seat *seat) {
cursor_theme = cc->theme; cursor_theme = cc->theme;
} }
seat->cursor->xcursor_manager = if (!seat->cursor->xcursor_manager) {
wlr_xcursor_manager_create(cursor_theme, ROOTS_XCURSOR_SIZE); seat->cursor->xcursor_manager =
if (seat->cursor->xcursor_manager == NULL) { wlr_xcursor_manager_create(cursor_theme, ROOTS_XCURSOR_SIZE);
wlr_log(L_ERROR, "Cannot create XCursor manager for theme %s", if (seat->cursor->xcursor_manager == NULL) {
cursor_theme); wlr_log(L_ERROR, "Cannot create XCursor manager for theme %s",
return; cursor_theme);
return;
}
} }
struct roots_output *output; struct roots_output *output;