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

The `wrapnext' flag should be saved and restored with the cursor

Browse Source 
position. Failure to do this can give wrapnext==TRUE even with the
cursor not in the rightmost column.

[originally from svn r1572]
This commit is contained in:
Simon Tatham 2002-03-02 17:37:48 +00:00
parent fdbd697801
commit d21683f92c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
terminal.c
View File

@ -99,7 +99,7 @@ static int wrap, wrapnext; /* wrap flags */
static int insert; /* insert-mode flag */ static int insert; /* insert-mode flag */
static int cset; /* 0 or 1: which char set */ static int cset; /* 0 or 1: which char set */
static int save_cset, save_csattr; /* saved with cursor position */ static int save_cset, save_csattr; /* saved with cursor position */
static int save_utf; /* saved with cursor position */ static int save_utf, save_wnext; /* saved with cursor position */
static int rvideo; /* global reverse video flag */ static int rvideo; /* global reverse video flag */
static unsigned long rvbell_startpoint;/* for ESC[?5hESC[?5l vbell */ static unsigned long rvbell_startpoint;/* for ESC[?5hESC[?5l vbell */
static int cursor_on; /* cursor enabled flag */ static int cursor_on; /* cursor enabled flag */
@ -746,6 +746,7 @@ static void save_cursor(int save)
save_attr = curr_attr; save_attr = curr_attr;
save_cset = cset; save_cset = cset;
save_utf = utf; save_utf = utf;
save_wnext = wrapnext;
save_csattr = cset_attr[cset]; save_csattr = cset_attr[cset];
save_sco_acs = sco_acs; save_sco_acs = sco_acs;
} else { } else {
@ -759,6 +760,13 @@ static void save_cursor(int save)
curr_attr = save_attr; curr_attr = save_attr;
cset = save_cset; cset = save_cset;
utf = save_utf; utf = save_utf;
wrapnext = save_wnext;
/*
* wrapnext might reset to False if the x position is no
* longer at the rightmost edge.
*/
if (wrapnext && curs.x < cols-1)
wrapnext = FALSE;
cset_attr[cset] = save_csattr; cset_attr[cset] = save_csattr;
sco_acs = save_sco_acs; sco_acs = save_sco_acs;
fix_cpos; fix_cpos;