Alexander/st
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent losing columns on resize

Browse Source
This commit is contained in:
Luke Smith 2021-08-10 17:25:48 -04:00
parent 0af4782a47
commit e053bd6036
No known key found for this signature in database
GPG Key ID: 4C50B54A911F6252
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
st.c
View File

@ -118,6 +118,7 @@ typedef struct {
typedef struct { typedef struct {
int row; /* nb row */ int row; /* nb row */
int col; /* nb col */ int col; /* nb col */
int maxcol;
Line *line; /* screen */ Line *line; /* screen */
Line *alt; /* alternate screen */ Line *alt; /* alternate screen */
Line hist[HISTSIZE]; /* history buffer */ Line hist[HISTSIZE]; /* history buffer */
@ -1311,8 +1312,8 @@ tclearregion(int x1, int y1, int x2, int y2)
if (y1 > y2) if (y1 > y2)
temp = y1, y1 = y2, y2 = temp; temp = y1, y1 = y2, y2 = temp;
LIMIT(x1, 0, term.col-1); LIMIT(x1, 0, term.maxcol-1);
LIMIT(x2, 0, term.col-1); LIMIT(x2, 0, term.maxcol-1);
LIMIT(y1, 0, term.row-1); LIMIT(y1, 0, term.row-1);
LIMIT(y2, 0, term.row-1); LIMIT(y2, 0, term.row-1);
@ -2607,11 +2608,18 @@ void
tresize(int col, int row) tresize(int col, int row)
{ {
int i, j; int i, j;
int minrow = MIN(row, term.row); int tmp;
int mincol = MIN(col, term.col); int minrow, mincol;
int *bp; int *bp;
TCursor c; TCursor c;
tmp = col;
if (!term.maxcol)
term.maxcol = term.col;
col = MAX(col, term.maxcol);
minrow = MIN(row, term.row);
mincol = MIN(col, term.maxcol);
if (col < 1 || row < 1) { if (col < 1 || row < 1) {
fprintf(stderr, fprintf(stderr,
"tresize: error resizing to %dx%d\n", col, row); "tresize: error resizing to %dx%d\n", col, row);
@ -2662,17 +2670,18 @@ tresize(int col, int row)
term.line[i] = xmalloc(col * sizeof(Glyph)); term.line[i] = xmalloc(col * sizeof(Glyph));
term.alt[i] = xmalloc(col * sizeof(Glyph)); term.alt[i] = xmalloc(col * sizeof(Glyph));
} }
if (col > term.col) { if (col > term.maxcol) {
bp = term.tabs + term.col; bp = term.tabs + term.maxcol;
memset(bp, 0, sizeof(*term.tabs) * (col - term.col)); memset(bp, 0, sizeof(*term.tabs) * (col - term.maxcol));
while (--bp > term.tabs && !*bp) while (--bp > term.tabs && !*bp)
/* nothing */ ; /* nothing */ ;
for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces) for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
*bp = 1; *bp = 1;
} }
/* update terminal size */ /* update terminal size */
term.col = col; term.col = tmp;
term.maxcol = col;
term.row = row; term.row = row;
/* reset scrolling region */ /* reset scrolling region */
tsetscroll(0, row-1); tsetscroll(0, row-1);