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

Fix hidden cursor when output is added before cursor

This commit is contained in:
emersion 2017-11-12 22:11:17 +01:00
parent 28fc813ca9
commit 2e312a7e27
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rootston/seat.c
View File

@ -189,12 +189,11 @@ static void roots_seat_init_cursor(struct roots_seat *seat) {
// TODO: be able to configure per-seat cursor themes // TODO: be able to configure per-seat cursor themes
seat->cursor->xcursor_manager = desktop->xcursor_manager; seat->cursor->xcursor_manager = desktop->xcursor_manager;
wlr_xcursor_manager_set_cursor_image(seat->cursor->xcursor_manager,
ROOTS_XCURSOR_DEFAULT, wlr_cursor);
wl_list_init(&seat->cursor->touch_points); wl_list_init(&seat->cursor->touch_points);
roots_seat_configure_cursor(seat); roots_seat_configure_cursor(seat);
roots_seat_configure_xcursor(seat);
// add input signals // add input signals
wl_signal_add(&wlr_cursor->events.motion, &seat->cursor->motion); wl_signal_add(&wlr_cursor->events.motion, &seat->cursor->motion);
@ -448,6 +447,16 @@ void roots_seat_remove_device(struct roots_seat *seat,
} }
void roots_seat_configure_xcursor(struct roots_seat *seat) { void roots_seat_configure_xcursor(struct roots_seat *seat) {
struct roots_output *output;
wl_list_for_each(output, &seat->input->server->desktop->outputs, link) {
if (wlr_xcursor_manager_load(seat->cursor->xcursor_manager,
output->wlr_output->scale)) {
wlr_log(L_ERROR, "Cannot load xcursor theme for output '%s' "
"with scale %d", output->wlr_output->name,
output->wlr_output->scale);
}
}
wlr_xcursor_manager_set_cursor_image(seat->cursor->xcursor_manager, wlr_xcursor_manager_set_cursor_image(seat->cursor->xcursor_manager,
ROOTS_XCURSOR_DEFAULT, seat->cursor->cursor); ROOTS_XCURSOR_DEFAULT, seat->cursor->cursor);
wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x, wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,