aboutsummaryrefslogtreecommitdiff
path: root/search.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 /search.c
parentcsd: use wayl_win_subsurface_new/destroy() (diff)
search: use wayl_win_subsurface_new/destroy()
Diffstat (limited to 'search.c')
-rw-r--r--search.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/search.c b/search.c
index d7939219..75a083d5 100644
--- a/search.c
+++ b/search.c
@@ -81,13 +81,7 @@ static void
search_cancel_keep_selection(struct terminal *term)
{
struct wl_window *win = term->window;
- if (win->search_sub_surface != NULL)
- wl_subsurface_destroy(win->search_sub_surface);
- if (win->search_surface != NULL)
- wl_surface_destroy(win->search_surface);
-
- win->search_surface = NULL;
- win->search_sub_surface = NULL;
+ wayl_win_subsurface_destroy(&win->search_surface);
free(term->search.buf);
term->search.buf = NULL;
@@ -124,14 +118,9 @@ search_begin(struct terminal *term)
}
/* On-demand instantiate wayland surface */
- struct wl_window *win = term->window;
- struct wayland *wayl = term->wl;
- win->search_surface = wl_compositor_create_surface(wayl->compositor);
- wl_surface_set_user_data(win->search_surface, term->window);
-
- win->search_sub_surface = wl_subcompositor_get_subsurface(
- wayl->sub_compositor, win->search_surface, win->surface);
- wl_subsurface_set_sync(win->search_sub_surface);
+ bool ret = wayl_win_subsurface_new(
+ term->window, &term->window->search_surface);
+ xassert(ret);
term->search.original_view = term->grid->view;
term->search.view_followed_offset = term->grid->view == term->grid->offset;