Changeset 3976 for trunk/src/kernel32/conin.cpp

Timestamp:

Aug 10, 2000, 4:19:58 AM (25 years ago)

Author:

phaller

Message:

.

File:

• trunk/src/kernel32/conin.cpp (modified) (3 diffs)

trunk/src/kernel32/conin.cpp

@@ -1 @@
-/* $Id: conin.cpp,v 1.9 2000-03-03 11:15:57 sandervl Exp $ */
+/* $Id: conin.cpp,v 1.10 2000-08-10 02:19:53 phaller Exp $ */
 
 /*
@@ -149 +149 @@
           {
             // continue until buffer full or CR entered
+            // Note: CRLF is actually returned at the end of the buffer!
             if (InputRecord.Event.KeyEvent.uChar.AsciiChar == 0x0d)
               fLoop = FALSE;
           }
           else
-            fLoop = FALSE; // return on any single key in buffer :)
+            // return on any single key in buffer :)
+            // fLoop = FALSE;
+            // @@@PH 2000/08/10 changed behaviour to return ALL input events
+            // recorded in the console.
+            fLoop = (iConsoleInputQueryEvents() != 0);
 
           // record key stroke
@@ -162 +167 @@
             {
               case 0x03: // ctrl-c is filtered!
-              case 0x0a: // LF
+                // @@@PH we're supposed to call a ctrl-c break handler here!
+                break;
+              
               case 0x0d: // CR
-                // do NOT insert those keys into the resulting buffer
+                // CR is automatically expanded to CRLF if in line input mode!
+                if (pConsoleInput->dwConsoleMode & ENABLE_LINE_INPUT)
+                {
+                  *pszTarget = 0x0d; // CR
+                  pszTarget++;
+                  ulCounter++;
+                  if (ulCounter < nNumberOfBytesToRead)  // check for room
+                  {
+                    *pszTarget = 0x0a; // LF
+                    pszTarget++;
+                    ulCounter++;
+                  }
+                  
+                  if (pConsoleInput->dwConsoleMode & ENABLE_ECHO_INPUT)
+                    HMWriteFile(pConsoleGlobals->hConsoleBuffer,
+                        pszTarget-2,
+                        2,
+                        &ulPostCounter,                      /* dummy result */
+                        NULL);
+                  
+                }
+              
                 break;