aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--render.c43
-rw-r--r--terminal.c2
-rw-r--r--wayland.c11
-rw-r--r--wayland.h5
4 files changed, 15 insertions, 46 deletions
diff --git a/render.c b/render.c
index dec944c3..a8fd5f2e 100644
--- a/render.c
+++ b/render.c
@@ -1775,49 +1775,23 @@ render_scrollback_position(struct terminal *term)
if (term->conf->scrollback.indicator.position == SCROLLBACK_INDICATOR_POSITION_NONE)
return;
- struct wayland *wayl = term->wl;
struct wl_window *win = term->window;
if (term->grid->view == term->grid->offset) {
- if (win->scrollback_indicator_surface != NULL) {
- wl_subsurface_destroy(win->scrollback_indicator_sub_surface);
- wl_surface_destroy(win->scrollback_indicator_surface);
-
- win->scrollback_indicator_surface = NULL;
- win->scrollback_indicator_sub_surface = NULL;
- }
+ if (win->scrollback_indicator_surface.surf != NULL)
+ wayl_win_subsurface_destroy(&win->scrollback_indicator_surface);
return;
}
- if (win->scrollback_indicator_surface == NULL) {
- win->scrollback_indicator_surface
- = wl_compositor_create_surface(wayl->compositor);
-
- if (win->scrollback_indicator_surface == NULL) {
+ if (win->scrollback_indicator_surface.surf == NULL) {
+ if (!wayl_win_subsurface_new(win, &win->scrollback_indicator_surface)) {
LOG_ERR("failed to create scrollback indicator surface");
return;
}
-
- wl_surface_set_user_data(win->scrollback_indicator_surface, win);
-
- term->window->scrollback_indicator_sub_surface
- = wl_subcompositor_get_subsurface(
- wayl->sub_compositor,
- win->scrollback_indicator_surface,
- win->surface);
-
- if (win->scrollback_indicator_sub_surface == NULL) {
- LOG_ERR("failed to create scrollback indicator sub-surface");
- wl_surface_destroy(win->scrollback_indicator_surface);
- win->scrollback_indicator_surface = NULL;
- return;
- }
-
- wl_subsurface_set_sync(win->scrollback_indicator_sub_surface);
}
- xassert(win->scrollback_indicator_surface != NULL);
- xassert(win->scrollback_indicator_sub_surface != NULL);
+ xassert(win->scrollback_indicator_surface.surf != NULL);
+ xassert(win->scrollback_indicator_surface.sub != NULL);
/* Find absolute row number of the scrollback start */
int scrollback_start = term->grid->offset + term->rows;
@@ -1905,13 +1879,14 @@ render_scrollback_position(struct terminal *term)
}
wl_subsurface_set_position(
- win->scrollback_indicator_sub_surface,
+ win->scrollback_indicator_surface.sub,
(term->width - margin - width) / scale,
(term->margins.top + surf_top) / scale);
render_osd(
term,
- win->scrollback_indicator_surface, win->scrollback_indicator_sub_surface,
+ win->scrollback_indicator_surface.surf,
+ win->scrollback_indicator_surface.sub,
buf, text,
term->colors.table[0], term->colors.table[8 + 4],
width, height, width - margin - wcslen(text) * term->cell_width, margin);
diff --git a/terminal.c b/terminal.c
index 872955fb..0aab462b 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2823,7 +2823,7 @@ term_surface_kind(const struct terminal *term, const struct wl_surface *surface)
return TERM_SURF_GRID;
else if (surface == term->window->search_surface.surf)
return TERM_SURF_SEARCH;
- else if (surface == term->window->scrollback_indicator_surface)
+ else if (surface == term->window->scrollback_indicator_surface.surf)
return TERM_SURF_SCROLLBACK_INDICATOR;
else if (surface == term->window->render_timer_surface)
return TERM_SURF_RENDER_TIMER;
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)
diff --git a/wayland.h b/wayland.h
index 64a0c8c8..31ae3b82 100644
--- a/wayland.h
+++ b/wayland.h
@@ -377,11 +377,8 @@ struct wl_window {
uint32_t serial;
} csd;
- /* Scrollback search */
struct wl_surf_subsurf search_surface;
-
- struct wl_surface *scrollback_indicator_surface;
- struct wl_subsurface *scrollback_indicator_sub_surface;
+ struct wl_surf_subsurf scrollback_indicator_surface;
struct wl_surface *render_timer_surface;
struct wl_subsurface *render_timer_sub_surface;