diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-05-01 10:05:38 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-05-01 10:05:38 +0000 |
| commit | 3474624c2c17058f0fd9f3f1821971e7213d285b (patch) | |
| tree | 92af8f394e1124952cf69652bdb340376765f730 /grid.c | |
| parent | term: combining characters: reduce max number of combining characters (diff) | |
unicode-combining: completely remove unicode combining characters when feature is disabled
Diffstat (limited to 'grid.c')
| -rw-r--r-- | grid.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -34,12 +34,16 @@ grid_row_alloc(int cols, bool initialize) if (initialize) { row->cells = calloc(cols, sizeof(row->cells[0])); +#if FOOT_UNICODE_COMBINING row->comb_chars = calloc(cols, sizeof(row->comb_chars[0])); +#endif for (size_t c = 0; c < cols; c++) row->cells[c].attrs.clean = 1; } else { row->cells = malloc(cols * sizeof(row->cells[0])); +#if FOOT_UNICODE_COMBINING row->comb_chars = malloc(cols * sizeof(row->comb_chars[0])); +#endif } return row; @@ -51,7 +55,9 @@ grid_row_free(struct row *row) if (row == NULL) return; +#if FOOT_UNICODE_COMBINING free(row->comb_chars); +#endif free(row->cells); free(row); } @@ -208,6 +214,7 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols, new_row->cells[new_col_idx] = *old_cell; new_row->cells[new_col_idx].attrs.clean = 1; +#if FOOT_UNICODE_COMBINING struct combining_chars *old_comb_chars = &old_row->comb_chars[c - empty_count + i]; struct combining_chars *new_comb_chars @@ -216,6 +223,7 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols, new_comb_chars->count = old_comb_chars->count; for (size_t j = 0; j < ALEN(new_comb_chars->chars); j++) new_comb_chars->chars[j] = old_comb_chars->chars[j]; +#endif /* Translate tracking point(s) */ if (is_tracking_point && i >= empty_count) { |
