From c431922490f08beb011af18f9ffb72a74b5d3a1c Mon Sep 17 00:00:00 2001 From: piaip Date: Mon, 21 Apr 2008 11:18:44 +0000 Subject: - refine key processing of CR(C-M), LF(C-J), BS(C-H), BS2(0x7f) git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4223 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/talk.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'mbbsd/talk.c') diff --git a/mbbsd/talk.c b/mbbsd/talk.c index 75dd12e0..8622a269 100644 --- a/mbbsd/talk.c +++ b/mbbsd/talk.c @@ -1218,8 +1218,7 @@ do_talk_char(talkwin_t * twin, int ch, FILE *flog) clrtoeol(); return; - case Ctrl('M'): - case Ctrl('J'): + case KEY_ENTER: strlcpy(buf, (char *)line->data, line->len + 1); buf[line->len] = 0; do_talk_nextline(twin); @@ -1294,7 +1293,7 @@ do_talk_char(talkwin_t * twin, int ch, FILE *flog) break; // complex data change - case Ctrl('H'): + case KEY_BS: case KEY_BS2: if (twin->curcol > 0) { @@ -1462,7 +1461,7 @@ do_talk(int fd) if (send(fd, data, 1, 0) != 1) break; if (log) - fputc((ch == Ctrl('M')) ? '\n' : (char)*data, log); + fputc((ch == KEY_ENTER) ? '\n' : (char)*data, log); do_talk_char(&mywin, *data, flog); } } @@ -2862,8 +2861,7 @@ userlist(void) break; case KEY_RIGHT: - case '\n': - case '\r': + case KEY_ENTER: case 't': if (HasUserPerm(PERM_LOGINOK)) { if (uentp->pid != currpid && -- cgit v1.2.3