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

grid: reflow: turn line-wrapping code into a macro

Browse source
This commit is contained in:
Daniel Eklöf 2020-04-17 20:46:08 +02:00
parent e37aa3b369
commit aede474a52
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

43
grid.c
View file

@ -124,6 +124,21 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
} }
} }
#define line_wrap() \
do { \
new_col_idx = 0; \
new_row_idx = (new_row_idx + 1) & (new_rows - 1); \
\
new_row = new_grid[new_row_idx]; \
if (new_row == NULL) { \
new_row = grid_row_alloc(new_cols, true); \
new_grid[new_row_idx] = new_row; \
} else { \
memset(new_row->cells, 0, new_cols * sizeof(new_row->cells[0])); \
new_row->linebreak = false; \
} \
} while(0)
/* /*
* Keep track of empty cells. If the old line ends with a * Keep track of empty cells. If the old line ends with a
* string of empty cells, we don't need to, nor do we want to, * string of empty cells, we don't need to, nor do we want to,
@ -169,18 +184,7 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
new_row->linebreak = true; new_row->linebreak = true;
} }
#endif #endif
line_wrap();
new_col_idx = 0;
new_row_idx = (new_row_idx + 1) & (new_rows - 1);
new_row = new_grid[new_row_idx];
if (new_row == NULL) {
new_row = grid_row_alloc(new_cols, true);
new_grid[new_row_idx] = new_row;
} else {
memset(new_row->cells, 0, new_cols * sizeof(new_row->cells[0]));
new_row->linebreak = false;
}
} }
assert(new_row != NULL); assert(new_row != NULL);
@ -203,19 +207,10 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
if (old_row->linebreak) { if (old_row->linebreak) {
new_row->linebreak = true; new_row->linebreak = true;
line_wrap();
new_col_idx = 0;
new_row_idx = (new_row_idx + 1) & (new_rows - 1);
new_row = new_grid[new_row_idx];
if (new_row == NULL) {
new_row = grid_row_alloc(new_cols, true);
new_grid[new_row_idx] = new_row;
} else {
memset(new_row->cells, 0, new_cols * sizeof(new_row->cells[0]));
new_row->linebreak = false;
}
} }
#undef line_wrap
} }
/* Set offset such that the last reflowed row is at the bottom */ /* Set offset such that the last reflowed row is at the bottom */