diff options
Diffstat (limited to 'grid.h')
| -rw-r--r-- | grid.h | 28 |
1 files changed, 20 insertions, 8 deletions
@@ -3,33 +3,45 @@ #include <stddef.h> #include "terminal.h" -void grid_swap_row(struct grid *grid, int row_a, int row_b); -struct row *grid_row_alloc(int cols); +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 struct row * -grid_row(struct grid *grid, int row_no) +_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) % grid->num_rows; + int real_row = (grid->offset + row_no) & (grid->num_rows - 1); struct row *row = grid->rows[real_row]; - if (row == NULL) { - row = grid_row_alloc(grid->num_cols); + if (row == NULL && alloc_if_null) { + row = grid_row_alloc(grid->num_cols, false); grid->rows[real_row] = row; } - __builtin_prefetch(row->cells, 1, 3); + assert(row != NULL); return row; } static inline struct row * +grid_row(struct grid *grid, int row_no) +{ + return _grid_row_maybe_alloc(grid, row_no, false); +} + +static inline struct row * +grid_row_and_alloc(struct grid *grid, int row_no) +{ + return _grid_row_maybe_alloc(grid, row_no, true); +} + +static inline struct row * grid_row_in_view(struct grid *grid, int row_no) { assert(grid->view >= 0); - int real_row = (grid->view + row_no + grid->num_rows) % grid->num_rows; + int real_row = (grid->view + row_no) & (grid->num_rows - 1); struct row *row = grid->rows[real_row]; assert(row != NULL); |
