From a048ad52b47d367666e4dd186811f7f3724fc22f Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 25 Feb 2010 03:05:53 +0000 Subject: [PATCH] Fix input focus in fullscreen on linux git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5125 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_GCPad/Src/GCPad.cpp | 4 +++- Source/Plugins/Plugin_Wiimote/Src/main.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp b/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp index d399144c61..ec361eb751 100644 --- a/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp +++ b/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp @@ -656,7 +656,9 @@ bool IsFocus() Window FocusWin; int Revert; XGetInputFocus(GCdisplay, &FocusWin, &Revert); - return (GLWin != 0 && GLWin == FocusWin); + XWindowAttributes WinAttribs; + XGetWindowAttributes (WMdisplay, GLWin, &WinAttribs); + return (GLWin != 0 && (GLWin == FocusWin || WinAttribs.override_redirect)); #else return true; #endif diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp index b0840114e7..b09ede8cc0 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp @@ -403,7 +403,9 @@ bool IsFocus() Window FocusWin; int Revert; XGetInputFocus(WMdisplay, &FocusWin, &Revert); - return (GLWin != 0 && GLWin == FocusWin); + XWindowAttributes WinAttribs; + XGetWindowAttributes (WMdisplay, GLWin, &WinAttribs); + return (GLWin != 0 && (GLWin == FocusWin || WinAttribs.override_redirect)); #else return true; #endif