diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-06-19 08:58:24 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-06-19 08:58:24 +0000 |
| commit | 96731814daebe71788cc1a3a8396add7ec2f6d52 (patch) | |
| tree | d781889419c28de834c854e1ae34f178c0147a87 | |
| parent | wip: initial scrolling support (no scrollback though) (diff) | |
grid: erase: memset() the entire range in one call
| -rw-r--r-- | grid.c | 8 | ||||
| -rw-r--r-- | vt.c | 12 |
2 files changed, 10 insertions, 10 deletions
@@ -13,17 +13,19 @@ void grid_erase(struct grid *grid, int start, int end) { + assert(end >= start); + memset(&grid->cells[start], 0, (end - start) * sizeof(grid->cells[0])); + for (int i = start; i < end; i++) { struct cell *cell = &grid->cells[i]; - /* TODO: memset entire range */ - memset(cell, 0, sizeof(*cell)); cell->attrs.foreground = grid->foreground; cell->attrs.background = grid->background; cell->dirty = true; - grid->dirty = true; } + + grid->dirty = true; } int @@ -158,10 +158,9 @@ action(struct terminal *term, enum action action, uint8_t c) LOG_DBG("execute: 0x%02x", c); switch (c) { case '\n': - LOG_DBG("NEWLINE: %d %d", term->grid.cursor.row, term->grid.rows); - if (term->grid.cursor.row == term->grid.rows - 1) { + if (term->grid.cursor.row == term->grid.rows - 1) grid_scroll(&term->grid, 1); - } else + else grid_cursor_down(&term->grid, 1); break; @@ -194,11 +193,10 @@ action(struct terminal *term, enum action action, uint8_t c) case ACTION_PRINT: { if (term->grid.print_needs_wrap) { if (term->grid.cursor.row == term->grid.rows - 1) { - assert(false); grid_scroll(&term->grid, 1); - } - - grid_cursor_to(&term->grid, term->grid.cursor.row + 1, 0); + grid_cursor_to(&term->grid, term->grid.cursor.row, 0); + } else + grid_cursor_to(&term->grid, term->grid.cursor.row + 1, 0); } struct cell *cell = &term->grid.cells[term->grid.linear_cursor]; |
