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

sixel/terminal: use the new grid and selection APIs

Browse source 
Use grid_row_abs_to_sb() instead of manually “rebasing” row numbers.

Use selection_get_{start,end}() to retrieve the current selection
coordinates.
This commit is contained in:
Daniel Eklöf 2022-04-25 20:00:14 +02:00
parent 6316a5eb0c
commit 1d4e1b921d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 37 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

55
sixel.c
View file

@ -7,8 +7,9 @@
#define LOG_ENABLE_DBG 0 #define LOG_ENABLE_DBG 0
#include "log.h" #include "log.h"
#include "debug.h" #include "debug.h"
#include "render.h" #include "grid.h"
#include "hsl.h" #include "hsl.h"
#include "render.h"
#include "util.h" #include "util.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "xsnprintf.h" #include "xsnprintf.h"
@ -138,25 +139,6 @@ sixel_erase(struct terminal *term, struct sixel *sixel)
sixel_destroy(sixel); sixel_destroy(sixel);
} }
/*
* Calculates the scrollback relative row number, given an absolute row number.
*
* The scrollback relative row number 0 is the *first*, and *oldest*
* row in the scrollback history (and thus the *first* row to be
* scrolled out). Thus, a higher number means further *down* in the
* scrollback, with the *highest* number being at the bottom of the
* screen, where new input appears.
*/
static int
rebase_row(const struct terminal *term, int abs_row)
{
int scrollback_start = term->grid->offset + term->rows;
int rebased_row = abs_row - scrollback_start + term->grid->num_rows;
rebased_row &= term->grid->num_rows - 1;
return rebased_row;
}
/* /*
* Verify the sixels are sorted correctly. * Verify the sixels are sorted correctly.
* *
@ -175,7 +157,8 @@ verify_list_order(const struct terminal *term)
size_t idx = 0; size_t idx = 0;
tll_foreach(term->grid->sixel_images, it) { tll_foreach(term->grid->sixel_images, it) {
int row = rebase_row(term, it->item.pos.row + it->item.rows - 1); int row = grid_row_abs_to_sb(
term->grid, term->rows, it->item.pos.row + it->item.rows - 1);
int col = it->item.pos.col; int col = it->item.pos.col;
int col_count = it->item.cols; int col_count = it->item.cols;
@ -232,7 +215,8 @@ verify_scrollback_consistency(const struct terminal *term)
int last_row = -1; int last_row = -1;
for (int i = 0; i < six->rows; i++) { for (int i = 0; i < six->rows; i++) {
int row_no = rebase_row(term, six->pos.row + i); int row_no = grid_row_abs_to_sb(
term->grid, term->rows, six->pos.row + i);
if (last_row != -1) if (last_row != -1)
xassert(last_row < row_no); xassert(last_row < row_no);
@ -295,10 +279,14 @@ verify_sixels(const struct terminal *term)
static void static void
sixel_insert(struct terminal *term, struct sixel sixel) sixel_insert(struct terminal *term, struct sixel sixel)
{ {
int end_row = rebase_row(term, sixel.pos.row + sixel.rows - 1); int end_row = grid_row_abs_to_sb(
term->grid, term->rows, sixel.pos.row + sixel.rows - 1);
tll_foreach(term->grid->sixel_images, it) { tll_foreach(term->grid->sixel_images, it) {
if (rebase_row(term, it->item.pos.row + it->item.rows - 1) < end_row) { int rebased = grid_row_abs_to_sb(
term->grid, term->rows, it->item.pos.row + it->item.rows - 1);
if (rebased < end_row) {
tll_insert_before(term->grid->sixel_images, it, sixel); tll_insert_before(term->grid->sixel_images, it, sixel);
goto out; goto out;
} }
@ -325,7 +313,7 @@ sixel_scroll_up(struct terminal *term, int rows)
tll_rforeach(term->grid->sixel_images, it) { tll_rforeach(term->grid->sixel_images, it) {
struct sixel *six = &it->item; struct sixel *six = &it->item;
int six_start = rebase_row(term, six->pos.row); int six_start = grid_row_abs_to_sb(term->grid, term->rows, six->pos.row);
if (six_start < rows) { if (six_start < rows) {
sixel_erase(term, six); sixel_erase(term, six);
@ -358,7 +346,8 @@ sixel_scroll_down(struct terminal *term, int rows)
tll_foreach(term->grid->sixel_images, it) { tll_foreach(term->grid->sixel_images, it) {
struct sixel *six = &it->item; struct sixel *six = &it->item;
int six_end = rebase_row(term, six->pos.row + six->rows - 1); int six_end = grid_row_abs_to_sb(
term->grid, term->rows, six->pos.row + six->rows - 1);
if (six_end >= term->grid->num_rows - rows) { if (six_end >= term->grid->num_rows - rows) {
sixel_erase(term, six); sixel_erase(term, six);
tll_remove(term->grid->sixel_images, it); tll_remove(term->grid->sixel_images, it);
@ -668,7 +657,8 @@ _sixel_overwrite_by_rectangle(
/* We should never generate scrollback wrapping sixels */ /* We should never generate scrollback wrapping sixels */
xassert(end < term->grid->num_rows); xassert(end < term->grid->num_rows);
const int scrollback_rel_start = rebase_row(term, start); const int scrollback_rel_start = grid_row_abs_to_sb(
term->grid, term->rows, start);
bool UNUSED would_have_breaked = false; bool UNUSED would_have_breaked = false;
@ -677,7 +667,8 @@ _sixel_overwrite_by_rectangle(
const int six_start = six->pos.row; const int six_start = six->pos.row;
const int six_end = (six_start + six->rows - 1); const int six_end = (six_start + six->rows - 1);
const int six_scrollback_rel_end = rebase_row(term, six_end); const int six_scrollback_rel_end =
grid_row_abs_to_sb(term->grid, term->rows, six_end);
/* We should never generate scrollback wrapping sixels */ /* We should never generate scrollback wrapping sixels */
xassert(six_end < term->grid->num_rows); xassert(six_end < term->grid->num_rows);
@ -776,7 +767,7 @@ sixel_overwrite_by_row(struct terminal *term, int _row, int col, int width)
width = term->grid->num_cols - col; width = term->grid->num_cols - col;
const int row = (term->grid->offset + _row) & (term->grid->num_rows - 1); const int row = (term->grid->offset + _row) & (term->grid->num_rows - 1);
const int scrollback_rel_row = rebase_row(term, row); const int scrollback_rel_row = grid_row_abs_to_sb(term->grid, term->rows, row);
tll_foreach(term->grid->sixel_images, it) { tll_foreach(term->grid->sixel_images, it) {
struct sixel *six = &it->item; struct sixel *six = &it->item;
@ -786,7 +777,8 @@ sixel_overwrite_by_row(struct terminal *term, int _row, int col, int width)
/* We should never generate scrollback wrapping sixels */ /* We should never generate scrollback wrapping sixels */
xassert(six_end >= six_start); xassert(six_end >= six_start);
const int six_scrollback_rel_end = rebase_row(term, six_end); const int six_scrollback_rel_end =
grid_row_abs_to_sb(term->grid, term->rows, six_end);
if (six_scrollback_rel_end < scrollback_rel_row) { if (six_scrollback_rel_end < scrollback_rel_row) {
/* All remaining sixels are *before* "our" row */ /* All remaining sixels are *before* "our" row */
@ -888,7 +880,8 @@ sixel_reflow(struct terminal *term)
int last_row = -1; int last_row = -1;
for (int j = 0; j < six->rows; j++) { for (int j = 0; j < six->rows; j++) {
int row_no = rebase_row(term, six->pos.row + j); int row_no = grid_row_abs_to_sb(
term->grid, term->rows, six->pos.row + j);
if (last_row != -1 && last_row >= row_no) { if (last_row != -1 && last_row >= row_no) {
sixel_destroy(six); sixel_destroy(six);
sixel_destroyed = true; sixel_destroyed = true;

25
terminal.c
View file

@ -2154,18 +2154,18 @@ term_erase(struct terminal *term, int start_row, int start_col,
void void
term_erase_scrollback(struct terminal *term) term_erase_scrollback(struct terminal *term)
{ {
const int num_rows = term->grid->num_rows; const struct grid *grid = term->grid;
const int num_rows = grid->num_rows;
const int mask = num_rows - 1; const int mask = num_rows - 1;
const int start = (term->grid->offset + term->rows) & mask; const int start = (grid->offset + term->rows) & mask;
const int end = (term->grid->offset - 1) & mask; const int end = (grid->offset - 1) & mask;
const int scrollback_start = term->grid->offset + term->rows; const int rel_start = grid_row_abs_to_sb(grid, term->rows, start);
const int rel_start = (start - scrollback_start + num_rows) & mask; const int rel_end = grid_row_abs_to_sb(grid, term->rows, end);
const int rel_end = (end - scrollback_start + num_rows) & mask;
const int sel_start = term->selection.coords.start.row; const int sel_start = selection_get_start(term).row;
const int sel_end = term->selection.coords.end.row; const int sel_end = selection_get_end(term).row;
if (sel_end >= 0) { if (sel_end >= 0) {
/* /*
@ -2183,8 +2183,8 @@ term_erase_scrollback(struct terminal *term)
* closer to the screen bottom. * closer to the screen bottom.
*/ */
const int rel_sel_start = (sel_start - scrollback_start + num_rows) & mask; const int rel_sel_start = grid_row_abs_to_sb(grid, term->rows, sel_start);
const int rel_sel_end = (sel_end - scrollback_start + num_rows) & mask; const int rel_sel_end = grid_row_abs_to_sb(grid, term->rows, sel_end);
if ((rel_sel_start <= rel_start && rel_sel_end >= rel_start) || if ((rel_sel_start <= rel_start && rel_sel_end >= rel_start) ||
(rel_sel_start <= rel_end && rel_sel_end >= rel_end) || (rel_sel_start <= rel_end && rel_sel_end >= rel_end) ||
@ -2196,8 +2196,9 @@ term_erase_scrollback(struct terminal *term)
tll_foreach(term->grid->sixel_images, it) { tll_foreach(term->grid->sixel_images, it) {
struct sixel *six = &it->item; struct sixel *six = &it->item;
const int six_start = (six->pos.row - scrollback_start + num_rows) & mask; const int six_start = grid_row_abs_to_sb(grid, term->rows, six->pos.row);
const int six_end = (six->pos.row + six->rows - 1 - scrollback_start + num_rows) & mask; const int six_end = grid_row_abs_to_sb(
grid, term->rows, six->pos.row + six->rows - 1);
if ((six_start <= rel_start && six_end >= rel_start) || if ((six_start <= rel_start && six_end >= rel_start) ||
(six_start <= rel_end && six_end >= rel_end) || (six_start <= rel_end && six_end >= rel_end) ||