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

The `wrapnext' variable now states whether we _would_ wrap next

Browse Source 
character if we were wrapping, not whether we _will_ wrap next
character. Makes for saner behaviour with vertical-line cursor and
also when changing autowrap mode while on rightmost column. Does
entail small behavioural changes to backspace and destructive-
backspace when in rightmost column with Auto Wrap off, but I don't
think they should be catastrophic, or indeed that there's a well
defined Right Behaviour.

[originally from svn r872]
This commit is contained in:
Simon Tatham 2001-01-17 17:25:58 +00:00
parent d199d419fa
commit d9de560388
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
terminal.c
View File

@ -900,7 +900,7 @@ static int beep_overload = 0;
} }
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case '\177': /* Destructive backspace case '\177': /* Destructive backspace
This does nothing on a real VT100 */ This does nothing on a real VT100 */
compatibility(OTHER); compatibility(OTHER);
if (curs_x && !wrapnext) curs_x--; if (curs_x && !wrapnext) curs_x--;
@ -913,7 +913,7 @@ static int beep_overload = 0;
else switch (termstate) { else switch (termstate) {
case TOPLEVEL: case TOPLEVEL:
/* Only graphic characters get this far, ctrls are stripped above */ /* Only graphic characters get this far, ctrls are stripped above */
if (wrapnext) { if (wrapnext && wrap) {
cpos[1] |= ATTR_WRAPPED; cpos[1] |= ATTR_WRAPPED;
if (curs_y == marg_b) if (curs_y == marg_b)
scroll (marg_t, marg_b, 1, TRUE); scroll (marg_t, marg_b, 1, TRUE);
@ -959,7 +959,7 @@ static int beep_overload = 0;
if (curs_x == cols) { if (curs_x == cols) {
cpos--; cpos--;
curs_x--; curs_x--;
wrapnext = wrap; wrapnext = TRUE;
} }
seen_disp_event = 1; seen_disp_event = 1;
break; break;