Changeset 22052 for trunk/src/kernel32/conin.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/conin.cpp (modified) (1 diff)

trunk/src/kernel32/conin.cpp

@@ -221 +221 @@
                 if (ulCounter > 0)
                 {
-                  //@@@PH erase character on screen!
                   ulCounter--;
                   pszTarget--;
                                                      /* local echo enabled ? */
                   if (pConsoleInput->dwConsoleMode & ENABLE_ECHO_INPUT)
+                  {
+                    ULONG repeat = 1;
+                    if (*pszTarget == 0x09) // tab
+                    {
+                      // detect the expanded width of the deleted tab
+                      ULONG cnt = 0;
+                      PSZ psz = (PSZ)lpBuffer;
+                      ULONG p = 0, ulTabSize = pConsoleGlobals->Options.ulTabSize;
+                      for (; cnt < ulCounter; cnt++, psz++)
+                      {
+                        if (*psz == 0x09)
+                          p += ulTabSize - p % ulTabSize;
+                        else
+                        {
+                          if (*psz == 0x0d && cnt < ulCounter && *(psz + 1) == 0x0a)
+                            psz++;
+                          p++;
+                        }
+                      }
+                      // this will give us the expanded width
+                      repeat = ulTabSize - p % ulTabSize;
+
+                    }
+                    while (repeat--)
+                      HMWriteFile(pConsoleGlobals->hConsoleBuffer,
+                          &InputRecord.Event.KeyEvent.uChar.AsciiChar,
+                          1,
+                          &ulPostCounter,                      /* dummy result */
+                          NULL, NULL);
+                  }
+                }
+                break;
+
+              case 0x09: // tab
+                                                   /* local echo enabled ? */
+                if (pConsoleInput->dwConsoleMode & ENABLE_ECHO_INPUT)
+                {
+                  // expand tabs (not rely on HMWriteFile since we calculate tabs from the
+                  // beginning of the whole buffer, not the current line)
+                  ULONG repeat = 1;
+                  // detect the expanded width of the new tab
+                  ULONG cnt = 0;
+                  PSZ psz = (PSZ)lpBuffer;
+                  ULONG p = 0, ulTabSize = pConsoleGlobals->Options.ulTabSize;
+                  for (; cnt < ulCounter; cnt++, psz++)
+                  {
+                    if (*psz == 0x09)
+                      p += ulTabSize - p % ulTabSize;
+                    else
+                    {
+                      if (*psz == 0x0d && cnt < ulCounter && *(psz + 1) == 0x0a)
+                        psz++;
+                      p++;
+                    }
+                  }
+                  // this will give us the expanded width
+                  repeat = ulTabSize - p % ulTabSize;
+
+                  while (repeat--)
                     HMWriteFile(pConsoleGlobals->hConsoleBuffer,
-                        &InputRecord.Event.KeyEvent.uChar.AsciiChar,
+                        " ",
                         1,
                         &ulPostCounter,                      /* dummy result */
                         NULL, NULL);
                 }
+
+                *pszTarget = InputRecord.Event.KeyEvent.uChar.AsciiChar;
+                pszTarget++;
+                ulCounter++;
                 break;