aboutsummaryrefslogtreecommitdiff
path: root/grid.h
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-08-30 18:16:12 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-08-30 18:16:12 +0000
commite673bd4ab03d8faca2282a1bc134455458b8d3fe (patch)
tree1cb7f2fdd891183a8a68e81e8d01ae84293ce404 /grid.h
parentosc: xparsecolor: parse 'legacy' colors (diff)
parentsearch: ctrl+s searches forward (diff)
Merge branch 'scrollback-search'
Diffstat (limited to 'grid.h')
-rw-r--r--grid.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/grid.h b/grid.h
index a421a5c0..96ef4181 100644
--- a/grid.h
+++ b/grid.h
@@ -7,12 +7,24 @@ void grid_swap_row(struct grid *grid, int row_a, int row_b, bool initialize);
struct row *grid_row_alloc(int cols, bool initialize);
void grid_row_free(struct row *row);
+static inline int
+grid_row_absolute(const struct grid *grid, int row_no)
+{
+ return (grid->offset + row_no) & (grid->num_rows - 1);
+}
+
+static inline int
+grid_row_absolute_in_view(const struct grid *grid, int row_no)
+{
+ return (grid->view + row_no) & (grid->num_rows - 1);
+}
+
static inline struct row *
_grid_row_maybe_alloc(struct grid *grid, int row_no, bool alloc_if_null)
{
assert(grid->offset >= 0);
- int real_row = (grid->offset + row_no) & (grid->num_rows - 1);
+ int real_row = grid_row_absolute(grid, row_no);
struct row *row = grid->rows[real_row];
if (row == NULL && alloc_if_null) {
@@ -41,7 +53,7 @@ grid_row_in_view(struct grid *grid, int row_no)
{
assert(grid->view >= 0);
- int real_row = (grid->view + row_no) & (grid->num_rows - 1);
+ int real_row = grid_row_absolute_in_view(grid, row_no);
struct row *row = grid->rows[real_row];
assert(row != NULL);