Merge branch 'master' into feature/xdg-popup

This commit is contained in:
Tony Crisci 2017-10-07 13:04:04 -04:00
commit 4f848000af
27 changed files with 204 additions and 66 deletions

View file

@ -169,7 +169,8 @@ void output_add_notify(struct wl_listener *listener, void *data) {
// TODO the cursor must be set depending on which surface it is displayed
// over which should happen in the compositor.
if (!wlr_output_set_cursor(wlr_output, image->buffer,
image->width, image->width, image->height)) {
image->width, image->width, image->height,
image->hotspot_x, image->hotspot_y)) {
wlr_log(L_DEBUG, "Failed to set hardware cursor");
return;
}