- 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

1 files changed, 31 insertions, 11 deletions

diff --git a/mbbsd/io.c b/mbbsd/io.c
index 33571109..306fb765 100644
--- a/mbbsd/io.c
+++ b/mbbsd/io.c
@@ -278,19 +278,39 @@ dogetch(void)
 	lastact = now;
     }
 
-    // CR LF are treated as one.
-    if (inbuf[icurrchar] == Ctrl('M'))
+    // CRLF Handle:
+    //
+    // (UNIX) LF
+    // (WIN)  CRLF
+    // (MAC)  CR
+    //
+    // to work in a compatible way, (see KEY_ENTER definition)
+    // let KEY_ENTER = CR
+
     {
-	if (++icurrchar < ibufsize &&
-	    inbuf[icurrchar] == Ctrl('J'))
-	    icurrchar ++;
-	return Ctrl('M');
-    }
+	unsigned char c = (unsigned char) inbuf[icurrchar++];
 
-    // XXX also treat ^H and 127 (KEY_BS2) the same one?
-    // if (inbuf[icurrchar] == KEY_BS2)
-    //   return Ctrl('H');
-    return (unsigned char)inbuf[icurrchar++];
+	// CR LF are treated as one.
+	if (c == KEY_CR)
+	{
+	    // peak next character.
+	    if (icurrchar < ibufsize && inbuf[icurrchar] == KEY_LF)
+		icurrchar ++;
+	    return KEY_ENTER;
+	} 
+	else if (c == KEY_LF)
+	{
+	    return KEY_ENTER;
+	}
+
+	// XXX also treat ^H and 127 (KEY_BS2) the same one?
+	// else if (c == KEY_BS2)
+	// {
+	//   return KEY_BS;
+	// }
+	
+	return c;
+    }
 }
 
 #ifdef DEBUG