Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 03:46:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV] Minor code re-organization.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2018-08-08 20:45:39 +02:00
parent a9064d3283
commit 1a89a3e731
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 61 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

37
win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
View file

@ -642,16 +642,6 @@ OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create); return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create);
} }
BOOL
EnterFullScreen(PGUI_CONSOLE_DATA GuiData);
VOID
LeaveFullScreen(PGUI_CONSOLE_DATA GuiData);
VOID
SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen);
VOID
GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData);
static VOID static VOID
OnActivate(PGUI_CONSOLE_DATA GuiData, WPARAM wParam) OnActivate(PGUI_CONSOLE_DATA GuiData, WPARAM wParam)
{ {
@ -973,18 +963,6 @@ UpdateSelection(PGUI_CONSOLE_DATA GuiData,
DeleteObject(oldRgn); DeleteObject(oldRgn);
} }
VOID
GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData,
PRECT rcView,
PRECT rcFramebuffer);
VOID
GuiPaintGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData,
PRECT rcView,
PRECT rcFramebuffer);
static VOID static VOID
OnPaint(PGUI_CONSOLE_DATA GuiData) OnPaint(PGUI_CONSOLE_DATA GuiData)
{ {
@ -1966,12 +1944,6 @@ Quit:
return DefWindowProcW(GuiData->hWindow, msg, wParam, lParam); return DefWindowProcW(GuiData->hWindow, msg, wParam, lParam);
} }
VOID
GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData);
VOID
GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData);
static VOID static VOID
Copy(PGUI_CONSOLE_DATA GuiData) Copy(PGUI_CONSOLE_DATA GuiData)
@ -1996,13 +1968,6 @@ Copy(PGUI_CONSOLE_DATA GuiData)
UpdateSelection(GuiData, NULL, NULL); UpdateSelection(GuiData, NULL, NULL);
} }
VOID
GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData);
VOID
GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData);
static VOID static VOID
Paste(PGUI_CONSOLE_DATA GuiData) Paste(PGUI_CONSOLE_DATA GuiData)
{ {
@ -2135,6 +2100,7 @@ OnMove(PGUI_CONSOLE_DATA GuiData)
GuiData->GuiInfo.WindowOrigin.y = rcWnd.top; GuiData->GuiInfo.WindowOrigin.y = rcWnd.top;
} }
/* /*
// HACK: This functionality is standard for general scrollbars. Don't add it by hand. // HACK: This functionality is standard for general scrollbars. Don't add it by hand.
@ -2163,7 +2129,6 @@ GuiConsoleHandleScrollbarMenu(VOID)
} }
*/ */
static LRESULT CALLBACK static LRESULT CALLBACK
ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {

2
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
View file

@ -96,8 +96,6 @@ InvalidateCell(PGUI_CONSOLE_DATA GuiData,
* GUI Terminal Initialization * * GUI Terminal Initialization *
******************************************************************************/ ******************************************************************************/
VOID
SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen);
VOID VOID
CreateSysMenu(HWND hWnd); CreateSysMenu(HWND hWnd);

62
win32ss/user/winsrv/consrv/frontends/gui/guiterm.h
View file

@ -14,6 +14,9 @@
#include "guisettings.h" #include "guisettings.h"
#include "conwnd.h" #include "conwnd.h"
/* HELPER FUNCTIONS ***********************************************************/
FORCEINLINE FORCEINLINE
VOID VOID
GetScreenBufferSizeUnits(IN PCONSOLE_SCREEN_BUFFER Buffer, GetScreenBufferSizeUnits(IN PCONSOLE_SCREEN_BUFFER Buffer,
@ -50,11 +53,16 @@ SmallRectToRect(PGUI_CONSOLE_DATA GuiData, PRECT Rect, PSMALL_RECT SmallRect)
Rect->bottom = (SmallRect->Bottom + 1 - Buffer->ViewOrigin.Y) * HeightUnit; Rect->bottom = (SmallRect->Bottom + 1 - Buffer->ViewOrigin.Y) * HeightUnit;
} }
/* FUNCTIONS ******************************************************************/
/* guiterm.c */
VOID VOID
GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData); GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData);
VOID
SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen); /* conwnd.c */
BOOL BOOL
InitFonts(PGUI_CONSOLE_DATA GuiData, InitFonts(PGUI_CONSOLE_DATA GuiData,
@ -64,3 +72,53 @@ InitFonts(PGUI_CONSOLE_DATA GuiData,
ULONG FontWeight); ULONG FontWeight);
VOID VOID
DeleteFonts(PGUI_CONSOLE_DATA GuiData); DeleteFonts(PGUI_CONSOLE_DATA GuiData);
/* fullscreen.c */
BOOL
EnterFullScreen(PGUI_CONSOLE_DATA GuiData);
VOID
LeaveFullScreen(PGUI_CONSOLE_DATA GuiData);
VOID
SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen);
VOID
GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData);
/* graphics.c */
VOID
GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData);
VOID
GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData);
VOID
GuiPaintGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData,
PRECT rcView,
PRECT rcFramebuffer);
/* text.c */
VOID
PasteText(
IN PCONSRV_CONSOLE Console,
IN PWCHAR Buffer,
IN SIZE_T cchSize);
VOID
GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData);
VOID
GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData);
VOID
GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
PGUI_CONSOLE_DATA GuiData,
PRECT rcView,
PRECT rcFramebuffer);
/* EOF */