aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-27 17:08:49 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-27 17:08:49 +0000
commit1d3498989bb159a56fd9839b686777a9fd3618ba (patch)
tree7cb00fb0279cb49cb261a1ab49ca182d28527661 /terminal.c
parentchangelog: add new 'unreleased' section (diff)
parentchangelog: move scrollback indicator entries from 1.4.3 to 'unreleased' (diff)
Merge branch 'scrollback-position-indicator'
Closes #42
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/terminal.c b/terminal.c
index 86672f06..f1b528fb 100644
--- a/terminal.c
+++ b/terminal.c
@@ -909,7 +909,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
.tab_stops = tll_init(),
.wl = wayl,
.render = {
- .scrollback_lines = conf->scrollback_lines,
+ .scrollback_lines = conf->scrollback.lines,
.app_sync_updates.timer_fd = app_sync_updates_fd,
.workers = {
.count = conf->render_worker_count,
@@ -2407,6 +2407,8 @@ term_surface_kind(const struct terminal *term, const struct wl_surface *surface)
return TERM_SURF_GRID;
else if (surface == term->window->search_surface)
return TERM_SURF_SEARCH;
+ else if (surface == term->window->scrollback_indicator_surface)
+ return TERM_SURF_SCROLLBACK_INDICATOR;
else if (surface == term->window->csd.surface[CSD_SURF_TITLE])
return TERM_SURF_TITLE;
else if (surface == term->window->csd.surface[CSD_SURF_LEFT])