Changeset 22052 for trunk/src/kernel32/conbuffervio.cpp

Timestamp:

Dec 30, 2012, 1:02:33 AM (13 years ago)

Author:

dmik

Message:

kernel32: Properly handle backspace and tab characters in console input/output mode.

File:

• trunk/src/kernel32/conbuffervio.cpp (modified) (4 diffs)

trunk/src/kernel32/conbuffervio.cpp

@@ -112 +112 @@
   register UCHAR ucChar;
           APIRET rc;
-          ULONG  Row;
+          USHORT Row;
           USHORT Column;
           int    numchar;
@@ -179 +179 @@
                     pConsoleGlobals->Options.ulSpeakerDuration);
           break;
-#if 0
+
         case 8: /* Backspace */
-          // not correct if deleting expanded tab character
-            rc = VioGetCurPos(&Row, &Column, 0);
-            if(!rc) {
-
-            }
+        {
+          BOOL go = FALSE;
           if (pConsoleBuffer->coordCursorPosition.X > 0)
+          {
             pConsoleBuffer->coordCursorPosition.X--;
-
-          //@@@PH overwrite old character
-          *(pConsoleBuffer->ppszLine[pConsoleBuffer->coordCursorPosition.Y] +
-            pConsoleBuffer->coordCursorPosition.X * 2) = 0x20;
+            go = TRUE;
+          }
+          else if (pConsoleBuffer->coordCursorPosition.Y > 0)
+          {
+            pConsoleBuffer->coordCursorPosition.Y--;
+            pConsoleBuffer->coordCursorPosition.X = pConsoleBuffer->coordBufferSize.X - 1;
+            go = TRUE;
+          }
+          if (go)
+          {
+            *(pConsoleBuffer->ppszLine[pConsoleBuffer->coordCursorPosition.Y] +
+              pConsoleBuffer->coordCursorPosition.X * 2) = 0x20;
+            VioWrtCharStr((PCH)" ", 1, pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
+            VioSetCurPos(pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
+          }
           break;
+        }
 
         case 9: /* Tab */
-        {
-            rc = VioWrite
           pConsoleBuffer->coordCursorPosition.X =
             (pConsoleBuffer->coordCursorPosition.X
@@ -206 +214 @@
               pConsoleBuffer->coordBufferSize.X)
           {
-            pConsoleBuffer->coordCursorPosition.X = 0;
+            pConsoleBuffer->coordCursorPosition.X %= pConsoleBuffer->coordBufferSize.X;
             pConsoleBuffer->coordCursorPosition.Y++;
 
@@ -214 +222 @@
               if (pConsoleBuffer->dwConsoleMode & ENABLE_WRAP_AT_EOL_OUTPUT)
               {
-                iConsoleBufferScrollUp(pConsoleBuffer,   /* scroll one line up */
-                                       1);
-                pConsoleBuffer->coordCursorPosition.Y--;
+                VioScrollUp(0, 0, pConsoleBuffer->coordWindowSize.Y-1, pConsoleBuffer->coordWindowSize.X-1,
+                            1, &filler[0], 0);
+                pConsoleBuffer->coordCursorPosition.Y = pConsoleBuffer->coordWindowSize.Y-1;
               }
             }
           }
-            break;
-#endif
+          VioSetCurPos(pConsoleBuffer->coordCursorPosition.Y, pConsoleBuffer->coordCursorPosition.X, 0);
+          break;
+
         case 13: /* CARRIAGE RETURN */
             dprintf(("CR"));