Merge 407d886336 into 9d2eb5c9b0

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -102,6 +102,44 @@ wchar_t g_Win64UsernameW[17] = { 0 };
 // Fullscreen toggle state
 static bool g_isFullscreen = false;
 static WINDOWPLACEMENT g_wpPrev = { sizeof(g_wpPrev) };
+extern HWND g_hWnd;
+static void SaveFullscreenOption(bool fullscreen);
+
+static bool IsWindowBorderlessFullscreen(HWND hWnd)
+{
+	if (hWnd == NULL)
+		return false;
+
+	DWORD dwStyle = GetWindowLong(hWnd, GWL_STYLE);
+	if (dwStyle & WS_OVERLAPPEDWINDOW)
+		return false;
+
+	RECT windowRect = {};
+	if (!GetWindowRect(hWnd, &windowRect))
+		return false;
+
+	MONITORINFO mi = { sizeof(mi) };
+	if (!GetMonitorInfo(MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST), &mi))
+		return false;
+
+	return EqualRect(&windowRect, &mi.rcMonitor) != 0;
+}
+
+static void PersistFullscreenStateIfChanged()
+{
+	static bool s_hasSavedState = false;
+	static bool s_lastSavedState = false;
+
+	const bool currentState = IsWindowBorderlessFullscreen(g_hWnd);
+	g_isFullscreen = currentState;
+
+	if (!s_hasSavedState || s_lastSavedState != currentState)
+	{
+		SaveFullscreenOption(currentState);
+		s_lastSavedState = currentState;
+		s_hasSavedState = true;
+	}
+}
 
 //--------------------------------------------------------------------------------------
 // Update the Aspect Ratio to support Any Aspect Ratio
@@ -855,6 +893,23 @@ HRESULT InitDevice()
 	if( FAILED( hr ) )
 		return hr;
 	
+	IDXGIDevice* dxgiDevice = NULL;
+	if (SUCCEEDED(g_pd3dDevice->QueryInterface(__uuidof(IDXGIDevice), (void**)&dxgiDevice)) && dxgiDevice)
+	{
+		IDXGIAdapter* dxgiAdapter = NULL;
+		if (SUCCEEDED(dxgiDevice->GetParent(__uuidof(IDXGIAdapter), (void**)&dxgiAdapter)) && dxgiAdapter)
+		{
+			IDXGIFactory* dxgiFactory = NULL;
+			if (SUCCEEDED(dxgiAdapter->GetParent(__uuidof(IDXGIFactory), (void**)&dxgiFactory)) && dxgiFactory)
+			{
+				dxgiFactory->MakeWindowAssociation(g_hWnd, DXGI_MWA_NO_ALT_ENTER);
+				dxgiFactory->Release();
+			}
+			dxgiAdapter->Release();
+		}
+		dxgiDevice->Release();
+	}
+
 	// Create a render target view
 	ID3D11Texture2D* pBackBuffer = NULL;
 	hr = g_pSwapChain->GetBuffer( 0, __uuidof( ID3D11Texture2D ), ( LPVOID* )&pBackBuffer );
@@ -927,8 +982,11 @@ void Render()
 //--------------------------------------------------------------------------------------
 void ToggleFullscreen()
 {
+	const bool isFullscreenNow = IsWindowBorderlessFullscreen(g_hWnd);
+	g_isFullscreen = isFullscreenNow;
+
 	DWORD dwStyle = GetWindowLong(g_hWnd, GWL_STYLE);
-	if (!g_isFullscreen)
+	if (!isFullscreenNow)
 	{
 		MONITORINFO mi = { sizeof(mi) };
 		if (GetWindowPlacement(g_hWnd, &g_wpPrev) &&
@@ -949,8 +1007,8 @@ void ToggleFullscreen()
 		SetWindowPos(g_hWnd, NULL, 0, 0, 0, 0,
 			SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_FRAMECHANGED);
 	}
-	g_isFullscreen = !g_isFullscreen;
+
-	SaveFullscreenOption(g_isFullscreen);
+	g_isFullscreen = IsWindowBorderlessFullscreen(g_hWnd);
 
 	if (g_KBMInput.IsWindowFocused())
 		g_KBMInput.SetWindowFocused(true);
@@ -1689,6 +1747,15 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 			ToggleFullscreen();
 		}
 
+		// Alt+Enter Toggle fullscreen 
+		if (g_KBMInput.IsKeyPressed(VK_RETURN) &&
+			(g_KBMInput.IsKeyDown(VK_LMENU) || g_KBMInput.IsKeyDown(VK_RMENU)))
+		{
+			ToggleFullscreen();
+		}
+
+		PersistFullscreenStateIfChanged();
+
 		// TAB opens game info menu. - Vvis :3 - Updated by detectiveren
 		if (g_KBMInput.IsKeyPressed(VK_TAB) && !ui.GetMenuDisplayed(0))
 		{