projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Note that default will change to SSH-2 next release
[u/mdw/putty]
/
terminal.c
diff --git
a/terminal.c
b/terminal.c
index
eb5d907
..
37c75d7
100644
(file)
--- a/
terminal.c
+++ b/
terminal.c
@@
-1227,7
+1227,7
@@
void term_out(Terminal *term)
}
/* Are we in the nasty ACS mode? Note: no sco in utf mode. */
else if(term->sco_acs &&
}
/* Are we in the nasty ACS mode? Note: no sco in utf mode. */
else if(term->sco_acs &&
- (c!='\033' && c!='\
n' && c!='\r
' && c!='\b'))
+ (c!='\033' && c!='\
012' && c!='\015
' && c!='\b'))
{
if (term->sco_acs == 2) c ^= 0x80;
c |= ATTR_SCOACS;
{
if (term->sco_acs == 2) c ^= 0x80;
c |= ATTR_SCOACS;
@@
-1373,12
+1373,12
@@
void term_out(Terminal *term)
* Perform an actual beep if we're not overloaded.
*/
if (!cfg.bellovl || !term->beep_overloaded) {
* Perform an actual beep if we're not overloaded.
*/
if (!cfg.bellovl || !term->beep_overloaded) {
+ beep(term->frontend, cfg.beep);
if (cfg.beep == BELL_VISUAL) {
term->in_vbell = TRUE;
term->vbell_startpoint = ticks;
term_update(term);
if (cfg.beep == BELL_VISUAL) {
term->in_vbell = TRUE;
term->vbell_startpoint = ticks;
term_update(term);
- } else
- beep(term->frontend, cfg.beep);
+ }
}
term->disptop = 0;
}
}
term->disptop = 0;
}
@@
-1413,7
+1413,7
@@
void term_out(Terminal *term)
term->esc_query = FALSE;
}
break;
term->esc_query = FALSE;
}
break;
- case '\
r
':
+ case '\
015
':
term->curs.x = 0;
term->wrapnext = FALSE;
fix_cpos;
term->curs.x = 0;
term->wrapnext = FALSE;
fix_cpos;
@@
-1433,7
+1433,7
@@
void term_out(Terminal *term)
}
case '\013':
compatibility(VT100);
}
case '\013':
compatibility(VT100);
- case '\
n
':
+ case '\
012
':
if (term->curs.y == term->marg_b)
scroll(term, term->marg_t, term->marg_b, 1, TRUE);
else if (term->curs.y < term->rows - 1)
if (term->curs.y == term->marg_b)
scroll(term, term->marg_t, term->marg_b, 1, TRUE);
else if (term->curs.y < term->rows - 1)
@@
-2500,7
+2500,7
@@
void term_out(Terminal *term)
*
* -- RDB
*/
*
* -- RDB
*/
- if (c == '\
n' || c == '\r
') {
+ if (c == '\
012' || c == '\015
') {
term->termstate = TOPLEVEL;
} else if (c == 0234 || c == '\007') {
/*
term->termstate = TOPLEVEL;
} else if (c == 0234 || c == '\007') {
/*
@@
-2983,7
+2983,7
@@
static void do_paint(Terminal *term, Context ctx, int may_optimise)
*/
if ((tchar | tattr) != (term->disptext[idx]& ~ATTR_NARROW)) {
if ((tattr & ATTR_WIDE) == 0 &&
*/
if ((tchar | tattr) != (term->disptext[idx]& ~ATTR_NARROW)) {
if ((tattr & ATTR_WIDE) == 0 &&
-
CharW
idth(ctx, (tchar | tattr) & 0xFFFF) == 2)
+
char_w
idth(ctx, (tchar | tattr) & 0xFFFF) == 2)
tattr |= ATTR_NARROW;
} else if (term->disptext[idx]&ATTR_NARROW)
tattr |= ATTR_NARROW;
tattr |= ATTR_NARROW;
} else if (term->disptext[idx]&ATTR_NARROW)
tattr |= ATTR_NARROW;
@@
-3251,12
+3251,12
@@
static void clipme(Terminal *term, pos top, pos bottom, int rect)
if (DIRECT_FONT(uc)) {
if (c >= ' ' && c != 0x7F) {
if (DIRECT_FONT(uc)) {
if (c >= ' ' && c != 0x7F) {
-
unsigned
char buf[4];
+ char buf[4];
WCHAR wbuf[4];
int rv;
if (is_dbcs_leadbyte(font_codepage, (BYTE) c)) {
buf[0] = c;
WCHAR wbuf[4];
int rv;
if (is_dbcs_leadbyte(font_codepage, (BYTE) c)) {
buf[0] = c;
- buf[1] =
(unsigned char)
ldata[top.x + 1];
+ buf[1] = ldata[top.x + 1];
rv = mb_to_wc(font_codepage, 0, buf, 2, wbuf, 4);
top.x++;
} else {
rv = mb_to_wc(font_codepage, 0, buf, 2, wbuf, 4);
top.x++;
} else {
@@
-3555,7
+3555,7
@@
void term_do_paste(Terminal *term)
if (p <= data + len - sel_nl_sz &&
!memcmp(p, sel_nl, sizeof(sel_nl))) {
if (p <= data + len - sel_nl_sz &&
!memcmp(p, sel_nl, sizeof(sel_nl))) {
- term->paste_buffer[term->paste_len++] = '\
r
';
+ term->paste_buffer[term->paste_len++] = '\
015
';
p += sel_nl_sz;
}
q = p;
p += sel_nl_sz;
}
q = p;
@@
-3814,7
+3814,7
@@
void term_paste(Terminal *term)
while (term->paste_pos < term->paste_len) {
int n = 0;
while (n + term->paste_pos < term->paste_len) {
while (term->paste_pos < term->paste_len) {
int n = 0;
while (n + term->paste_pos < term->paste_len) {
- if (term->paste_buffer[term->paste_pos + n++] == '\
r
')
+ if (term->paste_buffer[term->paste_pos + n++] == '\
015
')
break;
}
if (term->ldisc)
break;
}
if (term->ldisc)