aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--grid.c14
-rw-r--r--grid.h2
-rw-r--r--terminal.c16
3 files changed, 18 insertions, 14 deletions
diff --git a/grid.c b/grid.c
index 21cad71f..771cf164 100644
--- a/grid.c
+++ b/grid.c
@@ -12,6 +12,20 @@
#include "xmalloc.h"
void
+grid_free(struct grid *grid)
+{
+ for (int r = 0; r < grid->num_rows; r++)
+ grid_row_free(grid->rows[r]);
+
+ tll_foreach(grid->sixel_images, it) {
+ sixel_destroy(&it->item);
+ tll_remove(grid->sixel_images, it);
+ }
+
+ free(grid->rows);
+}
+
+void
grid_swap_row(struct grid *grid, int row_a, int row_b)
{
xassert(grid->offset >= 0);
diff --git a/grid.h b/grid.h
index 4cb339f2..c411b602 100644
--- a/grid.h
+++ b/grid.h
@@ -4,6 +4,8 @@
#include "debug.h"
#include "terminal.h"
+void grid_free(struct grid *grid);
+
void grid_swap_row(struct grid *grid, int row_a, int row_b);
struct row *grid_row_alloc(int cols, bool initialize);
void grid_row_free(struct row *row);
diff --git a/terminal.c b/terminal.c
index 18d5a947..57c9ae18 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1437,12 +1437,8 @@ term_destroy(struct terminal *term)
mtx_unlock(&term->render.workers.lock);
free(term->vt.osc.data);
- for (int row = 0; row < term->normal.num_rows; row++)
- grid_row_free(term->normal.rows[row]);
- free(term->normal.rows);
- for (int row = 0; row < term->alt.num_rows; row++)
- grid_row_free(term->alt.rows[row]);
- free(term->alt.rows);
+ grid_free(&term->normal);
+ grid_free(&term->alt);
tll_free(term->normal.scroll_damage);
tll_free(term->alt.scroll_damage);
@@ -1490,14 +1486,6 @@ term_destroy(struct terminal *term)
tll_remove(term->ptmx_paste_buffers, it);
}
- tll_foreach(term->normal.sixel_images, it) {
- sixel_destroy(&it->item);
- tll_remove(term->normal.sixel_images, it);
- }
- tll_foreach(term->alt.sixel_images, it) {
- sixel_destroy(&it->item);
- tll_remove(term->alt.sixel_images, it);
- }
sixel_fini(term);
urls_reset(term);