From 1e9143879d6b05bf7e4ed2a59d64d18418d2594f Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 11 Feb 2026 06:36:49 +0800 Subject: [PATCH] refactor(terminal.c): move screen callbacks together (#37808) Misplaced term_sb_clear() when rebasing #21412. --- src/nvim/terminal.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 70d041248f..16f715572f 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -1647,6 +1647,26 @@ static int term_sb_pop(int cols, VTermScreenCell *cells, void *data) return 1; } +static int term_sb_clear(void *data) +{ + Terminal *term = data; + + if (term->in_altscreen || !term->sb_size || !term->sb_current) { + return 1; + } + + for (size_t i = 0; i < term->sb_current; i++) { + xfree(term->sb_buffer[i]); + } + + term->sb_deleted += term->sb_current; + term->sb_current = 0; + term->sb_pending = 0; + invalidate_terminal(term, -1, -1); + + return 1; +} + static void term_clipboard_set(void **argv) { VTermSelectionMask mask = (VTermSelectionMask)(long)argv[0]; @@ -1695,26 +1715,6 @@ static int term_selection_set(VTermSelectionMask mask, VTermStringFragment frag, return 1; } -static int term_sb_clear(void *data) -{ - Terminal *term = data; - - if (term->in_altscreen || !term->sb_size || !term->sb_current) { - return 1; - } - - for (size_t i = 0; i < term->sb_current; i++) { - xfree(term->sb_buffer[i]); - } - - term->sb_deleted += term->sb_current; - term->sb_current = 0; - term->sb_pending = 0; - invalidate_terminal(term, -1, -1); - - return 1; -} - // }}} // input handling {{{