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 'master' into pipe-grid-to-external-tool

Browse source
This commit is contained in:
Daniel Eklöf 2020-07-16 08:53:20 +02:00
commit de75a2035e
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 46 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
terminal.c
View file

@ -1432,7 +1432,7 @@ term_font_size_adjust(struct terminal *term, double amount)
old_pt_size = term->font_sizes[i].px_size * 72. / dpi;
}
term->font_sizes[i].pt_size = old_pt_size + amount;
term->font_sizes[i].pt_size = fmax(old_pt_size + amount, 0);
term->font_sizes[i].px_size = -1;
}
@ -2307,12 +2307,15 @@ print_linewrap(struct terminal *term)
}
term->grid->cursor.lcf = false;
if (term->grid->cursor.point.row == term->scroll_region.end - 1)
const int row = term->grid->cursor.point.row;
if (row == term->scroll_region.end - 1)
term_scroll(term, 1);
else {
assert(term->grid->cursor.point.row < term->scroll_region.end - 1);
term->grid->cursor.point.row++;
term->grid->cur_row = grid_row(term->grid, term->grid->cursor.point.row);
const int new_row = min(row + 1, term->rows - 1);
term->grid->cursor.point.row = new_row;
term->grid->cur_row = grid_row(term->grid, new_row);
}
term->grid->cursor.point.col = 0;
@ -2353,8 +2356,7 @@ print_spacer(struct terminal *term, int col)
void
term_print(struct terminal *term, wchar_t wc, int width)
{
if (unlikely(width <= 0))
return;
assert(width > 0);
print_linewrap(term);
print_insert(term, width);