Fixed a little out-of-fullscreen black screen weirdness on windows, trying to port fullscreen changes to DX, needs more work.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2863 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp

@@ -9,25 +9,25 @@
 
 namespace EmuWindow
 {
-	HWND m_hWnd = NULL;
+HWND m_hWnd = NULL;
-	HWND m_hParent = NULL;
+HWND m_hParent = NULL;
-	HINSTANCE m_hInstance = NULL;
+HINSTANCE m_hInstance = NULL;
-	WNDCLASSEX wndClass;
+WNDCLASSEX wndClass;
-	const TCHAR m_szClassName[] = "DolphinEmuWnd";
+const TCHAR m_szClassName[] = "DolphinEmuWnd";
-	int g_winstyle;
+int g_winstyle;
 
-	HWND GetWnd()
+HWND GetWnd()
-	{
+{
 	return m_hWnd;
-	}
+}
 
-	HWND GetParentWnd()
+HWND GetParentWnd()
-	{
+{
 	return m_hParent;
-	}
+}
 
-	LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
+LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
-	{
+{
 	HDC         hdc;
 	PAINTSTRUCT ps;
 	switch( iMsg )
@@ -40,14 +40,67 @@ namespace EmuWindow
 	case WM_KEYDOWN:
 		switch( LOWORD( wParam ))
 		{
-			case VK_ESCAPE:     /*  Pressing esc quits */
+			case VK_ESCAPE:   // Pressing Esc switch FullScreen/Windowed
-				//DestroyWindow(hWnd);
+				if (g_Config.bFullscreen)
-				//PostQuitMessage(0);
+				{
-				break;
+					DestroyWindow(hWnd);
+					PostQuitMessage(0);
+					ExitProcess(0);
+					/* Get out of fullscreen
+					g_Config.bFullscreen = false;
+
+					// FullScreen - > Desktop
+					ChangeDisplaySettings(NULL, 0);
+
+					// Re-Enable the cursor
+					ShowCursor(TRUE);
+				
+					RECT rcdesktop;
+					RECT rc = {0, 0, 640, 480};
+					GetWindowRect(GetDesktopWindow(), &rcdesktop);
+
+					int X = (rcdesktop.right-rcdesktop.left)/2 - (rc.right-rc.left)/2;
+					int Y = (rcdesktop.bottom-rcdesktop.top)/2 - (rc.bottom-rc.top)/2;
+					// SetWindowPos to the center of the screen
+					SetWindowPos(hWnd, NULL, X, Y, 640, 480, SWP_NOREPOSITION | SWP_NOZORDER);
+
+					// Set new window style FS -> Windowed
+					SetWindowLong(hWnd, GWL_STYLE, WS_OVERLAPPEDWINDOW);
+
+					// Eventually show the window!
+					EmuWindow::Show();*/
+				}
 				/*
-				case MY_KEYS:
+				else
-				hypotheticalScene->sendMessage(KEYDOWN...);
+				{
-				*/
+					// Get into fullscreen
+					g_Config.bFullscreen = true;
+					DEVMODE dmScreenSettings;
+					memset(&dmScreenSettings, 0, sizeof(dmScreenSettings));
+					RECT rcdesktop;
+					GetWindowRect(GetDesktopWindow(), &rcdesktop);
+
+					// Desktop -> FullScreen
+					dmScreenSettings.dmSize			= sizeof(dmScreenSettings);
+					dmScreenSettings.dmPelsWidth	= rcdesktop.right;
+					dmScreenSettings.dmPelsHeight	= rcdesktop.bottom;
+					dmScreenSettings.dmBitsPerPel	= 32;
+					dmScreenSettings.dmFields = DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT;
+					if (ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
+						return 0;
+					// Disable the cursor
+					ShowCursor(FALSE);
+
+					// SetWindowPos to the upper-left corner of the screen
+					SetWindowPos(hWnd, NULL, 0, 0, rcdesktop.right, rcdesktop.bottom, SWP_NOREPOSITION | SWP_NOZORDER);
+					
+					// Set new window style -> PopUp
+					SetWindowLong(hWnd, GWL_STYLE, WS_POPUP);
+					
+					// Eventually show the window!
+					EmuWindow::Show();
+				}*/
+				break;
 		}
 		g_VideoInitialize.pKeyPress(LOWORD(wParam), GetAsyncKeyState(VK_SHIFT) != 0, GetAsyncKeyState(VK_CONTROL) != 0);
 		break;
@@ -80,11 +133,11 @@ namespace EmuWindow
 	}
 
 	return DefWindowProc(hWnd, iMsg, wParam, lParam);
-	}
+}
 
 
-	HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const TCHAR *title)
+HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const TCHAR *title)
-	{
+{
 	wndClass.cbSize = sizeof( wndClass );
 	wndClass.style  = CS_HREDRAW | CS_VREDRAW;
 	wndClass.lpfnWndProc = WndProc;
@@ -139,29 +192,29 @@ namespace EmuWindow
 	}
 
 	return m_hWnd;
-	}
+}
 
-	void Show()
+void Show()
-	{
+{
 	ShowWindow(m_hWnd, SW_SHOW);
 	BringWindowToTop(m_hWnd);
 	UpdateWindow(m_hWnd);
-	}
+}
 
-	HWND Create(HWND hParent, HINSTANCE hInstance, const TCHAR *title)
+HWND Create(HWND hParent, HINSTANCE hInstance, const TCHAR *title)
-	{
+{
 	return OpenWindow(hParent, hInstance, 640, 480, title);
-	}
+}
 
-	void Close()
+void Close()
-	{
+{
 	DestroyWindow(m_hWnd);
 	UnregisterClass(m_szClassName, m_hInstance);
-	}
+}
 
 
-	void SetSize(int width, int height)
+void SetSize(int width, int height)
-	{
+{
 	RECT rc = {0, 0, width, height};
 	AdjustWindowRect(&rc, WS_OVERLAPPEDWINDOW, false);
 
@@ -173,5 +226,5 @@ namespace EmuWindow
 	rc.top = (1024 - h)/2;
 	rc.bottom = rc.top + h;
 	::MoveWindow(m_hWnd, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, TRUE);
-	}
+}
 }

Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp

@@ -168,25 +168,24 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
 					
 					if (strlen(g_Config.iWindowedRes) > 1)
 						sscanf(g_Config.iWindowedRes, "%dx%d", &w_fs, &h_fs);
-
-					// FullScreen - > Desktop
-					ChangeDisplaySettings(NULL, 0);
-
-					// Set new window style FS -> Windowed
-					SetWindowLong(hWnd, GWL_STYLE, WS_OVERLAPPEDWINDOW);
-
-					// Re-Enable the cursor
-					ShowCursor(TRUE);
-				
 					RECT rcdesktop;
 					RECT rc = {0, 0, w_fs, h_fs};
 					GetWindowRect(GetDesktopWindow(), &rcdesktop);
 
+					// FullScreen -> Desktop
+					ChangeDisplaySettings(NULL, 0);
+
+					// Re-Enable the cursor
+					ShowCursor(TRUE);
+
 					int X = (rcdesktop.right-rcdesktop.left)/2 - (rc.right-rc.left)/2;
 					int Y = (rcdesktop.bottom-rcdesktop.top)/2 - (rc.bottom-rc.top)/2;
 					// SetWindowPos to the center of the screen
 					SetWindowPos(hWnd, NULL, X, Y, w_fs, h_fs, SWP_NOREPOSITION | SWP_NOZORDER);
 
+					// Set new window style FS -> Windowed
+					SetWindowLong(hWnd, GWL_STYLE, WS_OVERLAPPEDWINDOW);
+
 					// Eventually show the window!
 					EmuWindow::Show();
 				}