mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-21 05:33:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'scrollback-indicator-positioning' into master

Browse source 
Closes #108
This commit is contained in:
Daniel Eklöf 2020-08-27 19:52:47 +02:00
commit 32e2173b5d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -62,6 +62,8 @@
* Default `--server` socket path to use `$WAYLAND_DISPLAY` instead of * Default `--server` socket path to use `$WAYLAND_DISPLAY` instead of
`$XDG_SESSION_ID` (https://codeberg.org/dnkl/foot/issues/55). `$XDG_SESSION_ID` (https://codeberg.org/dnkl/foot/issues/55).
* Trailing empty cells are no longer highlighted in mouse selections. * Trailing empty cells are no longer highlighted in mouse selections.
* Scrollback position indicator is now based on the number of _used_
scrollback lines, instead of the _total_ number of scrollback lines.
### Fixed ### Fixed

20
render.c
View file

@ -1399,14 +1399,22 @@ render_scrollback_position(struct terminal *term)
/* Find absolute row number of the scrollback start */ /* Find absolute row number of the scrollback start */
int scrollback_start = term->grid->offset + term->rows; int scrollback_start = term->grid->offset + term->rows;
while (term->grid->rows[scrollback_start & (term->grid->num_rows - 1)] == NULL) int empty_rows = 0;
while (term->grid->rows[scrollback_start & (term->grid->num_rows - 1)] == NULL) {
scrollback_start++; scrollback_start++;
empty_rows++;
}
/* Rebase viewport against scrollback start (so that 0 is at /* Rebase viewport against scrollback start (so that 0 is at
* the beginning of the scrollback) */ * the beginning of the scrollback) */
int rebased_view = term->grid->view - scrollback_start + term->grid->num_rows; int rebased_view = term->grid->view - scrollback_start + term->grid->num_rows;
rebased_view &= term->grid->num_rows - 1; rebased_view &= term->grid->num_rows - 1;
/* How much of the scrollback is actually used? */
int populated_rows = term->grid->num_rows - empty_rows;
assert(populated_rows > 0);
assert(populated_rows <= term->grid->num_rows);
/* /*
* How far down in the scrollback we are. * How far down in the scrollback we are.
* *
@ -1414,9 +1422,9 @@ render_scrollback_position(struct terminal *term)
* 100% -> at the bottom, i.e. where new lines are inserted * 100% -> at the bottom, i.e. where new lines are inserted
*/ */
double percent = double percent =
rebased_view + term->rows == term->grid->num_rows rebased_view + term->rows == populated_rows
? 1.0 ? 1.0
: (double)rebased_view / term->grid->num_rows; : (double)rebased_view / (populated_rows - term->rows);
wchar_t _text[64]; wchar_t _text[64];
const wchar_t *text = _text; const wchar_t *text = _text;
@ -1461,7 +1469,11 @@ render_scrollback_position(struct terminal *term)
break; break;
case SCROLLBACK_INDICATOR_POSITION_RELATIVE: { case SCROLLBACK_INDICATOR_POSITION_RELATIVE: {
int lines = term->rows - 3; /* Avoid using first and two last rows */ int lines = term->rows - 2; /* Avoid using first and last rows */
if (term->is_searching) {
/* Make sure we don't collide with the scrollback search box */
lines--;
}
assert(lines > 0); assert(lines > 0);
int pixels = lines * term->cell_height - height + 2 * margin; int pixels = lines * term->cell_height - height + 2 * margin;