alt-enter first version

Author: githubawn

Core/GameEngine/Include/Common/OptionPreferences.h

@@ -88,6 +88,8 @@ class OptionPreferences : public UserPreferences
 	Real getGammaValue();
 	Int getTextureReduction();
 	void getResolution(Int *xres, Int *yres);
+	Bool getWindowed() const;
+	void setWindowed(Bool windowed);
 	Bool get3DShadowsEnabled();
 	Bool get2DShadowsEnabled();
 	Bool getCloudShadowsEnabled();

Core/GameEngine/Source/Common/OptionPreferences.cpp

@@ -714,6 +714,23 @@ void OptionPreferences::getResolution(Int *xres, Int *yres)
 	*yres=selectedYRes;
 }
 
+Bool OptionPreferences::getWindowed() const
+{
+	OptionPreferences::const_iterator it = find("Windowed");
+	if (it == end())
+		return FALSE;
+
+	if (stricmp(it->second.str(), "yes") == 0) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void OptionPreferences::setWindowed(Bool windowed)
+{
+	insert(std::make_pair(AsciiString("Windowed"), AsciiString(windowed ? "yes" : "no")));
+}
+
 Real OptionPreferences::getMusicVolume()
 {
 	OptionPreferences::const_iterator it = find("MusicVolume");

Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

@@ -1241,20 +1241,16 @@ const char * DX8Wrapper::Get_Render_Device_Name(int device_index)
 bool DX8Wrapper::Set_Device_Resolution(int width,int height,int bits,int windowed, bool resize_window)
 {
 	if (D3DDevice != nullptr) {
-
-		if (width != -1) {
-			_PresentParameters.BackBufferWidth = ResolutionWidth = width;
-		}
-		if (height != -1) {
-			_PresentParameters.BackBufferHeight = ResolutionHeight = height;
-		}
-		if (resize_window)
-		{
-			Resize_And_Position_Window();
-		}
-#pragma message("TODO: support changing windowed status and changing the bit depth")
-		WWDEBUG_SAY(("DX8Wrapper::Set_Device_Resolution is resetting the device."));
-		return Reset_Device();
+		// If parameters are -1, use current values.
+		int w = (width == -1) ? ResolutionWidth : width;
+		int h = (height == -1) ? ResolutionHeight : height;
+		int b = (bits == -1) ? BitDepth : bits;
+		int win = (windowed == -1) ? IsWindowed : windowed;
+
+		// TheSuperHackers @bugfix valeronm 16/04/2026 
+		// Set_Render_Device handles all the presentation parameter changes and the reset.
+		// Previous implementation was stubbed and ignored windowed/bits changes.
+		return Set_Render_Device(CurRenderDevice, w, h, b, win, resize_window, true, true);
 	} else {
 		return false;
 	}

GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h

@@ -54,18 +54,20 @@ constexpr const Int MAX_GLOBAL_LIGHTS = 3;
 constexpr const Int SIMULATE_REPLAYS_SEQUENTIAL = -1;
 
 //-------------------------------------------------------------------------------------------------
-class CommandLineData
+struct CommandLineData
 {
 	friend class CommandLine;
 	friend class GlobalData;
 
 	CommandLineData()
 		: m_hasParsedCommandLineForStartup(false)
 		, m_hasParsedCommandLineForEngineInit(false)
+		, m_windowedCommandLineSpecified(false)
 	{}
 
 	Bool m_hasParsedCommandLineForStartup;
 	Bool m_hasParsedCommandLineForEngineInit;
+	Bool m_windowedCommandLineSpecified;
 };
 
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp

@@ -36,6 +36,8 @@
 #include "GameClient/GameText.h"
 #include "GameNetwork/NetworkDefs.h"
 #include "trim.h"
+#include "Common/OptionPreferences.h"
+
 
 
 
@@ -118,6 +120,7 @@ Int parseNoLogOrCrash(char *args[], int)
 Int parseWin(char *args[], int)
 {
 	TheWritableGlobalData->m_windowed = true;
+	TheWritableGlobalData->m_commandLineData.m_windowedCommandLineSpecified = true;
 
 	return 1;
 }
@@ -377,6 +380,7 @@ Int parseNoAudio(char *args[], int)
 Int parseNoWin(char *args[], int)
 {
 	TheWritableGlobalData->m_windowed = false;
+	TheWritableGlobalData->m_commandLineData.m_windowedCommandLineSpecified = true;
 
 	return 1;
 }
@@ -1450,6 +1454,9 @@ void CommandLine::parseCommandLineForStartup()
 		return;
 	TheWritableGlobalData->m_commandLineData.m_hasParsedCommandLineForStartup = true;
 
+	OptionPreferences optionPref;
+	TheWritableGlobalData->m_windowed = optionPref.getWindowed();
+
 	parseCommandLine(paramsForStartup, ARRAY_SIZE(paramsForStartup));
 }
 

GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -1162,6 +1162,9 @@ void GlobalData::reset()
 //-------------------------------------------------------------------------------------------------
 void GlobalData::parseGameDataDefinition( INI* ini )
 {
+	// Capture command-line intent before any INI overrides happen
+	Bool cmdWindowed = TheGlobalData->m_windowed;
+
 	if( TheWritableGlobalData && ini->getLoadType() != INI_LOAD_MULTIFILE)
 	{
 
@@ -1211,6 +1214,15 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	TheWritableGlobalData->m_playerInfoListFontSize = optionPref.getPlayerInfoListFontSize();
 	TheWritableGlobalData->m_showMoneyPerMinute = optionPref.getShowMoneyPerMinute();
 
+	if (TheGlobalData->m_commandLineData.m_windowedCommandLineSpecified)
+	{
+		TheWritableGlobalData->m_windowed = cmdWindowed;
+	}
+	else
+	{
+		TheWritableGlobalData->m_windowed = optionPref.getWindowed();
+	}
+
 	Int val=optionPref.getGammaValue();
 	//generate a value between 0.6 and 2.0.
 	if (val < 50)

GeneralsMD/Code/Main/WinMain.cpp

@@ -51,9 +51,11 @@
 #include "Common/GameMemory.h"
 #include "Common/StackDump.h"
 #include "Common/MessageStream.h"
+#include "Common/OptionPreferences.h"
 #include "Common/Registry.h"
 #include "Common/Team.h"
 #include "GameClient/ClientInstance.h"
+#include "GameClient/Display.h"
 #include "GameClient/InGameUI.h"
 #include "GameClient/GameClient.h"
 #include "GameLogic/GameLogic.h"  ///< @todo for demo, remove
@@ -655,6 +657,71 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				break;
 			}
 #endif
+			case WM_SYSKEYDOWN:
+			{
+				if (wParam == VK_RETURN && (lParam & (1 << 29))) // Alt + Enter
+				{
+					if (TheGameEngine && !TheGameEngine->getQuitting() && TheDisplay)
+					{
+						TheWritableGlobalData->m_windowed = !TheGlobalData->m_windowed;
+
+						// Determine desired client resolution
+						Int resX = TheGlobalData->m_xResolution;
+						Int resY = TheGlobalData->m_yResolution;
+
+						// Update window style and calculate correct window size
+						DWORD windowStyle = WS_POPUP | WS_VISIBLE;
+						DWORD exStyle = 0;
+						if (TheGlobalData->m_windowed)
+						{
+							// Standard windowed style with caption and fixed dialog border
+							windowStyle |= WS_MINIMIZEBOX | WS_SYSMENU | WS_DLGFRAME | WS_CAPTION;
+						}
+						else
+						{
+							// Fullscreen style (borderless popup)
+							windowStyle |= WS_SYSMENU;
+							exStyle |= WS_EX_TOPMOST;
+						}
+
+						// Let Windows calculate the required window size for our desired client resolution
+						RECT windowRect = { 0, 0, resX, resY };
+						AdjustWindowRect(&windowRect, windowStyle, FALSE);
+						int width = windowRect.right - windowRect.left;
+						int height = windowRect.bottom - windowRect.top;
+
+						// Determine position (center it if windowed)
+						int x = 0, y = 0;
+						if (TheGlobalData->m_windowed)
+						{
+							x = (GetSystemMetrics(SM_CXSCREEN) - width) / 2;
+							y = (GetSystemMetrics(SM_CYSCREEN) - height) / 2;
+							if (x < 0) x = 0;
+							if (y < 0) y = 0;
+						}
+
+						// Apply styles and size
+						SetWindowLong(hWnd, GWL_STYLE, windowStyle);
+						SetWindowLong(hWnd, GWL_EXSTYLE, exStyle);
+						SetWindowPos(hWnd, TheGlobalData->m_windowed ? HWND_NOTOPMOST : HWND_TOPMOST, 
+									 x, y, width, height, SWP_FRAMECHANGED | SWP_SHOWWINDOW);
+
+						// Toggle and save
+						TheDisplay->setDisplayMode(resX, resY, 32, TheGlobalData->m_windowed);
+
+						OptionPreferences optionPref;
+						optionPref.setWindowed(TheGlobalData->m_windowed);
+						optionPref.write();
+
+						// Re-apply refresh just in case reset messed it up
+						SetWindowPos(hWnd, TheGlobalData->m_windowed ? HWND_NOTOPMOST : HWND_TOPMOST, 
+									 x, y, width, height, SWP_FRAMECHANGED | SWP_SHOWWINDOW);
+						UpdateWindow(hWnd);
+					}
+					return 0;
+				}
+				break;
+			}
 		}
 
 	}