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

Remove HaveFocus, and put that code into IsFocus. Thanks ayuanx.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5058 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-02-14 14:48:19 +00:00
parent a8793cbe52
commit dc7029e7f4
5 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Plugins/Plugin_GCPad/Src/GCPad.cpp
View File

@ -598,17 +598,6 @@ void UpdatePadState(CONTROLLER_MAPPING_GC &_GCiMapping)
}
}
#if defined(HAVE_X11) && HAVE_X11
bool HaveFocus (void)
{
Window GLWin = *(Window *)g_PADInitialize->pXWindow;
Window FocusWin;
int Revert;
XGetInputFocus(GCdisplay, &FocusWin, &Revert);
return (GLWin != 0 && GLWin == FocusWin);
}
#endif
// Multi System Input Status Check
bool IsKey(int Key)
{
@ -622,7 +611,7 @@ bool IsKey(int Key)
}
else if (MapKey < 0x1100)
#elif defined HAVE_X11 && HAVE_X11
if (HaveFocus() && (MapKey < 256 || MapKey > 0xf000))
if (MapKey < 256 || MapKey > 0xf000)
{
char keys[32];
KeyCode keyCode;
@ -663,7 +652,13 @@ bool IsFocus()
return true;
else
return false;
#else
#elif defined HAVE_X11 && HAVE_X11
Window GLWin = *(Window *)g_PADInitialize->pXWindow;
Window FocusWin;
int Revert;
XGetInputFocus(GCdisplay, &FocusWin, &Revert);
return (GLWin != 0 && GLWin == FocusWin);
#else
return true;
#endif
#endif
}