[hbelusca] 60639: [CONSRV]: Improve full-screen mode, still WIP. Testing and bug reporting (and fixes/patches) are welcome! :)
Author: hbelusca Date: Sun Oct 13 14:13:06 2013 New Revision: 60639
URL: http://svn.reactos.org/svn/reactos?rev=60639&view=rev Log: [CONSRV]: Improve full-screen mode, still WIP. Testing and bug reporting (and fixes/patches) are welcome! :)
Added: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c (with props) Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
Added: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c (added) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] Sun Oct 13 14:13:06 2013 @@ -0,0 +1,195 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c + * PURPOSE: GUI Terminal Full-screen Mode + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "consrv.h" +#include "include/conio.h" +#include "include/console.h" +#include "include/settings.h" +#include "guisettings.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +BOOL +EnterFullScreen(PGUI_CONSOLE_DATA GuiData) +{ + DEVMODEW DevMode; + + ZeroMemory(&DevMode, sizeof(DevMode)); + DevMode.dmSize = sizeof(DevMode); + + DevMode.dmDisplayFixedOutput = DMDFO_CENTER; // DMDFO_STRETCH // DMDFO_DEFAULT + // DevMode.dmDisplayFlags = DMDISPLAYFLAGS_TEXTMODE; + DevMode.dmPelsWidth = 640; // GuiData->ActiveBuffer->ViewSize.X * GuiData->CharWidth; + DevMode.dmPelsHeight = 480; // GuiData->ActiveBuffer->ViewSize.Y * GuiData->CharHeight; + // DevMode.dmBitsPerPel = 32; + DevMode.dmFields = DM_DISPLAYFIXEDOUTPUT | /* DM_DISPLAYFLAGS | DM_BITSPERPEL | */ DM_PELSWIDTH | DM_PELSHEIGHT; + + return (ChangeDisplaySettingsW(&DevMode, CDS_FULLSCREEN) == DISP_CHANGE_SUCCESSFUL); +} + +VOID +LeaveFullScreen(PGUI_CONSOLE_DATA GuiData) +{ + ChangeDisplaySettingsW(NULL, CDS_RESET); +} + + +// static VOID +// GuiConsoleResize(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam); + +VOID +SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen) +{ + PCONSOLE Console = GuiData->Console; + + /* + * See: + * http://stackoverflow.com/questions/2382464/win32-full-screen-and-hiding-task... + * http://stackoverflow.com/questions/3549148/fullscreen-management-with-winapi + * http://blogs.msdn.com/b/oldnewthing/archive/2010/04/12/9994016.aspx + * http://blogs.msdn.com/b/oldnewthing/archive/2005/05/05/414910.aspx + * http://stackoverflow.com/questions/1400654/how-do-i-put-my-opengl-app-into-f... + * http://nehe.gamedev.net/tutorial/creating_an_opengl_window_win32/13001/ + * http://www.reocities.com/pcgpe/dibs.html + */ + + /* If we are already in the given state, just bail out */ + if (FullScreen == GuiData->GuiInfo.FullScreen) return; + + /* Save the current window state if we are not already full-screen */ + if (!GuiData->GuiInfo.FullScreen) + { + GuiData->IsWndMax = IsZoomed(GuiData->hWindow); + if (GuiData->IsWndMax) + SendMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_RESTORE, 0); + + /* Save its old position and size and show state */ + GuiData->WndPl.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(GuiData->hWindow, &GuiData->WndPl); + + /* Save the old window styles */ + GuiData->WndStyle = GetWindowLongPtr(GuiData->hWindow, GWL_STYLE ); + GuiData->WndStyleEx = GetWindowLongPtr(GuiData->hWindow, GWL_EXSTYLE); + } + + if (FullScreen) + { + SendMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_MINIMIZE, 0); + + /* Switch to full screen */ + if (EnterFullScreen(GuiData)) + { + /* Save the new state */ + Console->FixedSize = TRUE; + GuiData->GuiInfo.FullScreen = TRUE; + + GuiData->ActiveBuffer->OldViewSize = GuiData->ActiveBuffer->ViewSize; + // GuiData->ActiveBuffer->OldScreenBufferSize = GuiData->ActiveBuffer->ScreenBufferSize; + + /* Change the window styles */ + SetWindowLongPtr(GuiData->hWindow, GWL_STYLE, + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN); + SetWindowLongPtr(GuiData->hWindow, GWL_EXSTYLE, + WS_EX_APPWINDOW); + // SetWindowPos(GuiData->hWindow, NULL, 0, 0, 0, 0, + // SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | + // SWP_FRAMECHANGED | SWP_SHOWWINDOW); + + /* Reposition the window to the upper-left corner */ + SetWindowPos(GuiData->hWindow, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOSIZE | SWP_FRAMECHANGED | SWP_SHOWWINDOW); + + /* Make it the foreground window */ + SetForegroundWindow(GuiData->hWindow); + + /* Resize it */ + // // GuiConsoleResizeWindow(GuiData); + // GuiConsoleResize(GuiData, SIZE_RESTORED, MAKELPARAM(640, 480)); + + PostMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_MAXIMIZE, 0); + // SendMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_MAXIMIZE, 0); + } + + PostMessageW(GuiData->hWindow, WM_SYSCOMMAND, + GuiData->GuiInfo.FullScreen || GuiData->IsWndMax + ? SC_MAXIMIZE : SC_RESTORE, + 0); + // ShowWindowAsync(GuiData->hWindow, SW_RESTORE); + } + else + { + SendMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_MINIMIZE, 0); + + /* Restore windowing mode */ + LeaveFullScreen(GuiData); + + /* Save the new state */ + GuiData->GuiInfo.FullScreen = FALSE; + Console->FixedSize = FALSE; + + /* + * Restore possible saved dimensions + * of the active screen buffer view. + */ + GuiData->ActiveBuffer->ViewSize = GuiData->ActiveBuffer->OldViewSize; + // GuiData->ActiveBuffer->ScreenBufferSize = GuiData->ActiveBuffer->OldScreenBufferSize; + + /* Restore the window styles */ + SetWindowLongPtr(GuiData->hWindow, GWL_STYLE, + GuiData->WndStyle); + SetWindowLongPtr(GuiData->hWindow, GWL_EXSTYLE, + GuiData->WndStyleEx); + SetWindowPos(GuiData->hWindow, NULL, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | + SWP_FRAMECHANGED /*| SWP_SHOWWINDOW*/); + + + /* Restore the window to its original position */ + SetWindowPlacement(GuiData->hWindow, &GuiData->WndPl); + + PostMessageW(GuiData->hWindow, WM_SYSCOMMAND, + GuiData->IsWndMax ? SC_MAXIMIZE : SC_RESTORE, + 0); + // ShowWindowAsync(GuiData->hWindow, SW_RESTORE); + + /* Make it the foreground window */ + SetForegroundWindow(GuiData->hWindow); + + /* Resize it */ + // GuiConsoleResizeWindow(GuiData); + + // PostMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_RESTORE, 0); + // // ShowWindowAsync(GuiData->hWindow, SW_RESTORE); + } +} + +VOID +GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData) +{ + PCONSOLE Console = GuiData->Console; + BOOL FullScreen; + + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + + /* Switch to full-screen or to windowed mode */ + FullScreen = !GuiData->GuiInfo.FullScreen; + DPRINT1("GuiConsoleSwitchFullScreen - Switch to %s ...\n", + (FullScreen ? "full-screen" : "windowed mode")); + + SwitchFullScreen(GuiData, FullScreen); + + LeaveCriticalSection(&Console->Lock); +} + +/* EOF */
Propchange: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] Sun Oct 13 14:13:06 2013 @@ -51,6 +51,8 @@
LONG_PTR WndStyle; LONG_PTR WndStyleEx; + BOOL IsWndMax; + WINDOWPLACEMENT WndPl;
HPALETTE hSysPalette; /* Handle to the original system palette */
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Oct 13 14:13:06 2013 @@ -466,147 +466,6 @@ // NOTE: The SWP_NOCOPYBITS flag can be replaced by a subsequent call // to: InvalidateRect(GuiData->hWindow, NULL, TRUE); } - - - -static BOOL -EnterFullScreen(PGUI_CONSOLE_DATA GuiData) -{ - DEVMODEW DevMode; - - ZeroMemory(&DevMode, sizeof(DevMode)); - DevMode.dmSize = sizeof(DevMode); - - // DevMode.dmDisplayFixedOutput = DMDFO_CENTER; // DMDFO_STRETCH // DMDFO_DEFAULT - // DevMode.dmDisplayFlags = DMDISPLAYFLAGS_TEXTMODE; - DevMode.dmPelsWidth = 640; // GuiData->ActiveBuffer->ViewSize.X * GuiData->CharWidth; - DevMode.dmPelsHeight = 480; // GuiData->ActiveBuffer->ViewSize.Y * GuiData->CharHeight; - // DevMode.dmBitsPerPel = 32; - DevMode.dmFields = /* DM_DISPLAYFIXEDOUTPUT | DM_DISPLAYFLAGS | DM_BITSPERPEL | */ DM_PELSWIDTH | DM_PELSHEIGHT; - - return (ChangeDisplaySettingsW(&DevMode, CDS_FULLSCREEN) == DISP_CHANGE_SUCCESSFUL); -} - -static BOOL -LeaveFullScreen(PGUI_CONSOLE_DATA GuiData) -{ - return (ChangeDisplaySettingsW(NULL, CDS_RESET) == DISP_CHANGE_SUCCESSFUL); -} - -static VOID -GuiConsoleResize(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM lParam); - -VOID -SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen) -{ - PCONSOLE Console = GuiData->Console; - - /* - * See: - * http://stackoverflow.com/questions/2382464/win32-full-screen-and-hiding-task... - * http://stackoverflow.com/questions/3549148/fullscreen-management-with-winapi - * http://blogs.msdn.com/b/oldnewthing/archive/2010/04/12/9994016.aspx - * http://blogs.msdn.com/b/oldnewthing/archive/2005/05/05/414910.aspx - * http://stackoverflow.com/questions/1400654/how-do-i-put-my-opengl-app-into-f... - * http://nehe.gamedev.net/tutorial/creating_an_opengl_window_win32/13001/ - * http://www.reocities.com/pcgpe/dibs.html - */ - - if (FullScreen) - { - SendMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_MINIMIZE, 0); - - /* Switch to full screen */ - if (EnterFullScreen(GuiData)) - { - /* Save the new state */ - GuiData->GuiInfo.FullScreen = TRUE; - Console->FixedSize = TRUE; - - GuiData->ActiveBuffer->OldViewSize = GuiData->ActiveBuffer->ViewSize; - // GuiData->ActiveBuffer->OldScreenBufferSize = GuiData->ActiveBuffer->ScreenBufferSize; - - /* Save the old window styles */ - GuiData->WndStyle = GetWindowLongPtr(GuiData->hWindow, GWL_STYLE ); - GuiData->WndStyleEx = GetWindowLongPtr(GuiData->hWindow, GWL_EXSTYLE); - - /* Change the window styles */ - SetWindowLongPtr(GuiData->hWindow, GWL_STYLE, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN); - SetWindowLongPtr(GuiData->hWindow, GWL_EXSTYLE, - WS_EX_APPWINDOW); - - /* Reposition the window to the upper-left corner */ - SetWindowPos(GuiData->hWindow, - HWND_TOPMOST, - 0, 0, - 0, 0, - SWP_NOSIZE | SWP_FRAMECHANGED | SWP_SHOWWINDOW); - /* Make it the foreground window */ - SetForegroundWindow(GuiData->hWindow); - /* Resize it */ - // GuiConsoleResizeWindow(GuiData); - GuiConsoleResize(GuiData, SIZE_RESTORED, MAKELPARAM(640, 480)); - - PostMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_MAXIMIZE, 0); - } - else - { - PostMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_RESTORE, 0); - } - } - else - { - SendMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_MINIMIZE, 0); - - /* Restore windowing mode */ - if (LeaveFullScreen(GuiData)) - { - /* Save the new state */ - GuiData->GuiInfo.FullScreen = FALSE; - Console->FixedSize = FALSE; - - /* - * Restore possible saved dimensions - * of the active screen buffer view. - */ - GuiData->ActiveBuffer->ViewSize = GuiData->ActiveBuffer->OldViewSize; - // GuiData->ActiveBuffer->ScreenBufferSize = GuiData->ActiveBuffer->OldScreenBufferSize; - - /* Restore the window styles */ - SetWindowLongPtr(GuiData->hWindow, GWL_STYLE, - GuiData->WndStyle); - SetWindowLongPtr(GuiData->hWindow, GWL_EXSTYLE, - GuiData->WndStyleEx); - - /* Resize it */ - GuiConsoleResizeWindow(GuiData); - - // PostMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_RESTORE, 0); - } - PostMessageW(GuiData->hWindow, WM_SYSCOMMAND, SC_RESTORE, 0); - } -} - -static VOID -GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData) -{ - PCONSOLE Console = GuiData->Console; - BOOL FullScreen; - - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; - - /* Switch to full-screen or to windowed mode */ - FullScreen = !GuiData->GuiInfo.FullScreen; - DPRINT1("GuiConsoleSwitchFullScreen - Switch to %s ...\n", - (FullScreen ? "full-screen" : "windowed mode")); - - SwitchFullScreen(GuiData, FullScreen); - - LeaveCriticalSection(&Console->Lock); -} - -
static BOOL GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create) @@ -1743,6 +1602,16 @@ return 0; }
+ +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 LRESULT CALLBACK GuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -1789,6 +1658,8 @@ case WM_ACTIVATE: { WORD ActivationState = LOWORD(wParam); + + DPRINT1("WM_ACTIVATE - ActivationState = %d\n");
if ( ActivationState == WA_ACTIVE || ActivationState == WA_CLICKACTIVE ) @@ -1883,7 +1754,9 @@ if (msg == WM_SYSKEYDOWN && (HIWORD(lParam) & KF_ALTDOWN) && wParam == VK_RETURN) { /* Switch only at first Alt-Enter press, and ignore subsequent key repetitions */ - if ((HIWORD(lParam) & (KF_UP | KF_REPEAT)) != KF_REPEAT) GuiConsoleSwitchFullScreen(GuiData); + if ((HIWORD(lParam) & (KF_UP | KF_REPEAT)) != KF_REPEAT) + GuiConsoleSwitchFullScreen(GuiData); + break; }
@@ -3069,12 +2942,18 @@ ULONG NewMode) { PGUI_CONSOLE_DATA GuiData = This->Data; + BOOL FullScreen;
if (NewMode & ~(CONSOLE_FULLSCREEN_MODE | CONSOLE_WINDOWED_MODE)) return FALSE;
- GuiData->GuiInfo.FullScreen = (NewMode & CONSOLE_FULLSCREEN_MODE); - // TODO: Change the display mode + FullScreen = ((NewMode & CONSOLE_FULLSCREEN_MODE) != 0); + + if (FullScreen != GuiData->GuiInfo.FullScreen) + { + SwitchFullScreen(GuiData, FullScreen); + } + return TRUE; }
-
hbelusca＠svn.reactos.org