piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added hotkey Alt+F1/F2/F3/F4 for connect/disconnect wiimote with OSD display

Browse Source 
(But there is still a little problem with DX9 fullscreen toggling)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4782 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx
2010-01-04 03:11:31 +00:00
parent cbf5929276
commit 430f44cb1e
6 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp
View File

@ -113,8 +113,15 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
switch( LOWORD( wParam ))
{
case VK_RETURN: // Pressing Alt+Enter switch FullScreen/Windowed
ToggleFullscreen(hWnd);
if (m_hParent == NULL && !g_Config.RenderToMainframe)
{
ToggleFullscreen(hWnd);
return 0;
}
break;
case VK_F1: case VK_F2: case VK_F3: case VK_F4:
PostMessage(m_hMain, WM_SYSKEYDOWN, wParam, lParam);
return 0;
}
break;
@ -168,7 +175,9 @@ HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const T
wndClass.cbWndExtra = 0;
wndClass.hInstance = hInstance;
wndClass.hIcon = LoadIcon( NULL, IDI_APPLICATION );
wndClass.hCursor = LoadCursor( NULL, IDC_ARROW );
// To interfer less with SetCursor() later we set this to NULL
//wndClass.hCursor = LoadCursor( NULL, IDC_ARROW );
wndClass.hCursor = NULL;
wndClass.hbrBackground = (HBRUSH)GetStockObject( BLACK_BRUSH );
wndClass.lpszMenuName = NULL;
wndClass.lpszClassName = m_szClassName;
@ -218,7 +227,7 @@ HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const T
void Show()
{
ShowWindow(m_hWnd, SW_SHOWNORMAL);
ShowWindow(m_hWnd, SW_SHOW);
BringWindowToTop(m_hWnd);
UpdateWindow(m_hWnd);
}
@ -259,7 +268,8 @@ void ToggleFullscreen(HWND hParent)
{
if (m_hParent == NULL)
{
if (D3D::IsFullscreen()) {
if (D3D::IsFullscreen())
{
PostMessage( m_hMain, WM_USER, WM_USER_STOP, 0 );
return;
}
@ -300,7 +310,6 @@ void ToggleFullscreen(HWND hParent)
sscanf(g_Config.cFSResolution, "%dx%d", &w_fs, &h_fs);
// Get into fullscreen
g_Config.bFullscreen = true;
DEVMODE dmScreenSettings;
memset(&dmScreenSettings, 0, sizeof(dmScreenSettings));
@ -311,15 +320,17 @@ void ToggleFullscreen(HWND hParent)
dmScreenSettings.dmFields = DM_PELSWIDTH|DM_PELSHEIGHT;
if (ChangeDisplaySettings(&dmScreenSettings, 0) != DISP_CHANGE_SUCCESSFUL)
return;
// Disable the cursor
ShowCursor(FALSE);
// SetWindowPos to the upper-left corner of the screen
SetWindowPos(hParent, NULL, 0, 0, w_fs, h_fs, SWP_NOREPOSITION | SWP_NOZORDER);
// Set new window style -> PopUp
SetWindowLong(hParent, GWL_STYLE, WS_POPUP);
// SetWindowPos to the upper-left corner of the screen
SetWindowPos(hParent, HWND_TOP, 0, 0, w_fs, h_fs, SWP_NOREPOSITION);
// Disable the cursor
ShowCursor(FALSE);
g_Config.bFullscreen = true;
// Eventually show the window!
EmuWindow::Show();
}

5
Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
View File

@ -291,8 +291,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
{
ToggleFullscreen(hWnd);
return 0;
}
}
break;
case VK_F1: case VK_F2: case VK_F3: case VK_F4:
PostMessage(m_hMain, WM_SYSKEYDOWN, wParam, lParam);
return 0;
}
break;

3
Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
View File

@ -148,6 +148,9 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
return 0;
}
break;
case VK_F1: case VK_F2: case VK_F3: case VK_F4:
PostMessage(m_hMain, WM_SYSKEYDOWN, wParam, lParam);
return 0;
}
break;