Changeset 22052 for trunk/src/kernel32/conbuffer.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/conbuffer.cpp (modified) (2 diffs)

trunk/src/kernel32/conbuffer.cpp

@@ -309 +309 @@
 
         case 8: /* Backspace */
-          // not correct if deleting expanded tab character
+        {
+          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;
+          }
           break;
+        }
 
         case 9: /* Tab */
@@ -328 +340 @@
               pConsoleBuffer->coordBufferSize.X)
           {
-            pConsoleBuffer->coordCursorPosition.X = 0;
+            pConsoleBuffer->coordCursorPosition.X %= pConsoleBuffer->coordBufferSize.X;
             pConsoleBuffer->coordCursorPosition.Y++;