diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-05 15:58:10 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-05 15:58:10 +0000 |
| commit | 0bfe30f1f8426d3e7c82459bca752530d6a1e469 (patch) | |
| tree | 2e494b4882bc80ad74f39181476d95b64a340dfa /app/xterm/input.c | |
| parent | 7e6bbbf222239c48377c748a99a9996f66fe68ac (diff) | |
update to xterm 246. Has been in snapshots for some time.
Diffstat (limited to 'app/xterm/input.c')
| -rw-r--r-- | app/xterm/input.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/xterm/input.c b/app/xterm/input.c index 7de33bf6d..fd6e3e0c5 100644 --- a/app/xterm/input.c +++ b/app/xterm/input.c @@ -1,4 +1,4 @@ -/* $XTermId: input.c,v 1.307 2009/03/15 18:53:57 tom Exp $ */ +/* $XTermId: input.c,v 1.309 2009/06/18 00:08:40 tom Exp $ */ /* * Copyright 1999-2008,2009 by Thomas E. Dickey @@ -874,7 +874,7 @@ Input(XtermWidget xw, ", %d:'%s'%s" FMT_MODIFIER_NAMES "%s%s%s%s%s%s\n", kd.keysym, kd.nbytes, - visibleChars(PAIRED_CHARS((Char *) kd.strbuf, 0), + visibleChars((Char *) kd.strbuf, ((kd.nbytes > 0) ? (unsigned) kd.nbytes : 0)), @@ -1107,7 +1107,6 @@ Input(XtermWidget xw, while (kd.nbytes-- > 0) unparseputc(xw, CharOf(*string++)); } -#if OPT_VT52_MODE /* * Interpret F1-F4 as PF1-PF4 for VT52, VT100 */ @@ -1121,9 +1120,7 @@ Input(XtermWidget xw, &modify_parm); MODIFIER_PARM; unparseseq(xw, &reply); - } -#endif - else { + } else { reply.a_type = ANSI_CSI; reply.a_final = 0; @@ -1342,7 +1339,7 @@ void StringInput(XtermWidget xw, Char * string, size_t nbytes) { TRACE(("InputString (%s,%d)\n", - visibleChars(PAIRED_CHARS(string, 0), nbytes), + visibleChars(string, nbytes), nbytes)); #if OPT_TEK4014 if (nbytes && TEK4014_GIN(tekWidget)) { |