diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-11-01 19:19:53 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-11-01 19:19:53 +0000 |
| commit | 95b7c405d464b0eb04141cbbfe077371f5a9d47c (patch) | |
| tree | 508a280e69d3aa039638a9186d783e3a863bc35e | |
| parent | wayland: wayl_init(): call wl_display_roundtrip() when done (diff) | |
wayland: wayl_win_destroy(): unmap windows before destroying
This will trigger e.d. keyboard_leave() and wl_pointer_leave() events,
which ensures there aren't any references to the destroyed window from
the global wayland struct.
Call wl_display_roundtrip() to trigger those events *before* we
destroy the window.
| -rw-r--r-- | wayland.c | 21 | ||||
| -rw-r--r-- | wayland.h | 2 |
2 files changed, 23 insertions, 0 deletions
@@ -639,6 +639,7 @@ struct wl_window * wayl_win_init(struct wayland *wayl) { struct wl_window *win = calloc(1, sizeof(*win)); + win->wayl = wayl; win->surface = wl_compositor_create_surface(wayl->compositor); if (win->surface == NULL) { @@ -687,6 +688,25 @@ wayl_win_destroy(struct wl_window *win) if (win == NULL) return; + /* + * First, unmap all surfaces to trigger things like + * keyboard_leave() and wl_pointer_leave(). + * + * This ensures we remove all references to *this* window from the + * global wayland struct (since it no longer has neither keyboard + * nor mouse focus). + */ + + /* Scrollback search */ + wl_surface_attach(win->search_surface, NULL, 0, 0); + wl_surface_commit(win->search_surface); + wl_display_roundtrip(win->wayl->display); + + /* Main window */ + wl_surface_attach(win->surface, NULL, 0, 0); + wl_surface_commit(win->surface); + wl_display_roundtrip(win->wayl->display); + tll_free(win->on_outputs); if (win->search_sub_surface != NULL) wl_subsurface_destroy(win->search_sub_surface); @@ -702,6 +722,7 @@ wayl_win_destroy(struct wl_window *win) xdg_surface_destroy(win->xdg_surface); if (win->surface != NULL) wl_surface_destroy(win->surface); + free(win); } @@ -72,7 +72,9 @@ struct wl_primary { uint32_t serial; }; +struct wayland; struct wl_window { + struct wayland *wayl; struct wl_surface *surface; struct xdg_surface *xdg_surface; struct xdg_toplevel *xdg_toplevel; |
