IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(vterm): inline REFLOW macro

Browse Source 
cherry-picked from dfc4c5e5b3
This commit is contained in:
Paul "LeoNerd" Evans 2024-09-05 15:07:37 +02:00 committed by Christian Clason
parent 76aa3e52be
commit f4d823b123
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vterm/screen.c
View File

@ -509,8 +509,6 @@ static int line_popcount(ScreenCell *buffer, int row, int rows, int cols)
return col + 1; 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) static void resize_buffer(VTermScreen *screen, int bufidx, int new_rows, int new_cols, bool active, VTermStateFields *statefields)
{ {
int old_rows = screen->rows; 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) { while(old_row >= 0) {
int old_row_end = old_row; int old_row_end = old_row;
/* TODO: Stop if dwl or dhl */ /* 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--; old_row--;
int old_row_start = old_row; int old_row_start = old_row;
int width = 0; int width = 0;
for(int row = old_row_start; row <= old_row_end; row++) { 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; width += old_cols;
else else
width += line_popcount(old_buffer, row, old_rows, old_cols); 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) if(final_blank_row == (new_row + 1) && width == 0)
final_blank_row = new_row; final_blank_row = new_row;
int new_height = REFLOW int new_height = screen->reflow
? width ? (width + new_cols - 1) / new_cols : 1 ? width ? (width + new_cols - 1) / new_cols : 1
: 1; : 1;
@ -629,7 +627,7 @@ static void resize_buffer(VTermScreen *screen, int bufidx, int new_rows, int new
if(old_col == old_cols) { if(old_col == old_cols) {
old_row++; old_row++;
if(!REFLOW) { if(!screen->reflow) {
new_col++; new_col++;
break; break;
} }