diff options
| author | Paul "LeoNerd" Evans <leonerd@leonerd.org.uk> | 2024-09-05 15:07:37 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2024-09-05 15:38:58 +0200 |
| commit | f4d823b1231fd3b8782fc7d8ef525b531ef31445 (patch) | |
| tree | d7afd9892430bed7fff2c8d5b247d44bbcce1d5a | |
| parent | 76aa3e52be7a5a8b53b3775981c35313284230ac (diff) | |
| download | rneovim-f4d823b1231fd3b8782fc7d8ef525b531ef31445.tar.gz rneovim-f4d823b1231fd3b8782fc7d8ef525b531ef31445.tar.bz2 rneovim-f4d823b1231fd3b8782fc7d8ef525b531ef31445.zip | |
refactor(vterm): inline REFLOW macro
cherry-picked from https://github.com/neovim/libvterm/commit/dfc4c5e5b3dd99247dc95031a8f40087f181dea5
| -rw-r--r-- | src/vterm/screen.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/vterm/screen.c b/src/vterm/screen.c index e63db483f9..1f5bb36114 100644 --- a/src/vterm/screen.c +++ b/src/vterm/screen.c @@ -509,8 +509,6 @@ static int line_popcount(ScreenCell *buffer, int row, int rows, int cols) return col + 1; } -#define REFLOW (screen->reflow) - static void resize_buffer(VTermScreen *screen, int bufidx, int new_rows, int new_cols, bool active, VTermStateFields *statefields) { int old_rows = screen->rows; @@ -541,13 +539,13 @@ static void resize_buffer(VTermScreen *screen, int bufidx, int new_rows, int new while(old_row >= 0) { int old_row_end = old_row; /* TODO: Stop if dwl or dhl */ - while(REFLOW && old_lineinfo && old_row > 0 && old_lineinfo[old_row].continuation) + while(screen->reflow && old_lineinfo && old_row > 0 && old_lineinfo[old_row].continuation) old_row--; int old_row_start = old_row; int width = 0; for(int row = old_row_start; row <= old_row_end; row++) { - if(REFLOW && row < (old_rows - 1) && old_lineinfo[row + 1].continuation) + if(screen->reflow && row < (old_rows - 1) && old_lineinfo[row + 1].continuation) width += old_cols; else width += line_popcount(old_buffer, row, old_rows, old_cols); @@ -556,7 +554,7 @@ static void resize_buffer(VTermScreen *screen, int bufidx, int new_rows, int new if(final_blank_row == (new_row + 1) && width == 0) final_blank_row = new_row; - int new_height = REFLOW + int new_height = screen->reflow ? width ? (width + new_cols - 1) / new_cols : 1 : 1; @@ -629,7 +627,7 @@ static void resize_buffer(VTermScreen *screen, int bufidx, int new_rows, int new if(old_col == old_cols) { old_row++; - if(!REFLOW) { + if(!screen->reflow) { new_col++; break; } |