static unsigned long *wanttext; /* buffer of text we want on screen */
static unsigned long *alttext; /* buffer of text on alt. screen */
+#define VBELL_TIMEOUT 100 /* millisecond duration of visual bell */
+
+struct beeptime {
+ struct beeptime *next;
+ long ticks;
+};
+static struct beeptime *beephead, *beeptail;
+int nbeeps;
+int beep_overloaded;
+long lastbeep;
+
static unsigned char *selspace; /* buffer for building selections in */
#define TSIZE (sizeof(*text))
static int blinker; /* When blinking is the cursor on ? */
static int tblinker; /* When the blinking text is on */
static int blink_is_real; /* Actually blink blinking text */
+static int term_echoing; /* Does terminal want local echo? */
+static int term_editing; /* Does terminal want local edit? */
static unsigned long cset_attr[2];
alt_cset = cset = 0;
cset_attr[0] = cset_attr[1] = ATTR_ASCII;
rvideo = 0;
+ in_vbell = FALSE;
cursor_on = 1;
save_attr = curr_attr = ATTR_DEFAULT;
+ term_editing = term_echoing = FALSE;
+ ldisc_send(NULL, 0); /* cause ldisc to notice changes */
app_cursor_keys = cfg.app_cursor;
app_keypad_keys = cfg.app_keypad;
use_bce = cfg.bce;
deselect();
rows = cols = -1;
power_on();
+ beephead = beeptail = NULL;
+ nbeeps = 0;
+ lastbeep = FALSE;
+ beep_overloaded = FALSE;
}
/*
case 8: /* auto key repeat */
repeat_off = !state;
break;
+ case 10: /* set local edit mode */
+ term_editing = state;
+ ldisc_send(NULL, 0); /* cause ldisc to notice changes */
+ break;
case 25: /* enable/disable cursor */
compatibility2(OTHER,VT220);
cursor_on = state;
insert = state;
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.
- */
- compatibility2(OTHER,VT220);
- ldisc = (state? &ldisc_simple : &ldisc_term);
+ term_echoing = !state;
+ ldisc_send(NULL, 0); /* cause ldisc to notice changes */
break;
case 20: /* Return sends ... */
cr_lf_return = state;
void term_out(void) {
int c, inbuf_reap;
-static int beep_overload = 0;
- int beep_count = 0;
-
for(inbuf_reap = 0; inbuf_reap < inbuf_head; inbuf_reap++)
{
c = inbuf[inbuf_reap];
*
* An xterm returns "xterm" (5 characters)
*/
- compatibility(OTHER);
- ldisc->send ("PuTTY", 5);
+ compatibility(ANSIMIN);
+ {
+ char abuf[256], *s, *d;
+ int state=0;
+ for(s=cfg.answerback, d=abuf; *s; s++) {
+ if (state)
+ {
+ if (*s >= 'a' && *s <= 'z')
+ *d++ = (*s - ('a'-1));
+ else if ((*s >='@' && *s<='_') ||
+ *s == '?' || (*s&0x80))
+ *d++ = ('@'^*s);
+ else if (*s == '~')
+ *d++ = '^';
+ state = 0;
+ }
+ else if (*s == '^') {
+ state = 1;
+ }
+ else
+ *d++ = xlat_kbd2tty((unsigned char)*s);
+ }
+ ldisc_send (abuf, d-abuf);
+ }
break;
case '\007':
- beep_count++;
- if(beep_count>6) beep_overload=1;
- disptop = scrtop;
+ {
+ struct beeptime *newbeep;
+ long ticks;
+
+ ticks = GetTickCount();
+
+ if (!beep_overloaded) {
+ newbeep = smalloc(sizeof(struct beeptime));
+ newbeep->ticks = ticks;
+ newbeep->next = NULL;
+ if (!beephead)
+ beephead = newbeep;
+ else
+ beeptail->next = newbeep;
+ beeptail = newbeep;
+ nbeeps++;
+ }
+
+ /*
+ * Throw out any beeps that happened more than
+ * t seconds ago.
+ */
+ while (beephead &&
+ beephead->ticks < ticks - cfg.bellovl_t*1000) {
+ struct beeptime *tmp = beephead;
+ beephead = tmp->next;
+ sfree(tmp);
+ if (!beephead)
+ beeptail = NULL;
+ nbeeps--;
+ }
+
+ if (cfg.bellovl && beep_overloaded &&
+ ticks-lastbeep >= cfg.bellovl_s * 1000) {
+ /*
+ * If we're currently overloaded and the
+ * last beep was more than s seconds ago,
+ * leave overload mode.
+ */
+ beep_overloaded = FALSE;
+ } else if (cfg.bellovl && !beep_overloaded &&
+ nbeeps >= cfg.bellovl_n) {
+ /*
+ * Now, if we have n or more beeps
+ * remaining in the queue, go into overload
+ * mode.
+ */
+ beep_overloaded = TRUE;
+ }
+ lastbeep = ticks;
+
+ /*
+ * Perform an actual beep if we're not overloaded.
+ */
+ if ((!cfg.bellovl || !beep_overloaded) && cfg.beep != 0) {
+ if (cfg.beep != 2)
+ beep(cfg.beep);
+ else if(cfg.beep == 2) {
+ in_vbell = TRUE;
+ vbell_timeout = ticks + VBELL_TIMEOUT;
+ term_update();
+ }
+ }
+ disptop = scrtop;
+ }
break;
case '\b':
if (curs_x == 0 && curs_y == 0)
}
seen_disp_event = TRUE;
break;
- case '\177': /* Destructive backspace
+ case '\177': /* Destructive backspace
This does nothing on a real VT100 */
compatibility(OTHER);
if (curs_x && !wrapnext) curs_x--;
else switch (termstate) {
case TOPLEVEL:
/* Only graphic characters get this far, ctrls are stripped above */
- if (wrapnext) {
+ if (wrapnext && wrap) {
cpos[1] |= ATTR_WRAPPED;
if (curs_y == marg_b)
scroll (marg_t, marg_b, 1, TRUE);
if (curs_x == cols) {
cpos--;
curs_x--;
- wrapnext = wrap;
+ wrapnext = TRUE;
}
seen_disp_event = 1;
break;
break;
case 'Z': /* terminal type query */
compatibility(VT100);
- ldisc->send (id_string, strlen(id_string));
+ ldisc_send (id_string, strlen(id_string));
break;
case 'c': /* restore power-on settings */
compatibility(VT100);
case 'c': /* terminal type query */
compatibility(VT100);
/* This is the response for a VT102 */
- ldisc->send (id_string, strlen(id_string));
+ ldisc_send (id_string, strlen(id_string));
break;
case 'n': /* cursor position query */
if (esc_args[0] == 6) {
char buf[32];
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) {
- ldisc->send ("\033[0n", 4);
+ ldisc_send ("\033[0n", 4);
}
break;
case 'h': /* toggle modes to high */
if (i == 0 || i == 1) {
strcpy (buf, "\033[2;1;1;112;112;1;0x");
buf[2] += i;
- ldisc->send (buf, 20);
+ ldisc_send (buf, 20);
}
}
break;
termstate = VT52_Y1;
break;
case 'Z':
- ldisc->send ("\033/Z", 3);
+ ldisc_send ("\033/Z", 3);
break;
case '=':
app_keypad_keys = TRUE;
check_selection (cpos, cpos+1);
}
inbuf_head = 0;
-
- if (beep_overload)
- {
- if(!beep_count) beep_overload=0;
- }
- else if(beep_count && beep_count<5 && cfg.beep)
- beep(beep_count/3);
}
/*
int i, j, start, our_curs_y;
unsigned long attr, rv, cursor;
char ch[1024];
+ long ticks;
+
+ /*
+ * Check the visual bell state.
+ */
+ if (in_vbell) {
+ ticks = GetTickCount();
+ if (ticks - vbell_timeout >= 0)
+ in_vbell = FALSE;
+ }
+ /* Depends on:
+ * screen array, disptop, scrtop,
+ * selection, rv,
+ * cfg.blinkpc, blink_is_real, tblinker,
+ * curs_y, curs_x, blinker, cfg.blink_cur, cursor_on, has_focus
+ */
if (cursor_on) {
if (has_focus) {
if (blinker || !cfg.blink_cur)
}
else
cursor = ATTR_PASCURS;
+ if (wrapnext)
+ cursor |= ATTR_RIGHTCURS;
}
- else cursor = 0;
- rv = (rvideo ? ATTR_REVERSE : 0);
+ else
+ cursor = 0;
+ rv = (!rvideo ^ !in_vbell ? ATTR_REVERSE : 0);
our_curs_y = curs_y + (scrtop - disptop) / (cols+1);
for (i=0; i<rows; i++) {
int lattr = (disptop[idx+cols] & LATTR_MODE);
for (j=0; j<=cols; j++,idx++) {
unsigned long *d = disptop+idx;
- wanttext[idx] = lattr | ((*d ^ rv
+ wanttext[idx] = lattr | (((*d &~ ATTR_WRAPPED) ^ rv
^ (selstart <= d && d < selend ?
ATTR_REVERSE : 0)) |
(i==our_curs_y && j==curs_x ? cursor : 0));
-
if (blink_is_real) {
if (has_focus && tblinker && (wanttext[idx]&ATTR_BLINK) )
{
*/
void term_blink(int flg) {
-static long last_blink = 0;
-static long last_tblink = 0;
+ static long last_blink = 0;
+ static long last_tblink = 0;
long now, blink_diff;
now = GetTickCount();
blink_diff = now-last_blink;
- /* Make sure the cursor blinks no more than 2Hz */
- if (blink_diff>=0 && blink_diff<450)
+ /* Make sure the cursor blinks no faster than GetCaretBlinkTime() */
+ if (blink_diff>=0 && blink_diff<(long)GetCaretBlinkTime())
return;
last_blink = now;
}
while (top < nlpos && top < bottom)
{
-#if 0
- /* VT Specials -> ISO8859-1 */
- static const char poorman2[] =
+ int ch = (*top & CHAR_MASK);
+ int set = (*top & CSET_MASK);
+
+ /* VT Specials -> ISO8859-1 for Cut&Paste */
+ static const unsigned char poorman2[] =
"* # HTFFCRLF\xB0 \xB1 NLVT+ + + + + - - - - - + + + + | <=>=PI!=\xA3 \xB7 ";
-#endif
- int ch = (*top & CHAR_MASK);
+ if (set && !cfg.rawcnp) {
+ if (set == ATTR_LINEDRW && ch >= 0x60 && ch < 0x7F) {
+ int x;
+ if ((x = poorman2[2*(ch-0x60)+1]) == ' ')
+ x = 0;
+ ch = (x<<8) + poorman2[2*(ch-0x60)];
+ }
+ }
-#if 0
- if ((*top & ATTR_LINEDRW) && ch >= 0x60 && ch < 0x7F) {
- int x;
- *wbptr++ = poorman2[2*(ch-0x60)];
- if ( (x = poorman2[2*(ch-0x60)+1]) != ' ')
- *wbptr++ = x;
- } else
-#endif
-#if 0
- if ((*top & ATTR_GBCHR) && ch == '#')
- *wbptr++ = (unsigned char) 0xA3;
- else
-#endif
- if ( wblen == buflen )
- {
- workbuf = srealloc(workbuf, buflen += 100);
- wbptr = workbuf + wblen;
+ while(ch != 0) {
+ if (cfg.rawcnp || !!(ch&0xE0)) {
+ if ( wblen == buflen )
+ {
+ workbuf = srealloc(workbuf, buflen += 100);
+ wbptr = workbuf + wblen;
+ }
+ wblen++;
+ *wbptr++ = (unsigned char) ch;
+ }
+ ch>>=8;
}
- wblen++;
- *wbptr++ = (unsigned char) ch;
top++;
}
if (nl) {
/* Assume a small paste will be OK in one go. */
if (paste_len<256) {
- ldisc->send (paste_buffer, paste_len);
+ ldisc_send (paste_buffer, paste_len);
if (paste_buffer) sfree(paste_buffer);
paste_buffer = 0;
paste_pos = paste_hold = paste_len = 0;
if (paste_buffer[paste_pos + n++] == '\r')
break;
}
- ldisc->send (paste_buffer+paste_pos, n);
+ ldisc_send (paste_buffer+paste_pos, n);
paste_pos += n;
if (paste_pos < paste_len) {
term_update();
}
+int term_ldisc(int option) {
+ if (option == LD_ECHO) return term_echoing;
+ if (option == LD_EDIT) return term_editing;
+ return FALSE;
+}
+
/*
* from_backend(), to get data from the backend for the terminal.
*/
writemod[0] = 'a'; /* set append mode */
else if (i == 0) { /* cancelled */
lgfp = NULL;
+ cfg.logtype = 0; /* disable logging */
return;
}
}
projects / u / mdw / putty / blobdiff