nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 06:38:37 -05:00
Code Issues Projects Releases Wiki Activity

Fix many bugs in resizeline().

Browse Source 
[originally from svn r4629]
This commit is contained in:
Simon Tatham 2004-10-15 10:48:27 +00:00
parent 845138a1e8
commit 0d05595db9
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
terminal.c
View File

@ -845,9 +845,12 @@ static termline *decompressline(unsigned char *data, int *bytes_used)
*/ */
static void resizeline(Terminal *term, termline *line, int cols) static void resizeline(Terminal *term, termline *line, int cols)
{ {
int i, oldlen; int i, oldcols;
if (line->cols != cols) { if (line->cols != cols) {
oldcols = line->cols;
/* /*
* This line is the wrong length, which probably means it * This line is the wrong length, which probably means it
* hasn't been accessed since a resize. Resize it now. * hasn't been accessed since a resize. Resize it now.
@ -856,23 +859,35 @@ static void resizeline(Terminal *term, termline *line, int cols)
* out in the resize (if we're shrinking the line) and * out in the resize (if we're shrinking the line) and
* return their cc lists to the cc free list. * return their cc lists to the cc free list.
*/ */
for (i = cols; i < line->cols; i++) for (i = cols; i < oldcols; i++)
clear_cc(line, i); clear_cc(line, i);
/*
* If we're shrinking the line, we now bodily move the
* entire cc section from where it started to where it now
* needs to be. (We have to do this before the resize, so
* that the data we're copying is still there. However, if
* we're expanding, we have to wait until _after_ the
* resize so that the space we're copying into is there.)
*/
if (cols < oldcols)
memmove(line->chars + cols, line->chars + oldcols,
(line->size - line->cols) * TSIZE);
/* /*
* Now do the actual resize, leaving the _same_ amount of * Now do the actual resize, leaving the _same_ amount of
* cc space as there was to begin with. * cc space as there was to begin with.
*/ */
oldlen = line->cols; line->size += cols - oldcols;
line->size += cols - oldlen;
line->chars = sresize(line->chars, line->size, TTYPE); line->chars = sresize(line->chars, line->size, TTYPE);
line->cols = cols; line->cols = cols;
/* /*
* Bodily move the entire cc section from where it started * If we're expanding the line, _now_ we move the cc
* to where it now needs to be. * section.
*/ */
memmove(line->chars + line->cols, line->chars + oldlen, if (cols > oldcols)
memmove(line->chars + cols, line->chars + oldcols,
(line->size - line->cols) * TSIZE); (line->size - line->cols) * TSIZE);
/* /*
@ -882,18 +897,18 @@ static void resizeline(Terminal *term, termline *line, int cols)
* relative offsets within the cc block.) Also do the same * relative offsets within the cc block.) Also do the same
* to the head of the cc_free list. * to the head of the cc_free list.
*/ */
for (i = 0; i < oldlen && i < line->cols; i++) for (i = 0; i < oldcols && i < cols; i++)
if (line->chars[i].cc_next) if (line->chars[i].cc_next)
line->chars[i].cc_next += cols - oldlen; line->chars[i].cc_next += cols - oldcols;
if (line->cc_free) if (line->cc_free)
line->cc_free += cols - oldlen; line->cc_free += cols - oldcols;
/* /*
* And finally fill in the new space with erase chars. (We * And finally fill in the new space with erase chars. (We
* don't have to worry about cc lists here, because we * don't have to worry about cc lists here, because we
* _know_ the erase char doesn't have one.) * _know_ the erase char doesn't have one.)
*/ */
for (i = oldlen; i < cols; i++) for (i = oldcols; i < cols; i++)
line->chars[i] = term->basic_erase_char; line->chars[i] = term->basic_erase_char;
cc_check(line); /* XXX-REMOVE-BEFORE-RELEASE */ cc_check(line); /* XXX-REMOVE-BEFORE-RELEASE */