Skip to content

[GEN][ZH] Center Game App Window on startup and resolution change #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 16, 2025
Merged

[GEN][ZH] Center Game App Window on startup and resolution change #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
befdc31
Center window in workarea on startup
helmutbuhler Mar 11, 2025
6a9ae12
Remove extra code before SetWindowPos
helmutbuhler Mar 12, 2025
4fc326e
Pump messages during startup to avoid "(Not responding)" in the windo…
helmutbuhler Mar 29, 2025
966c029
Window centering: In case part of the resulting client area is off mo…
helmutbuhler Apr 14, 2025
7373baa
Move common code to reposition window in helper function DX8Wrapper::…
helmutbuhler Apr 14, 2025
d72405a
Add comments for window positioning
helmutbuhler Apr 14, 2025
d8aaf71
Merge branch 'main' into center_window_ea
helmutbuhler May 13, 2025
033be37
Put #define WINVER 0x0500 into #if for VC6
helmutbuhler May 13, 2025
1fa513b
Expand some comments and fix whitespace
helmutbuhler May 13, 2025
6ef01fa
Fix date format
helmutbuhler May 13, 2025
659f87b
Merge branch 'main' into center_window_ea
xezon May 15, 2025
d798005
Update comments
xezon May 15, 2025
6bcd039
Add logs for window position and size
xezon May 15, 2025
dbeb66c
Replicate in Generals
xezon May 15, 2025
f47c74e
Minor refactor
xezon May 15, 2025
5585646
More minor word fixes
xezon May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Generals/Code/GameEngine/Source/Common/GameEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,14 @@ void GameEngine::init( int argc, char *argv[] )
initSubsystem(TheArchiveFileSystem, "TheArchiveFileSystem", createArchiveFileSystem(), NULL); // this MUST come after TheLocalFileSystem creation
initSubsystem(TheWritableGlobalData, "TheWritableGlobalData", MSGNEW("GameEngineSubsystem") GlobalData(), &xferCRC, "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini");


// TheSuperHackers @bugfix helmutbuhler 14/04/2025
// Pump messages during startup to ensure that the application window is correctly
// positioned on slower computers and in debug builds by a later call to SetWindowPos.
// It is unclear what the issue with SetWindowPos is when it fails to reposition the window.
serviceWindowsOS();


#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
// If we're in Debug or Internal, load the Debug info as well.
ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_OVERWRITE, NULL );
Expand Down
143 changes: 82 additions & 61 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
//#define CREATE_DX8_FPU_PRESERVE
#define WW3D_DEVTYPE D3DDEVTYPE_HAL

#if defined(_MSC_VER) && _MSC_VER < 1300
#undef WINVER
#define WINVER 0x0500 // Required to access GetMonitorInfo in VC6.
#endif

#include "dx8wrapper.h"
#include "dx8webbrowser.h"
#include "dx8fvf.h"
Expand Down Expand Up @@ -230,6 +235,27 @@ void Non_Fatal_Log_DX8_ErrorCode(unsigned res,const char * file,int line)
}
}

// TheSuperHackers @info helmutbuhler 14/04/2025
// Helper function that moves x and y such that the inner rect fits into the outer rect.
// If the inner rect already is in the outer rect, then this does nothing.
// If the inner rect is larger than the outer rect, then the inner rect will be aligned to the top left of the outer rect.
void MoveRectIntoOtherRect(const RECT& inner, const RECT& outer, int* x, int* y)
{
int dx = 0;
if (inner.right > outer.right)
dx = outer.right-inner.right;
if (inner.left < outer.left)
dx = outer.left-inner.left;

int dy = 0;
if (inner.bottom > outer.bottom)
dy = outer.bottom-inner.bottom;
if (inner.top < outer.top)
dy = outer.top-inner.top;

*x += dx;
*y += dy;
}


bool DX8Wrapper::Init(void * hwnd, bool lite)
Expand Down Expand Up @@ -797,6 +823,60 @@ void DX8Wrapper::Get_Format_Name(unsigned int format, StringClass *tex_format)
}
}

void DX8Wrapper::Resize_And_Position_Window()
{
// Get the current dimensions of the 'render area' of the window
RECT rect = { 0 };
::GetClientRect (_Hwnd, &rect);

// Is the window the correct size for this resolution?
if ((rect.right-rect.left) != ResolutionWidth ||
(rect.bottom-rect.top) != ResolutionHeight) {

// Calculate what the main window's bounding rectangle should be to
// accommodate this resolution
rect.left = 0;
rect.top = 0;
rect.right = ResolutionWidth;
rect.bottom = ResolutionHeight;
DWORD dwstyle = ::GetWindowLong (_Hwnd, GWL_STYLE);
AdjustWindowRect (&rect, dwstyle, FALSE);
int width = rect.right-rect.left;
int height = rect.bottom-rect.top;

// Resize the window to fit this resolution
if (!IsWindowed)
{
::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, width, height, SWP_NOSIZE | SWP_NOMOVE);

DEBUG_LOG(("Window resized to w:%d h:%d\n", width, height));
}
else
{
// TheSuperHackers @feature helmutbuhler 14/04/2025
// Center the window in the workarea of the monitor it is on.
MONITORINFO mi = {sizeof(MONITORINFO)};
GetMonitorInfo(MonitorFromWindow(_Hwnd, MONITOR_DEFAULTTOPRIMARY), &mi);
int left = (mi.rcWork.left + mi.rcWork.right - width) / 2;
int top = (mi.rcWork.top + mi.rcWork.bottom - height) / 2;

// TheSuperHackers @feature helmutbuhler 14/04/2025
// Move the window to try fit it into the monitor area, if one of its dimensions is larger than the work area.
// Otherwise align the window to the top left edges, if it is even larger than the monitor area.
RECT rectClient;
rectClient.left = left - rect.left;
rectClient.top = top - rect.top;
rectClient.right = rectClient.left + ResolutionWidth;
rectClient.bottom = rectClient.top + ResolutionHeight;
MoveRectIntoOtherRect(rectClient, mi.rcMonitor, &left, &top);

::SetWindowPos (_Hwnd, NULL, left, top, width, height, SWP_NOZORDER);

DEBUG_LOG(("Window positioned to x:%d y:%d, resized to w:%d h:%d\n", left, top, width, height));
}
}
}

bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int windowed,
bool resize_window,bool reset_device, bool restore_assets)
{
Expand Down Expand Up @@ -838,36 +918,7 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
// push the client area to be the size you really want.
// if ( resize_window && windowed ) {
if (resize_window) {

// Get the current dimensions of the 'render area' of the window
RECT rect = { 0 };
::GetClientRect (_Hwnd, &rect);

// Is the window the correct size for this resolution?
if ((rect.right-rect.left) != ResolutionWidth ||
(rect.bottom-rect.top) != ResolutionHeight) {

// Calculate what the main window's bounding rectangle should be to
// accomodate this resolution
rect.left = 0;
rect.top = 0;
rect.right = ResolutionWidth;
rect.bottom = ResolutionHeight;
DWORD dwstyle = ::GetWindowLong (_Hwnd, GWL_STYLE);
AdjustWindowRect (&rect, dwstyle, FALSE);

// Resize the window to fit this resolution
if (!windowed)
::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, rect.right-rect.left, rect.bottom-rect.top,SWP_NOSIZE |SWP_NOMOVE);
else
::SetWindowPos (_Hwnd,
NULL,
0,
0,
rect.right-rect.left,
rect.bottom-rect.top,
SWP_NOZORDER | SWP_NOMOVE);
}
Resize_And_Position_Window();
}
#endif
//must be either resetting existing device or creating a new one.
Expand Down Expand Up @@ -1115,37 +1166,7 @@ bool DX8Wrapper::Set_Device_Resolution(int width,int height,int bits,int windowe
}
if (resize_window)
{

// Get the current dimensions of the 'render area' of the window
RECT rect = { 0 };
::GetClientRect (_Hwnd, &rect);

// Is the window the correct size for this resolution?
if ((rect.right-rect.left) != ResolutionWidth ||
(rect.bottom-rect.top) != ResolutionHeight)
{

// Calculate what the main window's bounding rectangle should be to
// accomodate this resolution
rect.left = 0;
rect.top = 0;
rect.right = ResolutionWidth;
rect.bottom = ResolutionHeight;
DWORD dwstyle = ::GetWindowLong (_Hwnd, GWL_STYLE);
AdjustWindowRect (&rect, dwstyle, FALSE);

// Resize the window to fit this resolution
if (!windowed)
::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, rect.right-rect.left, rect.bottom-rect.top,SWP_NOSIZE |SWP_NOMOVE);
else
::SetWindowPos (_Hwnd,
NULL,
0,
0,
rect.right-rect.left,
rect.bottom-rect.top,
SWP_NOZORDER | SWP_NOMOVE);
}
Resize_And_Position_Window();
}
#pragma message("TODO: support changing windowed status and changing the bit depth")
return Reset_Device();
Expand Down
1 change: 1 addition & 0 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,7 @@ class DX8Wrapper
/*
** Internal functions
*/
static void Resize_And_Position_Window();
static bool Find_Color_And_Z_Mode(int resx,int resy,int bitdepth,D3DFORMAT * set_colorbuffer,D3DFORMAT * set_backbuffer, D3DFORMAT * set_zmode);
static bool Find_Color_Mode(D3DFORMAT colorbuffer, int resx, int resy, UINT *mode);
static bool Find_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORMAT *zmode);
Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,12 @@ void GameEngine::init( int argc, char *argv[] )
#endif/////////////////////////////////////////////////////////////////////////////////////////////


// TheSuperHackers @bugfix helmutbuhler 14/04/2025
// Pump messages during startup to ensure that the application window is correctly
// positioned on slower computers and in debug builds by a later call to SetWindowPos.
// It is unclear what the issue with SetWindowPos is when it fails to reposition the window.
serviceWindowsOS();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How can this problem be reproduced? I tried this on my machine with Debug configuration and I cannot get the Window to be non responding during boot with and without this change.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, are you perhaps having a debugger attached? The buggy behavior will only occur if there is no debugger attached.
You can also try to insert a Sleep(5000); call instead of serviceWindowsOS(); When I do this, even the Release build shows buggy behavior.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot confirm that this avoids "(Not Responding)" in the window title. I tested this with

serviceWindowsOS();
Sleep(10000);
serviceWindowsOS();

But it does fix the window positioning as you say.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, of course it shows the "(Not Responding)" if you put a Sleep in there :)
The original issue arises when you use Debug build without optimizations and without a debugger attached. In that case the startup is so slow that this "(Not Responding)" shenanigans arises without a Sleep call.

In case you are interested. MS has a little bit of documentation about this feature:
https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-ishungappwindow?redirectedfrom=MSDN
https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-disableprocesswindowsghosting
This undocumented function might also be of interest: HungWindowFromGhostWindow



#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
// If we're in Debug or Internal, load the Debug info as well.
Expand Down
143 changes: 82 additions & 61 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
//#define CREATE_DX8_FPU_PRESERVE
#define WW3D_DEVTYPE D3DDEVTYPE_HAL

#if defined(_MSC_VER) && _MSC_VER < 1300
#undef WINVER
#define WINVER 0x0500 // Required to access GetMonitorInfo in VC6.
#endif

#include "dx8wrapper.h"
#include "dx8webbrowser.h"
#include "dx8fvf.h"
Expand Down Expand Up @@ -242,6 +247,27 @@ void Non_Fatal_Log_DX8_ErrorCode(unsigned res,const char * file,int line)
}
}

// TheSuperHackers @info helmutbuhler 14/04/2025
// Helper function that moves x and y such that the inner rect fits into the outer rect.
// If the inner rect already is in the outer rect, then this does nothing.
// If the inner rect is larger than the outer rect, then the inner rect will be aligned to the top left of the outer rect.
void MoveRectIntoOtherRect(const RECT& inner, const RECT& outer, int* x, int* y)
{
int dx = 0;
if (inner.right > outer.right)
dx = outer.right-inner.right;
if (inner.left < outer.left)
dx = outer.left-inner.left;

int dy = 0;
if (inner.bottom > outer.bottom)
dy = outer.bottom-inner.bottom;
if (inner.top < outer.top)
dy = outer.top-inner.top;

*x += dx;
*y += dy;
}


bool DX8Wrapper::Init(void * hwnd, bool lite)
Expand Down Expand Up @@ -886,6 +912,60 @@ void DX8Wrapper::Get_Format_Name(unsigned int format, StringClass *tex_format)
}
}

void DX8Wrapper::Resize_And_Position_Window()
{
// Get the current dimensions of the 'render area' of the window
RECT rect = { 0 };
::GetClientRect (_Hwnd, &rect);

// Is the window the correct size for this resolution?
if ((rect.right-rect.left) != ResolutionWidth ||
(rect.bottom-rect.top) != ResolutionHeight) {

// Calculate what the main window's bounding rectangle should be to
// accommodate this resolution
rect.left = 0;
rect.top = 0;
rect.right = ResolutionWidth;
rect.bottom = ResolutionHeight;
DWORD dwstyle = ::GetWindowLong (_Hwnd, GWL_STYLE);
AdjustWindowRect (&rect, dwstyle, FALSE);
int width = rect.right-rect.left;
int height = rect.bottom-rect.top;

// Resize the window to fit this resolution
if (!IsWindowed)
{
::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, width, height, SWP_NOSIZE | SWP_NOMOVE);

DEBUG_LOG(("Window resized to w:%d h:%d\n", width, height));
}
else
{
// TheSuperHackers @feature helmutbuhler 14/04/2025
// Center the window in the workarea of the monitor it is on.
MONITORINFO mi = {sizeof(MONITORINFO)};
GetMonitorInfo(MonitorFromWindow(_Hwnd, MONITOR_DEFAULTTOPRIMARY), &mi);
int left = (mi.rcWork.left + mi.rcWork.right - width) / 2;
int top = (mi.rcWork.top + mi.rcWork.bottom - height) / 2;

// TheSuperHackers @feature helmutbuhler 14/04/2025
// Move the window to try fit it into the monitor area, if one of its dimensions is larger than the work area.
// Otherwise align the window to the top left edges, if it is even larger than the monitor area.
RECT rectClient;
rectClient.left = left - rect.left;
rectClient.top = top - rect.top;
rectClient.right = rectClient.left + ResolutionWidth;
rectClient.bottom = rectClient.top + ResolutionHeight;
MoveRectIntoOtherRect(rectClient, mi.rcMonitor, &left, &top);

::SetWindowPos (_Hwnd, NULL, left, top, width, height, SWP_NOZORDER);

DEBUG_LOG(("Window positioned to x:%d y:%d, resized to w:%d h:%d\n", left, top, width, height));
}
}
}

bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int windowed,
bool resize_window,bool reset_device, bool restore_assets)
{
Expand Down Expand Up @@ -927,36 +1007,7 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
// push the client area to be the size you really want.
// if ( resize_window && windowed ) {
if (resize_window) {

// Get the current dimensions of the 'render area' of the window
RECT rect = { 0 };
::GetClientRect (_Hwnd, &rect);

// Is the window the correct size for this resolution?
if ((rect.right-rect.left) != ResolutionWidth ||
(rect.bottom-rect.top) != ResolutionHeight) {

// Calculate what the main window's bounding rectangle should be to
// accomodate this resolution
rect.left = 0;
rect.top = 0;
rect.right = ResolutionWidth;
rect.bottom = ResolutionHeight;
DWORD dwstyle = ::GetWindowLong (_Hwnd, GWL_STYLE);
AdjustWindowRect (&rect, dwstyle, FALSE);

// Resize the window to fit this resolution
if (!windowed)
::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, rect.right-rect.left, rect.bottom-rect.top,SWP_NOSIZE |SWP_NOMOVE);
else
::SetWindowPos (_Hwnd,
NULL,
0,
0,
rect.right-rect.left,
rect.bottom-rect.top,
SWP_NOZORDER | SWP_NOMOVE);
}
Resize_And_Position_Window();
}
#endif
//must be either resetting existing device or creating a new one.
Expand Down Expand Up @@ -1205,37 +1256,7 @@ bool DX8Wrapper::Set_Device_Resolution(int width,int height,int bits,int windowe
}
if (resize_window)
{

// Get the current dimensions of the 'render area' of the window
RECT rect = { 0 };
::GetClientRect (_Hwnd, &rect);

// Is the window the correct size for this resolution?
if ((rect.right-rect.left) != ResolutionWidth ||
(rect.bottom-rect.top) != ResolutionHeight)
{

// Calculate what the main window's bounding rectangle should be to
// accomodate this resolution
rect.left = 0;
rect.top = 0;
rect.right = ResolutionWidth;
rect.bottom = ResolutionHeight;
DWORD dwstyle = ::GetWindowLong (_Hwnd, GWL_STYLE);
AdjustWindowRect (&rect, dwstyle, FALSE);

// Resize the window to fit this resolution
if (!windowed)
::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, rect.right-rect.left, rect.bottom-rect.top,SWP_NOSIZE |SWP_NOMOVE);
else
::SetWindowPos (_Hwnd,
NULL,
0,
0,
rect.right-rect.left,
rect.bottom-rect.top,
SWP_NOZORDER | SWP_NOMOVE);
}
Resize_And_Position_Window();
}
#pragma message("TODO: support changing windowed status and changing the bit depth")
return Reset_Device();
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,7 @@ class DX8Wrapper
/*
** Internal functions
*/
static void Resize_And_Position_Window();
static bool Find_Color_And_Z_Mode(int resx,int resy,int bitdepth,D3DFORMAT * set_colorbuffer,D3DFORMAT * set_backbuffer, D3DFORMAT * set_zmode);
static bool Find_Color_Mode(D3DFORMAT colorbuffer, int resx, int resy, UINT *mode);
static bool Find_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORMAT *zmode);
Expand Down
Loading