mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-27 05:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert my backspace patch from before. I found a better way to handle backspaces which doesnt break backspacing in ftp.exe(and some of apps) while still fixing ncftp.exe.

Browse Source 
svn path=/trunk/; revision=23220
This commit is contained in:
Brandon Turner 2006-07-22 05:16:26 +00:00
parent c1d9e2bb6c
commit 4a6251c297
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
reactos/subsystems/win32/csrss/win32csr/conio.c
View File

@ -607,8 +607,12 @@ CSR_API(CsrReadConsole)
&& Input->InputEvent.Event.KeyEvent.bKeyDown
&& Input->InputEvent.Event.KeyEvent.uChar.AsciiChar != '\0')
{
/* backspace handling */
if ('\b' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar)
/*
* backspace handling - if we are in charge of echoing it then we handle it here
* otherwise we treat it like a normal char.
*/
if ('\b' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar && 0
!= (Console->Mode & ENABLE_ECHO_INPUT))
{
/* echo if it has not already been done, and either we or the client has chars to be deleted */
if (! Input->Echoed
@ -622,14 +626,14 @@ CSR_API(CsrReadConsole)
i -= 2; /* if we already have something to return, just back it up by 2 */
}
else
{
/* otherwise, we will treat the backspace just like any other char and let the client decide what to do */
{ /* otherwise, return STATUS_NOTIFY_CLEANUP to tell client to back up its buffer */
Console->WaitingChars--;
ConioUnlockConsole(Console);
HeapFree(Win32CsrApiHeap, 0, Input);
Request->Data.ReadConsoleRequest.NrCharactersRead++;
Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar;
return Request->Status;
Request->Data.ReadConsoleRequest.NrCharactersRead = 0;
Request->Status = STATUS_NOTIFY_CLEANUP;
return STATUS_NOTIFY_CLEANUP;
}
Request->Data.ReadConsoleRequest.nCharsCanBeDeleted--;
Input->Echoed = TRUE; /* mark as echoed so we don't echo it below */