Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed backspace handling

Browse source 
svn path=/trunk/; revision=1563
This commit is contained in:
Phillip Susi 2001-01-24 05:13:12 +00:00
parent 3943df51ea
commit a9527291d6
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/subsys/csrss/api/conio.c
View file

@ -1,4 +1,4 @@
/* $Id: conio.c,v 1.15 2001/01/21 00:11:54 phreak Exp $ /* $Id: conio.c,v 1.16 2001/01/24 05:13:12 phreak Exp $
* *
* reactos/subsys/csrss/api/conio.c * reactos/subsys/csrss/api/conio.c
* *
@ -747,14 +747,14 @@ VOID Console_Api( DWORD RefreshEvent )
ActiveConsole->WaitingLines++; ActiveConsole->WaitingLines++;
} }
KeyEventRecord->Echoed = FALSE; KeyEventRecord->Echoed = FALSE;
if( ActiveConsole->Mode & ENABLE_PROCESSED_INPUT && KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar == '\b' ) if( ActiveConsole->Mode & ENABLE_PROCESSED_INPUT && KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar == '\b' && KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown )
{ {
// walk the input queue looking for a char to backspace // walk the input queue looking for a char to backspace
for( TempInput = (ConsoleInput *)ActiveConsole->InputEvents.Blink; for( TempInput = (ConsoleInput *)ActiveConsole->InputEvents.Blink;
TempInput != (ConsoleInput *)&ActiveConsole->InputEvents && TempInput != (ConsoleInput *)&ActiveConsole->InputEvents &&
(TempInput->InputEvent.EventType != KEY_EVENT || (TempInput->InputEvent.EventType != KEY_EVENT ||
(TempInput->InputEvent.Event.KeyEvent.bKeyDown == FALSE && TempInput->InputEvent.Event.KeyEvent.bKeyDown == FALSE ||
TempInput->InputEvent.Event.KeyEvent.uChar.AsciiChar == '\b' )); TempInput->InputEvent.Event.KeyEvent.uChar.AsciiChar == '\b' );
TempInput = (ConsoleInput *)TempInput->ListEntry.Blink ); TempInput = (ConsoleInput *)TempInput->ListEntry.Blink );
// if we found one, delete it, otherwise, wake the client // if we found one, delete it, otherwise, wake the client
if( TempInput != (ConsoleInput *)&ActiveConsole->InputEvents ) if( TempInput != (ConsoleInput *)&ActiveConsole->InputEvents )
@ -871,7 +871,6 @@ NTSTATUS CsrWriteConsoleOutputChar( PCSRSS_PROCESS_DATA ProcessData, PCSRSS_API_
Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY);
Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) -
sizeof(LPC_MESSAGE_HEADER); sizeof(LPC_MESSAGE_HEADER);
RtlEnterCriticalSection( &ActiveConsoleLock ); RtlEnterCriticalSection( &ActiveConsoleLock );
if( !NT_SUCCESS( CsrGetObject( ProcessData, Request->Data.WriteConsoleOutputCharRequest.ConsoleHandle, (Object_t **)&Buff ) ) || Buff->Header.Type != CSRSS_SCREEN_BUFFER_MAGIC ) if( !NT_SUCCESS( CsrGetObject( ProcessData, Request->Data.WriteConsoleOutputCharRequest.ConsoleHandle, (Object_t **)&Buff ) ) || Buff->Header.Type != CSRSS_SCREEN_BUFFER_MAGIC )
{ {
@ -880,6 +879,8 @@ NTSTATUS CsrWriteConsoleOutputChar( PCSRSS_PROCESS_DATA ProcessData, PCSRSS_API_
} }
X = Buff->CurrentX; X = Buff->CurrentX;
Y = Buff->CurrentY; Y = Buff->CurrentY;
Buff->CurrentX = Request->Data.WriteConsoleOutputCharRequest.Coord.X;
Buff->CurrentY = Request->Data.WriteConsoleOutputCharRequest.Coord.Y;
CsrpWriteConsole( Buff, Buffer, Request->Data.WriteConsoleOutputCharRequest.Length, TRUE ); CsrpWriteConsole( Buff, Buffer, Request->Data.WriteConsoleOutputCharRequest.Length, TRUE );
Reply->Data.WriteConsoleOutputCharReply.EndCoord.X = Buff->CurrentX - Buff->ShowX; Reply->Data.WriteConsoleOutputCharReply.EndCoord.X = Buff->CurrentX - Buff->ShowX;
Reply->Data.WriteConsoleOutputCharReply.EndCoord.Y = (Buff->CurrentY + Buff->MaxY - Buff->ShowY) % Buff->MaxY; Reply->Data.WriteConsoleOutputCharReply.EndCoord.Y = (Buff->CurrentY + Buff->MaxY - Buff->ShowY) % Buff->MaxY;