Merge pull request #788 from emersion/xwm-cursor-stride

xwayland: specify xwm cursor stride in bytes
This commit is contained in:
Drew DeVault 2018-03-31 00:28:01 -04:00 committed by GitHub
commit 3041612363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions

View File

@ -834,7 +834,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
if (xcursor != NULL) { if (xcursor != NULL) {
struct wlr_xcursor_image *image = xcursor->images[0]; struct wlr_xcursor_image *image = xcursor->images[0];
wlr_xwayland_set_cursor(desktop->xwayland, image->buffer, wlr_xwayland_set_cursor(desktop->xwayland, image->buffer,
image->width, image->width, image->height, image->hotspot_x, image->width * 4, image->width, image->height, image->hotspot_x,
image->hotspot_y); image->hotspot_y);
} }
} }

View File

@ -1378,7 +1378,6 @@ void xwm_set_cursor(struct wlr_xwm *xwm, const uint8_t *pixels, uint32_t stride,
xcb_free_cursor(xwm->xcb_conn, xwm->cursor); xcb_free_cursor(xwm->xcb_conn, xwm->cursor);
} }
stride *= 4;
int depth = 32; int depth = 32;
xcb_pixmap_t pix = xcb_generate_id(xwm->xcb_conn); xcb_pixmap_t pix = xcb_generate_id(xwm->xcb_conn);