aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-28 18:01:56 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-28 18:01:56 +0000
commit295083059ca8f642437abf44329698d1bbbb0067 (patch)
treee6ebc7f9d0330589a19c420f7ba138438eb8e74c /terminal.c
parentchangelog: improved font size consistency across monitors with different DPI (diff)
parentconfig: fix check for scrollback-indicator-format=percentage (diff)
Merge branch 'master' into diagonal-dpi
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 1a560ef2..81592710 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])