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

RDB's patch. Oodles of new terminal functionality, including

Browse Source 
ATTR_BLINK (as bold background) and VT52 support. Plus a
compatibility tracking system whereby all escape sequences can be
disabled for a pure-VT102 compatibility mode or other levels.

[originally from svn r421]
This commit is contained in:
Simon Tatham 2000-03-17 10:39:05 +00:00
parent 0d672df0ed
commit 693e51c934
2 changed files with 443 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
putty.h
View File

@ -28,6 +28,7 @@ GLOBAL HINSTANCE putty_inst;
#define ATTR_BOLD 0x00000100UL #define ATTR_BOLD 0x00000100UL
#define ATTR_UNDER 0x00000200UL #define ATTR_UNDER 0x00000200UL
#define ATTR_REVERSE 0x00000400UL #define ATTR_REVERSE 0x00000400UL
#define ATTR_BLINK 0x00000800UL
#define ATTR_FGMASK 0x0000F000UL #define ATTR_FGMASK 0x0000F000UL
#define ATTR_BGMASK 0x000F0000UL #define ATTR_BGMASK 0x000F0000UL
#define ATTR_FGSHIFT 12 #define ATTR_FGSHIFT 12
@ -75,7 +76,13 @@ GLOBAL Unscroll_Trigger unscroll_event;
GLOBAL char *logfile; GLOBAL char *logfile;
#define WM_NETEVENT (WM_USER + 1) /*
* I've just looked in the windows standard headr files for WM_USER, there
* are hundreds of flags defined using the form WM_USER+123 so I've
* renumbered this NETEVENT value and the two in window.c
*/
#define WM_XUSER (WM_USER + 0x2000)
#define WM_NETEVENT (WM_XUSER + 5)
typedef enum { typedef enum {
TS_AYT, TS_BRK, TS_SYNCH, TS_EC, TS_EL, TS_GA, TS_NOP, TS_ABORT, TS_AYT, TS_BRK, TS_SYNCH, TS_EC, TS_EL, TS_GA, TS_NOP, TS_ABORT,
@ -188,7 +195,7 @@ struct RSAKey; /* be a little careful of scope */
/* /*
* Exports from window.c. * Exports from window.c.
*/ */
void request_resize (int, int); void request_resize (int, int, int);
void do_text (Context, int, int, char *, int, unsigned long); void do_text (Context, int, int, char *, int, unsigned long);
void set_title (char *); void set_title (char *);
void set_icon (char *); void set_icon (char *);
@ -242,6 +249,7 @@ void term_mouse (Mouse_Button, Mouse_Action, int, int);
void term_deselect (void); void term_deselect (void);
void term_update (void); void term_update (void);
void term_invalidate(void); void term_invalidate(void);
void term_blink(int set_cursor);
/* /*
* Exports from raw.c. * Exports from raw.c.

484
terminal.c
View File

@ -5,6 +5,35 @@
#include "putty.h" #include "putty.h"
#define CL_ANSIMIN 0x0001 /* Everybody has these even MSDOS */
#define CL_VT100 0x0002 /* VT100 */
#define CL_VT100AVO 0x0004 /* VT100 +AVO; 132x24 (not 132x14) & attrs */
#define CL_VT102 0x0008 /* VT102 */
#define CL_VT220 0x0010 /* VT220 */
#define CL_VT320 0x0020 /* VT320 */
#define CL_VT420 0x0040 /* VT420 */
#define CL_VT510 0x0080 /* VT510, NB VT510 includes ANSI */
#define CL_VT340TEXT 0x0100 /* VT340 extensions that appear in the VT420 */
#define CL_ANSI 0x1000 /* ANSI ECMA-48 not in the VT100..VT420 */
#define CL_OTHER 0x2000 /* Others, Xterm, linux, putty, dunno, etc */
#define TM_ANSIMIN (CL_ANSIMIN)
#define TM_VT100 (CL_ANSIMIN+CL_VT100)
#define TM_VT100AVO (TM_VT100+CL_VT100AVO)
#define TM_VT102 (TM_VT100AVO+CL_VT102)
#define TM_PUTTY (-1)
#define compatibility(x) \
if ( ((CL_##x)&compatibility_level) == 0 ) { \
termstate=TOPLEVEL; \
break; \
}
#define has_compat(x) ( ((CL_##x)&compatibility_level) != 0 )
static int compatibility_level = TM_PUTTY;
static unsigned long *text; /* buffer of text on terminal screen */ static unsigned long *text; /* buffer of text on terminal screen */
static unsigned long *scrtop; /* top of working screen */ static unsigned long *scrtop; /* top of working screen */
static unsigned long *disptop; /* top of displayed screen */ static unsigned long *disptop; /* top of displayed screen */
@ -20,6 +49,7 @@ static unsigned char *selspace; /* buffer for building selections in */
#define fix_cpos do { cpos = scrtop + curs_y * (cols+1) + curs_x; } while(0) #define fix_cpos do { cpos = scrtop + curs_y * (cols+1) + curs_x; } while(0)
static unsigned long curr_attr, save_attr; static unsigned long curr_attr, save_attr;
static unsigned long erase_char = ERASE_CHAR;
static int curs_x, curs_y; /* cursor */ static int curs_x, curs_y; /* cursor */
static int save_x, save_y; /* saved cursor position */ static int save_x, save_y; /* saved cursor position */
@ -30,6 +60,11 @@ 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 rvideo; /* global reverse video flag */ static int rvideo; /* global reverse video flag */
static int cursor_on; /* cursor enabled flag */
static int reset_132; /* Flag ESC c resets to 80 cols */
static int use_bce; /* Use Background coloured erase */
static int blinker; /* When blinking is the cursor on ? */
static int vt52_mode; /* Is VT100+ in vt52 mode ? */
static unsigned long cset_attr[2]; static unsigned long cset_attr[2];
@ -56,11 +91,6 @@ static int osc_w;
static unsigned char *tabs; static unsigned char *tabs;
#define MAXNL 5
static int nl_count;
static int scroll_heuristic;
static enum { static enum {
TOPLEVEL, TOPLEVEL,
SEEN_ESC, SEEN_ESC,
@ -74,7 +104,10 @@ static enum {
SET_GL, SET_GR, SET_GL, SET_GR,
SEEN_OSC_P, SEEN_OSC_P,
OSC_STRING, OSC_MAYBE_ST, OSC_STRING, OSC_MAYBE_ST,
SEEN_ESCHASH SEEN_ESCHASH,
VT52_ESC,
VT52_Y1,
VT52_Y2
} termstate; } termstate;
static enum { static enum {
@ -128,9 +161,12 @@ static void power_on(void) {
alt_cset = cset = 0; alt_cset = cset = 0;
cset_attr[0] = cset_attr[1] = ATTR_ASCII; cset_attr[0] = cset_attr[1] = ATTR_ASCII;
rvideo = 0; rvideo = 0;
cursor_on = 1;
save_attr = curr_attr = ATTR_DEFAULT; save_attr = curr_attr = ATTR_DEFAULT;
app_cursor_keys = cfg.app_cursor; app_cursor_keys = cfg.app_cursor;
app_keypad_keys = cfg.app_keypad; app_keypad_keys = cfg.app_keypad;
use_bce = 0;
erase_char = ERASE_CHAR;
alt_which = 0; alt_which = 0;
{ {
int i; int i;
@ -159,8 +195,6 @@ void term_update(void) {
} }
do_paint (ctx, TRUE); do_paint (ctx, TRUE);
free_ctx (ctx); free_ctx (ctx);
nl_count = 0;
scroll_heuristic = 0;
} }
} }
@ -193,7 +227,6 @@ void term_init(void) {
selspace = NULL; selspace = NULL;
deselect(); deselect();
rows = cols = -1; rows = cols = -1;
nl_count = 0;
power_on(); power_on();
} }
@ -255,7 +288,7 @@ void term_size(int newrows, int newcols, int newsavelines) {
newalt = smalloc (newrows*(newcols+1)*TSIZE); newalt = smalloc (newrows*(newcols+1)*TSIZE);
for (i=0; i<newrows*(newcols+1); i++) for (i=0; i<newrows*(newcols+1); i++)
newalt[i] = ERASE_CHAR; newalt[i] = erase_char;
sfree (alttext); sfree (alttext);
alttext = newalt; alttext = newalt;
@ -389,7 +422,7 @@ static void scroll (int topline, int botline, int lines, int sb) {
if (scroll_size) if (scroll_size)
memmove (scroll_top, scroll_top + size, scroll_size*TSIZE); memmove (scroll_top, scroll_top + size, scroll_size*TSIZE);
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
scroll_top[i+scroll_size] = ERASE_CHAR; scroll_top[i+scroll_size] = erase_char;
if (selstart > scroll_top && if (selstart > scroll_top &&
selstart < scroll_top + size + scroll_size) { selstart < scroll_top + size + scroll_size) {
selstart -= size; selstart -= size;
@ -406,7 +439,7 @@ static void scroll (int topline, int botline, int lines, int sb) {
if (scroll_size) if (scroll_size)
memmove (scroll_top + size, scroll_top, scroll_size*TSIZE); memmove (scroll_top + size, scroll_top, scroll_size*TSIZE);
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
scroll_top[i] = ERASE_CHAR; scroll_top[i] = erase_char;
if (selstart > scroll_top && if (selstart > scroll_top &&
selstart < scroll_top + size + scroll_size) { selstart < scroll_top + size + scroll_size) {
selstart += size; selstart += size;
@ -420,8 +453,6 @@ static void scroll (int topline, int botline, int lines, int sb) {
selend = scroll_top + size + scroll_size; selend = scroll_top + size + scroll_size;
} }
} }
scroll_heuristic += lines;
} }
/* /*
@ -468,6 +499,7 @@ static void save_cursor(int save) {
cset = save_cset; cset = save_cset;
cset_attr[cset] = save_csattr; cset_attr[cset] = save_csattr;
fix_cpos; fix_cpos;
if (use_bce) erase_char = (' ' |(curr_attr&(ATTR_FGMASK|ATTR_BGMASK)));
} }
} }
@ -488,10 +520,15 @@ static void erase_lots (int line_only, int from_begin, int to_end) {
if (!from_begin) if (!from_begin)
startpos = cpos; startpos = cpos;
if (!to_end) if (!to_end)
endpos = cpos; endpos = cpos+1;
check_selection (startpos, endpos); check_selection (startpos, endpos);
/* Clear screen also forces a full window redraw, just in case. */
if (startpos == scrtop && endpos == scrtop + rows * (cols+1))
term_invalidate();
while (startpos < endpos) while (startpos < endpos)
*startpos++ = ERASE_CHAR; *startpos++ = erase_char;
} }
/* /*
@ -510,11 +547,11 @@ static void insch (int n) {
if (dir < 0) { if (dir < 0) {
memmove (cpos, cpos+n, m*TSIZE); memmove (cpos, cpos+n, m*TSIZE);
while (n--) while (n--)
cpos[m++] = ERASE_CHAR; cpos[m++] = erase_char;
} else { } else {
memmove (cpos+n, cpos, m*TSIZE); memmove (cpos+n, cpos, m*TSIZE);
while (n--) while (n--)
cpos[n] = ERASE_CHAR; cpos[n] = erase_char;
} }
} }
@ -527,13 +564,18 @@ static void toggle_mode (int mode, int query, int state) {
case 1: /* application cursor keys */ case 1: /* application cursor keys */
app_cursor_keys = state; app_cursor_keys = state;
break; break;
case 2: /* VT52 mode */
vt52_mode = !state;
break;
case 3: /* 80/132 columns */ case 3: /* 80/132 columns */
deselect(); deselect();
request_resize (state ? 132 : 80, rows); request_resize (state ? 132 : 80, rows, 1);
reset_132 = state;
break; break;
case 5: /* reverse video */ case 5: /* reverse video */
rvideo = state; rvideo = state;
seen_disp_event = TRUE; seen_disp_event = TRUE;
if (state) term_update();
break; break;
case 6: /* DEC origin mode */ case 6: /* DEC origin mode */
dec_om = state; dec_om = state;
@ -541,15 +583,34 @@ static void toggle_mode (int mode, int query, int state) {
case 7: /* auto wrap */ case 7: /* auto wrap */
wrap = state; wrap = state;
break; break;
case 25: /* enable/disable cursor */
compatibility(VT220);
cursor_on = state;
seen_disp_event = TRUE;
break;
case 47: /* alternate screen */ case 47: /* alternate screen */
compatibility(OTHER);
deselect(); deselect();
swap_screen (state); swap_screen (state);
disptop = scrtop; disptop = scrtop;
break; break;
} else switch (mode) { } else switch (mode) {
case 4: /* set insert mode */ case 4: /* set insert mode */
compatibility(VT102);
insert = state; insert = state;
break; break;
case 12: /* set echo mode */
/*
* This may be very good in smcup and rmcup (or smkx & rmkx) if you
* have a long RTT and the telnet client/daemon doesn't understand
* linemode.
*
* DONT send TS_RECHO/TS_LECHO; the telnet daemon tries to fix the
* tty and _really_ confuses some programs.
*/
compatibility(VT220);
ldisc = (state? &ldisc_simple : &ldisc_term);
break;
} }
} }
@ -595,10 +656,24 @@ void term_out(void) {
if (!fp) fp = fopen(logfile, "wb"); if (!fp) fp = fopen(logfile, "wb");
if (fp) fputc (c, fp); if (fp) fputc (c, fp);
} }
if( termstate < DO_CTRLS && (c&0x60) == 0 ) { /* Note only VT220+ are 8-bit VT102 is seven bit, it shouldn't even
* be able to display 8-bit characters, but I'll let that go 'cause
* of i18n.
*/
if( (c&0x60) == 0 && termstate < DO_CTRLS &&
( (c&0x80) == 0 || has_compat(VT220))) {
switch (c) { switch (c) {
case '\005': /* terminal type query */ case '\005': /* terminal type query */
ldisc->send ("PuTTY\r", 6); /* Strictly speaking this is VT100 but a VT100 defaults to
* no response. Other terminals respond at their option.
*
* Don't put a CR in the default string as this tends to
* upset some weird software.
*
* An xterm returns "xterm" (5 characters)
*/
compatibility(OTHER);
ldisc->send ("PuTTY", 5);
break; break;
case '\007': case '\007':
beep(); beep();
@ -615,21 +690,30 @@ void term_out(void) {
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case '\016': case '\016':
compatibility(VT100);
cset = 1; cset = 1;
break; break;
case '\017': case '\017':
compatibility(VT100);
cset = 0; cset = 0;
break; break;
case '\033': case '\033':
termstate = SEEN_ESC; if (vt52_mode)
termstate = VT52_ESC;
else {
compatibility(ANSIMIN);
termstate = SEEN_ESC;
}
break; break;
case 0233: case 0233:
compatibility(VT220);
termstate = SEEN_CSI; termstate = SEEN_CSI;
esc_nargs = 1; esc_nargs = 1;
esc_args[0] = ARG_DEFAULT; esc_args[0] = ARG_DEFAULT;
esc_query = FALSE; esc_query = FALSE;
break; break;
case 0235: case 0235:
compatibility(VT220);
termstate = SEEN_OSC; termstate = SEEN_OSC;
esc_args[0] = 0; esc_args[0] = 0;
break; break;
@ -641,6 +725,7 @@ void term_out(void) {
break; break;
case '\013': case '\013':
case '\014': case '\014':
compatibility(VT100);
case '\n': case '\n':
if (curs_y == marg_b) if (curs_y == marg_b)
scroll (marg_t, marg_b, 1, TRUE); scroll (marg_t, marg_b, 1, TRUE);
@ -651,7 +736,6 @@ void term_out(void) {
fix_cpos; fix_cpos;
wrapnext = FALSE; wrapnext = FALSE;
seen_disp_event = 1; seen_disp_event = 1;
nl_count++;
break; break;
case '\t': case '\t':
do { do {
@ -680,13 +764,28 @@ void term_out(void) {
curs_x = 0; curs_x = 0;
fix_cpos; fix_cpos;
wrapnext = FALSE; wrapnext = FALSE;
nl_count++;
} }
if (insert) if (insert)
insch (1); insch (1);
check_selection (cpos, cpos+1); if (selstate != NO_SELECTION)
*cpos++ = xlat_tty2scr((unsigned char)c) | curr_attr | check_selection (cpos, cpos+1);
(c <= 0x7F ? cset_attr[cset] : ATTR_ASCII); switch (cset_attr[cset]) {
/* Linedraw characters are different from 'ESC ( B' only
* for a small range, for ones outside that range make sure
* we use the same font as well as the same encoding.
*/
case ATTR_LINEDRW:
if (c<0x60 || c>0x7F)
*cpos++ = xlat_tty2scr((unsigned char)c) | curr_attr |
ATTR_ASCII;
else
*cpos++ = ((unsigned char)c) | curr_attr | ATTR_LINEDRW;
break;
default:
*cpos++ = xlat_tty2scr((unsigned char)c) | curr_attr |
(c <= 0x7F ? cset_attr[cset] : ATTR_ASCII);
break;
}
curs_x++; curs_x++;
if (curs_x == cols) { if (curs_x == cols) {
cpos--; cpos--;
@ -715,6 +814,7 @@ void term_out(void) {
termstate = TOPLEVEL; termstate = TOPLEVEL;
switch (c) { switch (c) {
case ' ': /* some weird sequence? */ case ' ': /* some weird sequence? */
compatibility(VT220);
termstate = IGNORE_NEXT; termstate = IGNORE_NEXT;
break; break;
case '[': /* enter CSI mode */ case '[': /* enter CSI mode */
@ -724,29 +824,38 @@ void term_out(void) {
esc_query = FALSE; esc_query = FALSE;
break; break;
case ']': /* xterm escape sequences */ case ']': /* xterm escape sequences */
/* Compatibility is nasty here, xterm, linux, decterm yuk! */
compatibility(OTHER);
termstate = SEEN_OSC; termstate = SEEN_OSC;
esc_args[0] = 0; esc_args[0] = 0;
break; break;
case '(': /* should set GL */ case '(': /* should set GL */
compatibility(VT100);
termstate = SET_GL; termstate = SET_GL;
break; break;
case ')': /* should set GR */ case ')': /* should set GR */
compatibility(VT100);
termstate = SET_GR; termstate = SET_GR;
break; break;
case '7': /* save cursor */ case '7': /* save cursor */
compatibility(VT100);
save_cursor (TRUE); save_cursor (TRUE);
break; break;
case '8': /* restore cursor */ case '8': /* restore cursor */
compatibility(VT100);
save_cursor (FALSE); save_cursor (FALSE);
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case '=': case '=':
compatibility(VT100);
app_keypad_keys = TRUE; app_keypad_keys = TRUE;
break; break;
case '>': case '>':
compatibility(VT100);
app_keypad_keys = FALSE; app_keypad_keys = FALSE;
break; break;
case 'D': /* exactly equivalent to LF */ case 'D': /* exactly equivalent to LF */
compatibility(VT100);
if (curs_y == marg_b) if (curs_y == marg_b)
scroll (marg_t, marg_b, 1, TRUE); scroll (marg_t, marg_b, 1, TRUE);
else if (curs_y < rows-1) else if (curs_y < rows-1)
@ -754,9 +863,9 @@ void term_out(void) {
fix_cpos; fix_cpos;
wrapnext = FALSE; wrapnext = FALSE;
seen_disp_event = TRUE; seen_disp_event = TRUE;
nl_count++;
break; break;
case 'E': /* exactly equivalent to CR-LF */ case 'E': /* exactly equivalent to CR-LF */
compatibility(VT100);
curs_x = 0; curs_x = 0;
wrapnext = FALSE; wrapnext = FALSE;
if (curs_y == marg_b) if (curs_y == marg_b)
@ -765,10 +874,10 @@ void term_out(void) {
curs_y++; curs_y++;
fix_cpos; fix_cpos;
wrapnext = FALSE; wrapnext = FALSE;
nl_count++;
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'M': /* reverse index - backwards LF */ case 'M': /* reverse index - backwards LF */
compatibility(VT100);
if (curs_y == marg_t) if (curs_y == marg_t)
scroll (marg_t, marg_b, -1, TRUE); scroll (marg_t, marg_b, -1, TRUE);
else if (curs_y > 0) else if (curs_y > 0)
@ -778,18 +887,26 @@ void term_out(void) {
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'Z': /* terminal type query */ case 'Z': /* terminal type query */
compatibility(VT100);
ldisc->send ("\033[?6c", 5); ldisc->send ("\033[?6c", 5);
break; break;
case 'c': /* restore power-on settings */ case 'c': /* restore power-on settings */
compatibility(VT100);
power_on(); power_on();
if (reset_132) {
request_resize (80, rows, 1);
reset_132 = 0;
}
fix_cpos; fix_cpos;
disptop = scrtop; disptop = scrtop;
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case '#': /* ESC # 8 fills screen with Es :-) */ case '#': /* ESC # 8 fills screen with Es :-) */
compatibility(VT100);
termstate = SEEN_ESCHASH; termstate = SEEN_ESCHASH;
break; break;
case 'H': /* set a tab */ case 'H': /* set a tab */
compatibility(VT100);
tabs[curs_x] = TRUE; tabs[curs_x] = TRUE;
break; break;
} }
@ -824,11 +941,15 @@ void term_out(void) {
move (curs_x, curs_y - def(esc_args[0], 1), 1); move (curs_x, curs_y - def(esc_args[0], 1), 1);
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'B': case 'e': /* move down N lines */ case 'e': /* move down N lines */
compatibility(ANSI);
case 'B':
move (curs_x, curs_y + def(esc_args[0], 1), 1); move (curs_x, curs_y + def(esc_args[0], 1), 1);
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'C': case 'a': /* move right N cols */ case 'a': /* move right N cols */
compatibility(ANSI);
case 'C':
move (curs_x + def(esc_args[0], 1), curs_y, 1); move (curs_x + def(esc_args[0], 1), curs_y, 1);
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
@ -837,18 +958,22 @@ void term_out(void) {
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'E': /* move down N lines and CR */ case 'E': /* move down N lines and CR */
compatibility(ANSI);
move (0, curs_y + def(esc_args[0], 1), 1); move (0, curs_y + def(esc_args[0], 1), 1);
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'F': /* move up N lines and CR */ case 'F': /* move up N lines and CR */
compatibility(ANSI);
move (0, curs_y - def(esc_args[0], 1), 1); move (0, curs_y - def(esc_args[0], 1), 1);
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'G': case '`': /* set horizontal posn */ case 'G': case '`': /* set horizontal posn */
compatibility(ANSI);
move (def(esc_args[0], 1) - 1, curs_y, 0); move (def(esc_args[0], 1) - 1, curs_y, 0);
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'd': /* set vertical posn */ case 'd': /* set vertical posn */
compatibility(ANSI);
move (curs_x, (dec_om ? marg_t : 0) + def(esc_args[0], 1) - 1, move (curs_x, (dec_om ? marg_t : 0) + def(esc_args[0], 1) - 1,
(dec_om ? 2 : 0)); (dec_om ? 2 : 0));
seen_disp_event = TRUE; seen_disp_event = TRUE;
@ -881,42 +1006,67 @@ void term_out(void) {
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'L': /* insert lines */ case 'L': /* insert lines */
compatibility(VT102);
if (curs_y <= marg_b) if (curs_y <= marg_b)
scroll (curs_y, marg_b, -def(esc_args[0], 1), FALSE); scroll (curs_y, marg_b, -def(esc_args[0], 1), FALSE);
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'M': /* delete lines */ case 'M': /* delete lines */
compatibility(VT102);
if (curs_y <= marg_b) if (curs_y <= marg_b)
scroll (curs_y, marg_b, def(esc_args[0], 1), TRUE); scroll (curs_y, marg_b, def(esc_args[0], 1), TRUE);
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case '@': /* insert chars */ case '@': /* insert chars */
/* XXX VTTEST says this is vt220, vt510 manual says vt102 */
compatibility(VT102);
insch (def(esc_args[0], 1)); insch (def(esc_args[0], 1));
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'P': /* delete chars */ case 'P': /* delete chars */
compatibility(VT102);
insch (-def(esc_args[0], 1)); insch (-def(esc_args[0], 1));
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 'c': /* terminal type query */ case 'c': /* terminal type query */
compatibility(VT100);
/* This is the response for a VT102 */
ldisc->send ("\033[?6c", 5); ldisc->send ("\033[?6c", 5);
break; break;
case 'n': /* cursor position query */ case 'n': /* cursor position query */
if (esc_args[0] == 6) { if (esc_args[0] == 6) {
/* Wonder of wonders ANSI.SYS has this!! */
char buf[32]; char buf[32];
sprintf (buf, "\033[%d;%dR", curs_y + 1, curs_x + 1); sprintf (buf, "\033[%d;%dR", curs_y + 1, curs_x + 1);
ldisc->send (buf, strlen(buf)); ldisc->send (buf, strlen(buf));
} }
else if (esc_args[0] == 5) {
/* Are we working ... well I suppose so :-) */
/* But ANSI.SYS doesn't say it's working :-) :-) */
compatibility(VT100);
ldisc->send ("\033[0n", 4);
}
break; break;
case 'h': /* toggle a mode to high */ case 'h': /* toggle modes to high */
case ANSI_QUE('h'): case ANSI_QUE('h'):
toggle_mode (esc_args[0], esc_query, TRUE); compatibility(VT100);
{
int i;
for (i=0; i<esc_nargs; i++)
toggle_mode (esc_args[i], esc_query, TRUE);
}
break; break;
case 'l': /* toggle a mode to low */ case 'l': /* toggle modes to low */
case ANSI_QUE('l'): case ANSI_QUE('l'):
toggle_mode (esc_args[0], esc_query, FALSE); compatibility(VT100);
{
int i;
for (i=0; i<esc_nargs; i++)
toggle_mode (esc_args[i], esc_query, FALSE);
}
break; break;
case 'g': /* clear tabs */ case 'g': /* clear tabs */
compatibility(VT100);
if (esc_nargs == 1) { if (esc_nargs == 1) {
if (esc_args[0] == 0) { if (esc_args[0] == 0) {
tabs[curs_x] = FALSE; tabs[curs_x] = FALSE;
@ -928,13 +1078,20 @@ void term_out(void) {
} }
break; break;
case 'r': /* set scroll margins */ case 'r': /* set scroll margins */
compatibility(VT100);
if (esc_nargs <= 2) { if (esc_nargs <= 2) {
int top, bot; int top, bot;
top = def(esc_args[0], 1) - 1; /* VTTEST Bug 9 if the first arg is default _or_ zero
if (top < 0) * this is a full screen region irrespective of 2nd arg.
top = 0; */
bot = (esc_nargs <= 1 || esc_args[1] == 0 ? rows : if (esc_args[0] <= 0) {
def(esc_args[1], rows)) - 1; top=0;
bot=rows-1;
} else {
top = def(esc_args[0], 1) - 1;
bot = (esc_nargs <= 1 || esc_args[1] == 0 ? rows :
def(esc_args[1], rows)) - 1;
}
if (bot >= rows) if (bot >= rows)
bot = rows-1; bot = rows-1;
if (top <= bot) { if (top <= bot) {
@ -946,8 +1103,10 @@ void term_out(void) {
* placed at the top of the newly marginned * placed at the top of the newly marginned
* area. Apparently not: VMS TPU falls over * area. Apparently not: VMS TPU falls over
* if so. * if so.
*
* Well actually it should for Origin mode - RDB
*/ */
curs_y = 0; curs_y = (dec_om ? marg_t : 0);
fix_cpos; fix_cpos;
seen_disp_event = TRUE; seen_disp_event = TRUE;
} }
@ -955,23 +1114,58 @@ void term_out(void) {
break; break;
case 'm': /* set graphics rendition */ case 'm': /* set graphics rendition */
{ {
/*
* A VT100 without the AVO only had one attribute, either
* underline or reverse video depending on the cursor type,
* this was selected by CSI 7m.
*
* case 2:
* This is DIM on the VT100-AVO and VT102
* case 5:
* This is BLINK on the VT100-AVO and VT102+
* case 8:
* This is INVIS on the VT100-AVO and VT102
* case 21:
* This like 22 disables BOLD, DIM and INVIS
*
* The ANSI colours appear on any terminal that has colour
* (obviously) but the interaction between sgr0 and the
* colours varies but is usually related to the background
* colour erase item.
* The interaction between colour attributes and the mono
* ones is also very implementation dependent.
*
* The 39 and 49 attributes are likely to be unimplemented.
*/
int i; int i;
for (i=0; i<esc_nargs; i++) { for (i=0; i<esc_nargs; i++) {
switch (def(esc_args[i], 0)) { switch (def(esc_args[i], 0)) {
case 0: /* restore defaults */ case 0: /* restore defaults */
curr_attr = ATTR_DEFAULT; break; curr_attr = ATTR_DEFAULT; break;
case 1: /* enable bold */ case 1: /* enable bold */
compatibility(VT100AVO);
curr_attr |= ATTR_BOLD; break; curr_attr |= ATTR_BOLD; break;
case 4: /* enable underline */
case 21: /* (enable double underline) */ case 21: /* (enable double underline) */
compatibility(OTHER);
case 4: /* enable underline */
compatibility(VT100AVO);
curr_attr |= ATTR_UNDER; break; curr_attr |= ATTR_UNDER; break;
case 5: /* enable blink */
compatibility(VT100AVO);
curr_attr |= ATTR_BLINK; break;
case 7: /* enable reverse video */ case 7: /* enable reverse video */
curr_attr |= ATTR_REVERSE; break; curr_attr |= ATTR_REVERSE; break;
case 22: /* disable bold */ case 22: /* disable bold */
compatibility(VT220);
curr_attr &= ~ATTR_BOLD; break; curr_attr &= ~ATTR_BOLD; break;
case 24: /* disable underline */ case 24: /* disable underline */
compatibility(VT220);
curr_attr &= ~ATTR_UNDER; break; curr_attr &= ~ATTR_UNDER; break;
case 25: /* disable blink */
compatibility(VT220);
curr_attr &= ~ATTR_BLINK; break;
case 27: /* disable reverse video */ case 27: /* disable reverse video */
compatibility(VT220);
curr_attr &= ~ATTR_REVERSE; break; curr_attr &= ~ATTR_REVERSE; break;
case 30: case 31: case 32: case 33: case 30: case 31: case 32: case 33:
case 34: case 35: case 36: case 37: case 34: case 35: case 36: case 37:
@ -995,6 +1189,8 @@ void term_out(void) {
break; break;
} }
} }
if (use_bce)
erase_char = (' '|(curr_attr&(ATTR_FGMASK|ATTR_BGMASK)));
} }
break; break;
case 's': /* save cursor */ case 's': /* save cursor */
@ -1005,10 +1201,44 @@ void term_out(void) {
seen_disp_event = TRUE; seen_disp_event = TRUE;
break; break;
case 't': /* set page size - ie window height */ case 't': /* set page size - ie window height */
request_resize (cols, def(esc_args[0], 24)); /*
deselect(); * VT340/VT420 sequence DECSLPP, DEC only allows values
* 24/25/36/48/72/144 other emulators (eg dtterm) use
* illegal values (eg first arg 1..9) for window changing
* and reports.
*/
compatibility(VT340TEXT);
if (esc_nargs<=1 && (esc_args[0]<1 || esc_args[0]>=24)) {
request_resize (cols, def(esc_args[0], 24), 0);
deselect();
}
break;
case ANSI('|', '*'):
/* VT420 sequence DECSNLS
* Set number of lines on screen
* VT420 uses VGA like hardware and can support any size in
* reasonable range (24..49 AIUI) with no default specified.
*/
compatibility(VT420);
if (esc_nargs==1 && esc_args[0]>=24) {
request_resize (cols, def(esc_args[0], cfg.height), 0);
deselect();
}
break;
case ANSI('|', '$'):
/* VT340/VT420 sequence DECSCPP
* Set number of columns per page
* Docs imply range is only 80 or 132, but I'll allow any.
*/
compatibility(VT340TEXT);
if (esc_nargs<=1) {
request_resize (cols, def(esc_args[0], cfg.width), 0);
deselect();
}
break; break;
case 'X': /* write N spaces w/o moving cursor */ case 'X': /* write N spaces w/o moving cursor */
/* XXX VTTEST says this is vt220, vt510 manual says vt100 */
compatibility(VT100);
{ {
int n = def(esc_args[0], 1); int n = def(esc_args[0], 1);
unsigned long *p = cpos; unsigned long *p = cpos;
@ -1016,11 +1246,12 @@ void term_out(void) {
n = cols - curs_x; n = cols - curs_x;
check_selection (cpos, cpos+n); check_selection (cpos, cpos+n);
while (n--) while (n--)
*p++ = ERASE_CHAR; *p++ = erase_char;
seen_disp_event = TRUE; seen_disp_event = TRUE;
} }
break; break;
case 'x': /* report terminal characteristics */ case 'x': /* report terminal characteristics */
compatibility(VT100);
{ {
char buf[32]; char buf[32];
int i = def(esc_args[0], 0); int i = def(esc_args[0], 0);
@ -1031,10 +1262,38 @@ void term_out(void) {
} }
} }
break; break;
case ANSI('L','='):
compatibility(OTHER);
use_bce = (esc_args[0]<=0);
erase_char = ERASE_CHAR;
if (use_bce)
erase_char = (' '|(curr_attr&(ATTR_FGMASK|ATTR_BGMASK)));
break;
case ANSI('p','"'):
/* Allow the host to make this emulator a 'perfect' VT102.
* This first appeared in the VT220, but we do need to get
* back to PuTTY mode so I won't check it.
*
* The arg == 60 is a PuTTY extension.
* The 2nd arg, 8bit vs 7bit is not obeyed.
*
* Setting VT102 mode should also change the Fkeys to
* generate PF* codes as a real VT102 has no Fkeys.
* The VT220 does this, F11..F13 become ESC,BS,LF other Fkeys
* send nothing.
*
* Note ESC c will NOT change this!
*/
if (esc_args[0] == 61) compatibility_level = TM_VT102;
else if (esc_args[0] == 60) compatibility_level = TM_ANSIMIN;
else compatibility_level = TM_PUTTY;
break;
} }
break; break;
case SET_GL: case SET_GL:
case SET_GR: case SET_GR:
/* VT100 only here, checked above */
switch (c) { switch (c) {
case 'A': case 'A':
cset_attr[termstate == SET_GL ? 0 : 1] = ATTR_GBCHR; cset_attr[termstate == SET_GL ? 0 : 1] = ATTR_GBCHR;
@ -1042,11 +1301,12 @@ void term_out(void) {
case '0': case '0':
cset_attr[termstate == SET_GL ? 0 : 1] = ATTR_LINEDRW; cset_attr[termstate == SET_GL ? 0 : 1] = ATTR_LINEDRW;
break; break;
case 'B':
default: /* specifically, 'B' */ default: /* specifically, 'B' */
cset_attr[termstate == SET_GL ? 0 : 1] = ATTR_ASCII; cset_attr[termstate == SET_GL ? 0 : 1] = ATTR_ASCII;
break; break;
} }
if( c != '%' ) if( !has_compat(VT220) || c != '%' )
termstate = TOPLEVEL; termstate = TOPLEVEL;
break; break;
case SEEN_OSC: case SEEN_OSC:
@ -1158,12 +1418,97 @@ void term_out(void) {
} }
termstate = TOPLEVEL; termstate = TOPLEVEL;
break; break;
case VT52_ESC:
termstate = TOPLEVEL;
seen_disp_event = TRUE;
switch (c) {
case 'A':
move (curs_x, curs_y - 1, 1);
break;
case 'B':
move (curs_x, curs_y + 1, 1);
break;
case 'C':
move (curs_x + 1, curs_y, 1);
break;
case 'D':
move (curs_x - 1, curs_y, 1);
break;
case 'F':
cset_attr[cset=0] = ATTR_LINEDRW;
break;
case 'G':
cset_attr[cset=0] = ATTR_ASCII;
break;
case 'H':
move (0, 0, 0);
break;
case 'I':
if (curs_y == 0)
scroll (0, rows-1, -1, TRUE);
else if (curs_y > 0)
curs_y--;
fix_cpos;
wrapnext = FALSE;
break;
case 'J':
erase_lots(FALSE, FALSE, TRUE);
disptop = scrtop;
break;
case 'K':
erase_lots(TRUE, FALSE, TRUE);
break;
case 'V':
/* XXX Print cursor line */
break;
case 'W':
/* XXX Start controller mode */
break;
case 'X':
/* XXX Stop controller mode */
break;
case 'Y':
termstate = VT52_Y1;
break;
case 'Z':
ldisc->send ("\033/Z", 3);
break;
case '=':
app_cursor_keys = TRUE;
break;
case '>':
app_cursor_keys = FALSE;
break;
case '<':
/* XXX This should switch to VT100 mode not current or default
* VT mode. But this will only have effect in a VT220+
* emulation.
*/
vt52_mode = FALSE;
break;
case '^':
/* XXX Enter auto print mode */
break;
case '_':
/* XXX Exit auto print mode */
break;
case ']':
/* XXX Print screen */
break;
}
break;
case VT52_Y1:
termstate = VT52_Y2;
move(curs_x, c-' ', 0);
break;
case VT52_Y2:
termstate = TOPLEVEL;
move(c-' ', curs_y, 0);
break;
} }
check_selection (cpos, cpos+1); if (selstate != NO_SELECTION)
check_selection (cpos, cpos+1);
} }
if (nl_count > MAXNL)
term_update();
} }
/* /*
@ -1188,7 +1533,15 @@ static void do_paint (Context ctx, int may_optimise){
unsigned long attr, rv, cursor; unsigned long attr, rv, cursor;
char ch[1024]; char ch[1024];
cursor = (has_focus ? ATTR_ACTCURS : ATTR_PASCURS); if (cursor_on) {
if (has_focus) {
if (blinker) cursor = ATTR_ACTCURS;
else cursor = 0;
}
else
cursor = ATTR_PASCURS;
}
else cursor = 0;
rv = (rvideo ? ATTR_REVERSE : 0); rv = (rvideo ? ATTR_REVERSE : 0);
our_curs_y = curs_y + (scrtop - disptop) / (cols+1); our_curs_y = curs_y + (scrtop - disptop) / (cols+1);
@ -1235,6 +1588,31 @@ static void do_paint (Context ctx, int may_optimise){
} }
} }
/*
* Flick the switch that says if blinking things should be shown or hidden.
*/
void term_blink(int flg) {
static long last_blink = 0;
long now, blink_diff;
if (flg) {
blinker = 1;
last_blink = GetTickCount();
return;
}
now = GetTickCount();
blink_diff = now-last_blink;
/* Make sure the cursor blinks no more than 2Hz */
if (blink_diff>=0 && blink_diff<450)
return;
last_blink = now;
blinker = !blinker;
}
/* /*
* Invalidate the whole screen so it will be repainted in full. * Invalidate the whole screen so it will be repainted in full.
*/ */
@ -1259,7 +1637,11 @@ void term_paint (Context ctx, int l, int t, int r, int b) {
for (j = left; j <= right && j < cols ; j++) for (j = left; j <= right && j < cols ; j++)
disptext[i*(cols+1)+j] = ATTR_INVALID; disptext[i*(cols+1)+j] = ATTR_INVALID;
/* This should happen soon enough, also for some reason it sometimes
* fails to actually do anything when re-sizing ... painting the wrong
* window perhaps ?
do_paint (ctx, FALSE); do_paint (ctx, FALSE);
*/
} }
/* /*