From ea002ad5712f01e085c888cd551d7e03ac4435bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Fri, 3 Jan 2020 13:41:35 +0100 Subject: [PATCH] wayland: window: pass window pointer to xdg-surface-listener callbacks --- wayland.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wayland.c b/wayland.c index 50e2c0ff..2fcfb5be 100644 --- a/wayland.c +++ b/wayland.c @@ -509,8 +509,9 @@ xdg_surface_configure(void *data, struct xdg_surface *xdg_surface, * * So, refresh here, to ensure changes take effect as soon as possible. */ - struct wayland *wayl = data; - struct terminal *term = wayl_terminal_from_xdg_surface(wayl, xdg_surface); + struct wl_window *win = data; + struct terminal *term = win->term; + if (term->width > 0 && term->height > 0) render_refresh(term); } @@ -841,7 +842,7 @@ wayl_win_init(struct terminal *term) wl_surface_add_listener(win->surface, &surface_listener, win); win->xdg_surface = xdg_wm_base_get_xdg_surface(wayl->shell, win->surface); - xdg_surface_add_listener(win->xdg_surface, &xdg_surface_listener, wayl); + xdg_surface_add_listener(win->xdg_surface, &xdg_surface_listener, win); win->xdg_toplevel = xdg_surface_get_toplevel(win->xdg_surface); xdg_toplevel_add_listener(win->xdg_toplevel, &xdg_toplevel_listener, wayl);