aboutsummaryrefslogtreecommitdiff
path: root/render.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 /render.c
parentcsd: use wayl_win_subsurface_new/destroy() (diff)
search: use wayl_win_subsurface_new/destroy()
Diffstat (limited to 'render.c')
-rw-r--r--render.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/render.c b/render.c
index c1a600ed..dec944c3 100644
--- a/render.c
+++ b/render.c
@@ -2232,7 +2232,7 @@ grid_render(struct terminal *term)
static void
render_search_box(struct terminal *term)
{
- xassert(term->window->search_sub_surface != NULL);
+ xassert(term->window->search_surface.sub != NULL);
/*
* We treat the search box pretty much like a row of cells. That
@@ -2505,27 +2505,27 @@ render_search_box(struct terminal *term)
term, WINDOW_X(x), WINDOW_Y(y), 1, term->cell_height);
}
- quirk_weston_subsurface_desync_on(term->window->search_sub_surface);
+ quirk_weston_subsurface_desync_on(term->window->search_surface.sub);
/* TODO: this is only necessary on a window resize */
wl_subsurface_set_position(
- term->window->search_sub_surface,
+ term->window->search_surface.sub,
margin / scale,
max(0, (int32_t)term->height - height - margin) / scale);
- wl_surface_attach(term->window->search_surface, buf->wl_buf, 0, 0);
- wl_surface_damage_buffer(term->window->search_surface, 0, 0, width, height);
- wl_surface_set_buffer_scale(term->window->search_surface, scale);
+ wl_surface_attach(term->window->search_surface.surf, buf->wl_buf, 0, 0);
+ wl_surface_damage_buffer(term->window->search_surface.surf, 0, 0, width, height);
+ wl_surface_set_buffer_scale(term->window->search_surface.surf, scale);
struct wl_region *region = wl_compositor_create_region(term->wl->compositor);
if (region != NULL) {
wl_region_add(region, width - visible_width, 0, visible_width, height);
- wl_surface_set_opaque_region(term->window->search_surface, region);
+ wl_surface_set_opaque_region(term->window->search_surface.surf, region);
wl_region_destroy(region);
}
- wl_surface_commit(term->window->search_surface);
- quirk_weston_subsurface_desync_off(term->window->search_sub_surface);
+ wl_surface_commit(term->window->search_surface.surf);
+ quirk_weston_subsurface_desync_off(term->window->search_surface.sub);
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
free(text);