From 2005b4430fa91a89da35e39b356317a72cf86cf0 Mon Sep 17 00:00:00 2001 From: RenaKunisaki Date: Mon, 16 May 2016 15:09:59 -0400 Subject: Fix window focus detection on Linux On Linux, the FindFocus method from wx simply doesn't work, it would on some environment report that dolphin has the focus while it doesn't have it. This is why an alternative method has to be used which is to set a focus flag whenever the render frame gets activated. --- Source/Core/DolphinWX/Frame.cpp | 63 ++++++++--------------------------------- 1 file changed, 12 insertions(+), 51 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 5978dfc49d..c0e09ebdfb 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -504,18 +504,25 @@ void CFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) // Events void CFrame::OnActive(wxActivateEvent& event) { + m_bHasFocus = (event.GetActive() && event.GetEventObject() == m_RenderFrame); if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE) { - if (event.GetActive() && event.GetEventObject() == m_RenderFrame) + if (m_bHasFocus) { if (SConfig::GetInstance().bRenderToMain) m_RenderParent->SetFocus(); + if (SConfig::GetInstance().m_PauseOnFocusLost && Core::GetState() == Core::CORE_PAUSE) + DoPause(); + if (SConfig::GetInstance().bHideCursor && Core::GetState() == Core::CORE_RUN) m_RenderParent->SetCursor(wxCURSOR_BLANK); } else { + if (SConfig::GetInstance().m_PauseOnFocusLost && Core::GetState() == Core::CORE_RUN) + DoPause(); + if (SConfig::GetInstance().bHideCursor) m_RenderParent->SetCursor(wxNullCursor); } @@ -769,27 +776,11 @@ bool CFrame::RendererHasFocus() { if (m_RenderParent == nullptr) return false; -#ifdef _WIN32 - HWND window = GetForegroundWindow(); - if (window == nullptr) - return false; - - if (m_RenderFrame->GetHWND() == window) - return true; -#else - wxWindow* window = wxWindow::FindFocus(); - if (window == nullptr) - return false; - // Why these different cases? - if (m_RenderParent == window || m_RenderParent == window->GetParent() || - m_RenderParent->GetParent() == window->GetParent()) - { - return true; - } -#endif - return false; + return m_bRendererHasFocus; } +// Returns true any time any one of our UI windows +// has the focus, including any dialogs or other windows. bool CFrame::UIHasFocus() { // UIHasFocus should return true any time any one of our UI @@ -799,8 +790,7 @@ bool CFrame::UIHasFocus() // focus. If it's not one of our windows, then it will return // null. - wxWindow* focusWindow = wxWindow::FindFocus(); - return (focusWindow != nullptr); + return m_bHasFocus; } void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event)) @@ -1139,35 +1129,6 @@ void CFrame::OnMouse(wxMouseEvent& event) event.Skip(); } -void CFrame::OnFocusChange(wxFocusEvent& event) -{ - if (SConfig::GetInstance().m_PauseOnFocusLost && Core::IsRunningAndStarted()) - { - if (RendererHasFocus()) - { - if (Core::GetState() == Core::CORE_PAUSE) - { - Core::SetState(Core::CORE_RUN); - if (SConfig::GetInstance().bHideCursor) - m_RenderParent->SetCursor(wxCURSOR_BLANK); - } - } - else - { - if (Core::GetState() == Core::CORE_RUN) - { - Core::SetState(Core::CORE_PAUSE); - if (SConfig::GetInstance().bHideCursor) - m_RenderParent->SetCursor(wxNullCursor); - Core::UpdateTitle(); - } - } - UpdateGUI(); - } - - event.Skip(); -} - void CFrame::DoFullscreen(bool enable_fullscreen) { if (g_Config.bExclusiveMode && Core::GetState() == Core::CORE_PAUSE) -- cgit v1.2.3 From ee201455a8810803a9966b951815143786a0767d Mon Sep 17 00:00:00 2001 From: aldelaro5 Date: Thu, 27 Oct 2016 21:50:09 -0400 Subject: Move UiHasFocus into DolphinApp Using a wxEVT_ACTIVATE_APP event. --- Source/Core/DolphinWX/Frame.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index c0e09ebdfb..a07586ad9c 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -504,10 +504,10 @@ void CFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) // Events void CFrame::OnActive(wxActivateEvent& event) { - m_bHasFocus = (event.GetActive() && event.GetEventObject() == m_RenderFrame); + m_bRendererHasFocus = (event.GetActive() && event.GetEventObject() == m_RenderFrame); if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE) { - if (m_bHasFocus) + if (m_bRendererHasFocus) { if (SConfig::GetInstance().bRenderToMain) m_RenderParent->SetFocus(); @@ -779,20 +779,6 @@ bool CFrame::RendererHasFocus() return m_bRendererHasFocus; } -// Returns true any time any one of our UI windows -// has the focus, including any dialogs or other windows. -bool CFrame::UIHasFocus() -{ - // UIHasFocus should return true any time any one of our UI - // windows has the focus, including any dialogs or other windows. - // - // wxWindow::FindFocus() returns the current wxWindow which has - // focus. If it's not one of our windows, then it will return - // null. - - return m_bHasFocus; -} - void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event)) { // Show all platforms and regions if... -- cgit v1.2.3