diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-03-31 00:28:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 00:28:01 -0400 |
| commit | 30416123632cc0d52d8610036fc129ceb4cc02b3 (patch) | |
| tree | fd9ea06fb4c2df95156a834d6ad8bc678ebcf62d | |
| parent | 23d357e371fd49243a6f2989058b25c599888505 (diff) | |
| parent | 692f1746cff0377393011f698484dc4f6cf030b8 (diff) | |
Merge pull request #788 from emersion/xwm-cursor-stride
xwayland: specify xwm cursor stride in bytes
| -rw-r--r-- | rootston/desktop.c | 2 | ||||
| -rw-r--r-- | xwayland/xwm.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 1d2e9549..0668d8cb 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -834,7 +834,7 @@ struct roots_desktop *desktop_create(struct roots_server *server, if (xcursor != NULL) { struct wlr_xcursor_image *image = xcursor->images[0]; 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); } } diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 2743cc53..6702c3c9 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -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); } - stride *= 4; int depth = 32; xcb_pixmap_t pix = xcb_generate_id(xwm->xcb_conn); |