aboutsummaryrefslogtreecommitdiff
path: root/grid.c
diff options
context:
space:
mode:
Diffstat (limited to 'grid.c')
-rw-r--r--grid.c37
1 files changed, 23 insertions, 14 deletions
diff --git a/grid.c b/grid.c
index 2ff82bd7..e0cc9482 100644
--- a/grid.c
+++ b/grid.c
@@ -8,30 +8,39 @@
#include "log.h"
void
-grid_swap_row(struct grid *grid, int row_a, int row_b)
+grid_swap_row(struct grid *grid, int row_a, int row_b, bool initialize)
{
assert(grid->offset >= 0);
assert(row_a != row_b);
- int real_a = (grid->offset + row_a + grid->num_rows) % grid->num_rows;
- int real_b = (grid->offset + row_b + grid->num_rows) % grid->num_rows;
+ int real_a = (grid->offset + row_a) & (grid->num_rows - 1);
+ int real_b = (grid->offset + row_b) & (grid->num_rows - 1);
- assert(real_a >= 0);
- assert(real_b >= 0);
-
- struct row *tmp = grid->rows[real_a];
- grid->rows[real_a] = grid->rows[real_b];
- grid->rows[real_b] = tmp;
+ struct row *a = grid->rows[real_a];
+ struct row *b = grid->rows[real_b];
+#if 0
+ if (a == NULL)
+ a = grid_row_alloc(grid->num_cols, initialize);
+ if (b == NULL)
+ b = grid_row_alloc(grid->num_cols, initialize);
+#endif
+ grid->rows[real_a] = b;
+ grid->rows[real_b] = a;
}
struct row *
-grid_row_alloc(int cols)
+grid_row_alloc(int cols, bool initialize)
{
struct row *row = malloc(sizeof(*row));
- row->cells = calloc(cols, sizeof(row->cells[0]));
- for (size_t c = 0; c < cols; c++)
- row->cells[c].attrs.clean = 1;
- row->dirty = false; /* TODO: parameter? */
+ row->dirty = false;
+
+ if (initialize) {
+ row->cells = calloc(cols, sizeof(row->cells[0]));
+ for (size_t c = 0; c < cols; c++)
+ row->cells[c].attrs.clean = 1;
+ } else
+ row->cells = malloc(cols * sizeof(row->cells[0]));
+
return row;
}