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

Merge pull request #752 from magcius/remove-bootleg-events 

X11Utils: Remove unneeded SendButtonEvent / SendKeyEvent utilities
This commit is contained in:
Lioncash 2014-08-06 16:37:11 -04:00
parent cb178679f1 354f223f77
commit 470bfc9b0b
3 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/Frame.cpp
View File

@ -1123,18 +1123,6 @@ void CFrame::OnKeyUp(wxKeyEvent& event)
void CFrame::OnMouse(wxMouseEvent& event) void CFrame::OnMouse(wxMouseEvent& event)
{ {
#if defined(HAVE_X11) && HAVE_X11
if (Core::GetState() != Core::CORE_UNINITIALIZED)
{
if (event.Dragging())
X11Utils::SendMotionEvent(X11Utils::XDisplayFromHandle(GetHandle()),
event.GetPosition().x, event.GetPosition().y);
else
X11Utils::SendButtonEvent(X11Utils::XDisplayFromHandle(GetHandle()), event.GetButton(),
event.GetPosition().x, event.GetPosition().y, event.ButtonDown());
}
#endif
// next handlers are all for FreeLook, so we don't need to check them if disabled // next handlers are all for FreeLook, so we don't need to check them if disabled
if (!g_Config.bFreeLook) if (!g_Config.bFreeLook)
{ {

31
Source/Core/DolphinWX/X11Utils.cpp
View File

@ -24,37 +24,6 @@ extern char **environ;
namespace X11Utils namespace X11Utils
{ {
void SendButtonEvent(Display *dpy, int button, int x, int y, bool pressed)
{
XEvent event;
Window win = (Window)Core::GetWindowHandle();
// Init X event structure for mouse button press event
event.xbutton.type = pressed ? ButtonPress : ButtonRelease;
event.xbutton.x = x;
event.xbutton.y = y;
event.xbutton.button = button;
// Send the event
if (!XSendEvent(dpy, win, False, False, &event))
ERROR_LOG(VIDEO, "Failed to send mouse button event to the emulator window.");
}
void SendMotionEvent(Display *dpy, int x, int y)
{
XEvent event;
Window win = (Window)Core::GetWindowHandle();
// Init X event structure for mouse motion
event.xmotion.type = MotionNotify;
event.xmotion.x = x;
event.xmotion.y = y;
// Send the event
if (!XSendEvent(dpy, win, False, False, &event))
ERROR_LOG(VIDEO, "Failed to send mouse button event to the emulator window.");
}
void EWMH_Fullscreen(Display *dpy, int action) void EWMH_Fullscreen(Display *dpy, int action)
{ {
_assert_(action == _NET_WM_STATE_REMOVE || _assert_(action == _NET_WM_STATE_REMOVE ||

2
Source/Core/DolphinWX/X11Utils.h
View File

@ -34,8 +34,6 @@
namespace X11Utils namespace X11Utils
{ {
void SendButtonEvent(Display *dpy, int button, int x, int y, bool pressed);
void SendMotionEvent(Display *dpy, int x, int y);
void EWMH_Fullscreen(Display *dpy, int action); void EWMH_Fullscreen(Display *dpy, int action);
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
Window XWindowFromHandle(void *Handle); Window XWindowFromHandle(void *Handle);