aboutsummaryrefslogtreecommitdiff
path: root/wayland.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-02-12 10:47:49 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-02-17 20:48:07 +0000
commite049124f6d57fb2fd444138ec588b5b3cab80ecc (patch)
tree625da6cb53fe397d130ada89a097baee49d8f2c0 /wayland.c
parentcsd: use wayl_win_subsurface_new/destroy() (diff)
search: use wayl_win_subsurface_new/destroy()
Diffstat (limited to 'wayland.c')
-rw-r--r--wayland.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/wayland.c b/wayland.c
index 6c74282a..88a8f14c 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1415,9 +1415,9 @@ wayl_win_destroy(struct wl_window *win)
}
/* Scrollback search */
- if (win->search_surface != NULL) {
- wl_surface_attach(win->search_surface, NULL, 0, 0);
- wl_surface_commit(win->search_surface);
+ if (win->search_surface.surf != NULL) {
+ wl_surface_attach(win->search_surface.surf, NULL, 0, 0);
+ wl_surface_commit(win->search_surface.surf);
}
/* CSD */
@@ -1443,6 +1443,8 @@ wayl_win_destroy(struct wl_window *win)
}
csd_destroy(win);
+ wayl_win_subsurface_destroy(&win->search_surface);
+
if (win->render_timer_sub_surface != NULL)
wl_subsurface_destroy(win->render_timer_sub_surface);
if (win->render_timer_surface != NULL)
@@ -1451,10 +1453,6 @@ wayl_win_destroy(struct wl_window *win)
wl_subsurface_destroy(win->scrollback_indicator_sub_surface);
if (win->scrollback_indicator_surface != NULL)
wl_surface_destroy(win->scrollback_indicator_surface);
- if (win->search_sub_surface != NULL)
- wl_subsurface_destroy(win->search_sub_surface);
- if (win->search_surface != NULL)
- wl_surface_destroy(win->search_surface);
if (win->frame_callback != NULL)
wl_callback_destroy(win->frame_callback);
if (win->xdg_toplevel_decoration != NULL)