aboutsummaryrefslogtreecommitdiff
path: root/wayland.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-02-12 10:50:43 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-02-17 20:48:08 +0000
commitc8324943de5cb56f480e2a3477f6b129054ff2b4 (patch)
tree23bf7dd3b08ebffafd3a6068ed129c559069db09 /wayland.c
parentsearch: use wayl_win_subsurface_new/destroy() (diff)
scrollback-indicator: use wayl_win_subsurface_new/destroy()
Diffstat (limited to 'wayland.c')
-rw-r--r--wayland.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/wayland.c b/wayland.c
index 88a8f14c..ca95663e 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1409,9 +1409,9 @@ wayl_win_destroy(struct wl_window *win)
wl_surface_commit(win->render_timer_surface);
}
- if (win->scrollback_indicator_surface != NULL) {
- wl_surface_attach(win->scrollback_indicator_surface, NULL, 0, 0);
- wl_surface_commit(win->scrollback_indicator_surface);
+ if (win->scrollback_indicator_surface.surf != NULL) {
+ wl_surface_attach(win->scrollback_indicator_surface.surf, NULL, 0, 0);
+ wl_surface_commit(win->scrollback_indicator_surface.surf);
}
/* Scrollback search */
@@ -1444,15 +1444,12 @@ wayl_win_destroy(struct wl_window *win)
csd_destroy(win);
wayl_win_subsurface_destroy(&win->search_surface);
+ wayl_win_subsurface_destroy(&win->scrollback_indicator_surface);
if (win->render_timer_sub_surface != NULL)
wl_subsurface_destroy(win->render_timer_sub_surface);
if (win->render_timer_surface != NULL)
wl_surface_destroy(win->render_timer_surface);
- if (win->scrollback_indicator_sub_surface != NULL)
- wl_subsurface_destroy(win->scrollback_indicator_sub_surface);
- if (win->scrollback_indicator_surface != NULL)
- wl_surface_destroy(win->scrollback_indicator_surface);
if (win->frame_callback != NULL)
wl_callback_destroy(win->frame_callback);
if (win->xdg_toplevel_decoration != NULL)