Merge branch 'wlroots' into feature/input

This commit is contained in:
Tony Crisci 2017-12-16 07:33:23 -05:00
commit 9fa70ce426
14 changed files with 648 additions and 37 deletions

View file

@ -140,7 +140,8 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
}
cursor->seat = seat;
wlr_cursor_attach_output_layout(wlr_cursor, root_container.output_layout);
wlr_cursor_attach_output_layout(wlr_cursor,
root_container.sway_root->output_layout);
// input events
wl_signal_add(&wlr_cursor->events.motion, &cursor->motion);