From 865b0aa123172852b49df4178437e6e8a020bc60 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 30 Mar 2018 11:01:23 -0400 Subject: xwayland: rename map_notify to map for consistency --- xwayland/xwm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'xwayland') diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 8911c553..2743cc53 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -107,8 +107,8 @@ static struct wlr_xwayland_surface *wlr_xwayland_surface_create( wl_signal_init(&surface->events.request_resize); wl_signal_init(&surface->events.request_maximize); wl_signal_init(&surface->events.request_fullscreen); - wl_signal_init(&surface->events.map_notify); - wl_signal_init(&surface->events.unmap_notify); + wl_signal_init(&surface->events.map); + wl_signal_init(&surface->events.unmap); wl_signal_init(&surface->events.set_class); wl_signal_init(&surface->events.set_title); wl_signal_init(&surface->events.set_parent); @@ -581,7 +581,7 @@ static void xwm_map_shell_surface(struct wlr_xwm *xwm, wl_signal_add(&surface->events.destroy, &xsurface->surface_destroy); xsurface->mapped = true; - wlr_signal_emit_safe(&xsurface->events.map_notify, xsurface); + wlr_signal_emit_safe(&xsurface->events.map, xsurface); } static void xwm_handle_create_notify(struct wlr_xwm *xwm, @@ -713,7 +713,7 @@ static void xwm_handle_unmap_notify(struct wlr_xwm *xwm, if (xsurface->mapped) { xsurface->mapped = false; - wlr_signal_emit_safe(&xsurface->events.unmap_notify, xsurface); + wlr_signal_emit_safe(&xsurface->events.unmap, xsurface); } xsurface_set_wm_state(xsurface, ICCCM_WITHDRAWN_STATE); @@ -1531,4 +1531,3 @@ bool xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms, return false; } - -- cgit v1.2.3 From 692f1746cff0377393011f698484dc4f6cf030b8 Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 31 Mar 2018 00:22:58 -0400 Subject: xwayland: specify xwm cursor stride in bytes --- rootston/desktop.c | 2 +- xwayland/xwm.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'xwayland') 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); -- cgit v1.2.3