Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-26 13:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CONSRV]: Move ConioDrawConsole to where it should belong.

Browse source 
svn path=/branches/condrv_restructure/; revision=65649
This commit is contained in:
Hermès Bélusca-Maïto 2014-12-14 19:01:52 +00:00
parent 6ba8a926da
commit 715013f96b
7 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
win32ss/user/winsrv/consrv/condrv/conoutput.c
View file

@ -159,20 +159,6 @@ ConDrvDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer)
CONSOLE_SCREEN_BUFFER_Destroy(Buffer); CONSOLE_SCREEN_BUFFER_Destroy(Buffer);
} }
VOID
ConioDrawConsole(PCONSOLE Console)
{
SMALL_RECT Region;
PCONSOLE_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer;
if (ActiveBuffer)
{
ConioInitRect(&Region, 0, 0,
ActiveBuffer->ViewSize.Y - 1, ActiveBuffer->ViewSize.X - 1);
TermDrawRegion(Console, &Region);
}
}
static VOID static VOID
ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer)
{ {

1
win32ss/user/winsrv/consrv/condrv/console.c
View file

@ -297,7 +297,6 @@ ConDrvRegisterTerminal(IN PCONSOLE Console,
/* Copy buffer contents to screen */ /* Copy buffer contents to screen */
// Terminal.Draw(); // Terminal.Draw();
// ConioDrawConsole(Console);
DPRINT("Terminal initialization done\n"); DPRINT("Terminal initialization done\n");
return STATUS_SUCCESS; return STATUS_SUCCESS;

12
win32ss/user/winsrv/consrv/condrv/text.c
View file

@ -494,7 +494,8 @@ ConDrvReadConsoleOutput(IN PCONSOLE Console,
/* Make sure ReadRegion is inside the screen buffer */ /* Make sure ReadRegion is inside the screen buffer */
ConioInitRect(&ScreenBuffer, 0, 0, ConioInitRect(&ScreenBuffer, 0, 0,
Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); Buffer->ScreenBufferSize.Y - 1,
Buffer->ScreenBufferSize.X - 1);
if (!ConioGetIntersection(&CapturedReadRegion, &ScreenBuffer, &CapturedReadRegion)) if (!ConioGetIntersection(&CapturedReadRegion, &ScreenBuffer, &CapturedReadRegion))
{ {
/* /*
@ -557,7 +558,8 @@ ConDrvWriteConsoleOutput(IN PCONSOLE Console,
/* Make sure WriteRegion is inside the screen buffer */ /* Make sure WriteRegion is inside the screen buffer */
ConioInitRect(&ScreenBuffer, 0, 0, ConioInitRect(&ScreenBuffer, 0, 0,
Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); Buffer->ScreenBufferSize.Y - 1,
Buffer->ScreenBufferSize.X - 1);
if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer, &CapturedWriteRegion)) if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer, &CapturedWriteRegion))
{ {
/* /*
@ -625,7 +627,8 @@ ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console,
/* Make sure WriteRegion is inside the screen buffer */ /* Make sure WriteRegion is inside the screen buffer */
ConioInitRect(&ScreenBuffer, 0, 0, ConioInitRect(&ScreenBuffer, 0, 0,
Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); Buffer->ScreenBufferSize.Y - 1,
Buffer->ScreenBufferSize.X - 1);
if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer, &CapturedWriteRegion)) if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer, &CapturedWriteRegion))
{ {
/* /*
@ -1154,7 +1157,8 @@ ConDrvScrollConsoleScreenBuffer(IN PCONSOLE Console,
/* Make sure the source rectangle is inside the screen buffer */ /* Make sure the source rectangle is inside the screen buffer */
ConioInitRect(&ScreenBuffer, 0, 0, ConioInitRect(&ScreenBuffer, 0, 0,
Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); Buffer->ScreenBufferSize.Y - 1,
Buffer->ScreenBufferSize.X - 1);
if (!ConioGetIntersection(&SrcRegion, &ScreenBuffer, ScrollRectangle)) if (!ConioGetIntersection(&SrcRegion, &ScreenBuffer, ScrollRectangle))
{ {
return STATUS_SUCCESS; return STATUS_SUCCESS;

4
win32ss/user/winsrv/consrv/frontends/input.c
View file

@ -71,7 +71,7 @@ ConioProcessKey(PCONSRV_CONSOLE Console, MSG* msg)
INPUT_RECORD er; INPUT_RECORD er;
if (NULL == Console) if (Console == NULL)
{ {
DPRINT1("No Active Console!\n"); DPRINT1("No Active Console!\n");
return; return;
@ -169,7 +169,7 @@ ConioProcessKey(PCONSRV_CONSOLE Console, MSG* msg)
} }
} }
ConioDrawConsole((PCONSOLE)Console); ConioDrawConsole(Console);
return; return;
} }

15
win32ss/user/winsrv/consrv/frontends/terminal.c
View file

@ -649,6 +649,21 @@ ConSrvTermWriteStream(IN OUT PTERMINAL This,
VOID
ConioDrawConsole(PCONSRV_CONSOLE Console)
{
SMALL_RECT Region;
PCONSOLE_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer;
if (!ActiveBuffer) return;
ConioInitRect(&Region, 0, 0,
ActiveBuffer->ViewSize.Y - 1,
ActiveBuffer->ViewSize.X - 1);
TermDrawRegion(Console, &Region);
// Console->FrontEndIFace.Vtbl->DrawRegion(&Console->FrontEndIFace, &Region);
}
static VOID NTAPI static VOID NTAPI
ConSrvTermDrawRegion(IN OUT PTERMINAL This, ConSrvTermDrawRegion(IN OUT PTERMINAL This,
SMALL_RECT* Region) SMALL_RECT* Region)

1
win32ss/user/winsrv/consrv/include/conio.h
View file

@ -347,7 +347,6 @@ ConSrvConsoleCtrlEvent(IN ULONG CtrlEvent,
/* conoutput.c */ /* conoutput.c */
PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y);
VOID ConioDrawConsole(PCONSOLE /*PCONSRV_CONSOLE*/ Console);
NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console, NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console,
PTEXTMODE_SCREEN_BUFFER ScreenBuffer, PTEXTMODE_SCREEN_BUFFER ScreenBuffer,
COORD Size); COORD Size);

7
win32ss/user/winsrv/consrv/include/conio_winsrv.h
View file

@ -2,7 +2,8 @@
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Console Server DLL * PROJECT: ReactOS Console Server DLL
* FILE: consrv/include/conio_winsrv.h * FILE: consrv/include/conio_winsrv.h
* PURPOSE: Public Console I/O Interface * PURPOSE: Public Console I/O Interface - Offers wrap-up structures
* over the console objects exposed by the console driver.
* PROGRAMMERS: Gé van Geldorp * PROGRAMMERS: Gé van Geldorp
* Jeffrey Morlan * Jeffrey Morlan
* Hermes Belusca-Maito (hermes.belusca@sfr.fr) * Hermes Belusca-Maito (hermes.belusca@sfr.fr)
@ -217,9 +218,11 @@ ConioProcessInputEvent(PCONSRV_CONSOLE Console,
/* conoutput.c */ /* conoutput.c */
PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y);
VOID ConioDrawConsole(PCONSOLE /*PCONSRV_CONSOLE*/ Console);
NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console, NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console,
PTEXTMODE_SCREEN_BUFFER ScreenBuffer, PTEXTMODE_SCREEN_BUFFER ScreenBuffer,
COORD Size); COORD Size);
/* terminal.c */
VOID ConioDrawConsole(PCONSRV_CONSOLE Console);
/* EOF */ /* EOF */