aboutsummaryrefslogtreecommitdiff
path: root/grid.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-06-17 19:15:20 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-06-17 19:15:20 +0000
commit50c43be0d9729c20b1daa7a1303ca247aed2bb9e (patch)
treee46ec16f795b5647cd09e86725dacb559ac538ea /grid.c
parentvt: handle cursor-at-right-edge (diff)
grid: track both linear and row,col cursor
Diffstat (limited to 'grid.c')
-rw-r--r--grid.c73
1 files changed, 66 insertions, 7 deletions
diff --git a/grid.c b/grid.c
index 3954b64f..02ec24a5 100644
--- a/grid.c
+++ b/grid.c
@@ -1,6 +1,10 @@
#include "grid.h"
#include <string.h>
+#include <assert.h>
+
+#define min(x, y) ((x) < (y) ? (x) : (y))
+#define max(x, y) ((x) > (y) ? (x) : (y))
void
grid_erase(struct grid *grid, int start, int end)
@@ -17,19 +21,74 @@ grid_erase(struct grid *grid, int start, int end)
}
}
+int
+grid_cursor_linear(const struct grid *grid, int row, int col)
+{
+ return row * grid->cols + col;
+}
+
void
-grid_cursor_move(struct grid *grid, int cols)
+grid_cursor_to(struct grid *grid, int row, int col)
{
- int new_cursor = grid->cursor + cols;
- grid->cells[grid->cursor].dirty = true;
- grid->cells[new_cursor].dirty = true;
- grid->cursor = new_cursor;
+ assert(row >= 0);
+ assert(row < grid->rows);
+ assert(col >= 0);
+ assert(col < grid->cols);
+
+ int new_linear = row * grid->cols + col;
+ assert(new_linear >= 0);
+ assert(new_linear < grid->rows * grid->cols);
+
+ grid->cells[grid->linear_cursor].dirty = true;
+ grid->cells[new_linear].dirty = true;
grid->dirty = true;
grid->print_needs_wrap = false;
+
+ grid->linear_cursor = new_linear;
+ grid->cursor.col = col;
+ grid->cursor.row = row;
}
void
-grid_cursor_to(struct grid *grid, int pos)
+grid_cursor_left(struct grid *grid, int count)
{
- grid_cursor_move(grid, pos - grid->cursor);
+ int move_amount = min(grid->cursor.col, count);
+ int new_linear = grid->linear_cursor - move_amount;
+ int new_col = grid->cursor.col - move_amount;
+
+ assert(new_linear >= 0);
+ assert(new_linear < grid->rows * grid->cols);
+ assert(new_col >= 0);
+ assert(new_col < grid->cols);
+
+ grid->cells[grid->linear_cursor].dirty = true;
+ grid->cells[new_linear].dirty = true;
+
+ grid->linear_cursor = new_linear;
+ grid->cursor.col = new_col;
+
+ grid->dirty = true;
+ grid->print_needs_wrap = false;
+}
+
+void
+grid_cursor_right(struct grid *grid, int count)
+{
+ int move_amount = min(grid->cols - grid->cursor.col - 1, count);
+ int new_linear = grid->linear_cursor + move_amount;
+ int new_col = grid->cursor.col + move_amount;
+
+ assert(new_linear >= 0);
+ assert(new_linear < grid->rows * grid->cols);
+ assert(new_col >= 0);
+ assert(new_col < grid->cols);
+
+ grid->cells[grid->linear_cursor].dirty = true;
+ grid->cells[new_linear].dirty = true;
+
+ grid->linear_cursor = new_linear;
+ grid->cursor.col = new_col;
+
+ grid->dirty = true;
+ grid->print_needs_wrap = false;
}