aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.c7
-rw-r--r--search.c29
2 files changed, 9 insertions, 27 deletions
diff --git a/main.c b/main.c
index 18e2a19a..a076fb24 100644
--- a/main.c
+++ b/main.c
@@ -723,6 +723,7 @@ main(int argc, char *const *argv)
goto out;
}
+ /* Main window */
term.wl.surface = wl_compositor_create_surface(term.wl.compositor);
if (term.wl.surface == NULL) {
LOG_ERR("failed to create wayland surface");
@@ -740,6 +741,12 @@ main(int argc, char *const *argv)
xdg_toplevel_set_app_id(term.wl.xdg_toplevel, "foot");
term_set_window_title(&term, "foot");
+ /* Scrollback search box */
+ term.wl.search_surface = wl_compositor_create_surface(term.wl.compositor);
+ term.wl.search_sub_surface = wl_subcompositor_get_subsurface(
+ term.wl.sub_compositor, term.wl.search_surface, term.wl.surface);
+ wl_subsurface_set_desync(term.wl.search_sub_surface);
+
wl_surface_commit(term.wl.surface);
wl_display_roundtrip(term.wl.display);
diff --git a/search.c b/search.c
index 81bdf8f3..051a32db 100644
--- a/search.c
+++ b/search.c
@@ -18,14 +18,8 @@
static void
search_cancel_keep_selection(struct terminal *term)
{
- if (term->wl.search_sub_surface != NULL) {
- wl_subsurface_destroy(term->wl.search_sub_surface);
- term->wl.search_sub_surface = NULL;
- }
- if (term->wl.search_surface != NULL) {
- wl_surface_destroy(term->wl.search_surface);
- term->wl.search_surface = NULL;
- }
+ wl_surface_attach(term->wl.search_surface, NULL, 0, 0);
+ wl_surface_commit(term->wl.search_surface);
free(term->search.buf);
term->search.buf = NULL;
@@ -50,25 +44,6 @@ search_begin(struct terminal *term)
term->search.view_followed_offset = term->grid->view == term->grid->offset;
term->is_searching = true;
- term->wl.search_surface = wl_compositor_create_surface(term->wl.compositor);
- if (term->wl.search_surface != NULL) {
- term->wl.search_sub_surface = wl_subcompositor_get_subsurface(
- term->wl.sub_compositor, term->wl.search_surface, term->wl.surface);
-
- if (term->wl.search_sub_surface != NULL) {
- /* Sub-surface updates may occur without updating the main
- * window */
- wl_subsurface_set_desync(term->wl.search_sub_surface);
- }
- }
-
- if (term->wl.search_surface == NULL || term->wl.search_sub_surface == NULL) {
- LOG_ERR("failed to create sub-surface for search box");
- if (term->wl.search_surface != NULL)
- wl_surface_destroy(term->wl.search_surface);
- assert(term->wl.search_sub_surface == NULL);
- }
-
render_search_box(term);
render_refresh(term);
}