ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats 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 // Multi System Input Status Check
bool IsKey(int Key) bool IsKey(int Key)
{ {
@ -622,7 +611,7 @@ bool IsKey(int Key)
} }
else if (MapKey < 0x1100) else if (MapKey < 0x1100)
#elif defined HAVE_X11 && HAVE_X11 #elif defined HAVE_X11 && HAVE_X11
if (HaveFocus() && (MapKey < 256 || MapKey > 0xf000)) if (MapKey < 256 || MapKey > 0xf000)
{ {
char keys[32]; char keys[32];
KeyCode keyCode; KeyCode keyCode;
@ -663,7 +652,13 @@ bool IsFocus()
return true; return true;
else else
return false; 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; return true;
#endif #endif
} }

13
Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp
View File

@ -196,17 +196,6 @@ void LoadRecordedMovements()
} }
} }
#if defined(HAVE_X11) && HAVE_X11
bool HaveFocus (void)
{
Window GLWin = *(Window *)g_WiimoteInitialize.pXWindow;
Window FocusWin;
int Revert;
XGetInputFocus(WMdisplay, &FocusWin, &Revert);
return (GLWin != 0 && GLWin == FocusWin);
}
#endif
/* Calibrate the mouse position to the emulation window. g_WiimoteInitialize.hWnd is the rendering window handle. */ /* Calibrate the mouse position to the emulation window. g_WiimoteInitialize.hWnd is the rendering window handle. */
void GetMousePos(float& x, float& y) void GetMousePos(float& x, float& y)
{ {
@ -231,7 +220,7 @@ void GetMousePos(float& x, float& y)
float WinWidth = 0, WinHeight = 0; float WinWidth = 0, WinHeight = 0;
float XOffset = 0, YOffset = 0; float XOffset = 0, YOffset = 0;
int root_x, root_y, win_x, win_y; int root_x, root_y, win_x, win_y;
if (HaveFocus()) if (IsFocus())
{ {
Window GLWin = *(Window *)g_WiimoteInitialize.pXWindow; Window GLWin = *(Window *)g_WiimoteInitialize.pXWindow;
XWindowAttributes WinAttribs; XWindowAttributes WinAttribs;

4
Source/Plugins/Plugin_Wiimote/Src/EmuMain.h
View File

@ -44,10 +44,6 @@ void Update(int _number);
void DoState(PointerWrap &p); void DoState(PointerWrap &p);
bool IsKey(int Key); bool IsKey(int Key);
#if defined(HAVE_X11) && HAVE_X11
bool HaveFocus (void);
#endif
// Recordings // Recordings
void LoadRecordedMovements(); void LoadRecordedMovements();
void GetMousePos(float& x, float& y); void GetMousePos(float& x, float& y);

4
Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
View File

@ -310,7 +310,7 @@ bool IsKey(int Key)
} }
else if (MapKey < 0x1100) else if (MapKey < 0x1100)
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
if (HaveFocus() && (MapKey < 256 || MapKey >= 0xf000)) if (MapKey < 256 || MapKey >= 0xf000)
{ {
char keys[32]; char keys[32];
KeyCode keyCode; KeyCode keyCode;
@ -346,7 +346,7 @@ bool IsKey(int Key)
} }
#endif #endif
#if defined(HAVE_X11) && HAVE_X11 #if defined(HAVE_X11) && HAVE_X11
if ((Key == EWM_SHAKE || Key == EWM_A || Key == EWM_B) && HaveFocus()) if (Key == EWM_SHAKE || Key == EWM_A || Key == EWM_B)
{ {
Window GLWin = *(Window *)g_WiimoteInitialize.pXWindow; Window GLWin = *(Window *)g_WiimoteInitialize.pXWindow;
int root_x, root_y, win_x, win_y; int root_x, root_y, win_x, win_y;

6
Source/Plugins/Plugin_Wiimote/Src/main.cpp
View File

@ -411,6 +411,12 @@ bool IsFocus()
return true; return true;
else else
return false; return false;
#elif defined HAVE_X11 && HAVE_X11
Window GLWin = *(Window *)g_WiimoteInitialize.pXWindow;
Window FocusWin;
int Revert;
XGetInputFocus(WMdisplay, &FocusWin, &Revert);
return (GLWin != 0 && GLWin == FocusWin);
#else #else
return true; return true;
#endif #endif