summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2013-07-21 01:01:11 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2013-07-21 01:59:40 -0400
commit01ff85506d9e0fca76408c3dea2c72e37fb720ff (patch)
tree53e02f26d566b3ef88c49f20314065d97ac894fc /Source/Core
parentca97b10dda41f5ae6386d7eb1ee4f550156ddb82 (diff)
X11: Don't use a client event as a wrapper for XMoveResizeWindow
Simply configure the window from here
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/FrameTools.cpp6
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp5
-rw-r--r--Source/Core/DolphinWX/Src/X11Utils.cpp20
-rw-r--r--Source/Core/DolphinWX/Src/X11Utils.h2
4 files changed, 4 insertions, 29 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 3b59352585..e04bdde5fc 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -795,8 +795,10 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
}
#if defined(HAVE_X11) && HAVE_X11
wxRect client_rect = m_RenderParent->GetClientRect();
- X11Utils::SendClientEvent(X11Utils::XDisplayFromHandle(GetHandle()),
- "RESIZE", client_rect.x, client_rect.y, client_rect.width, client_rect.height);
+ XMoveResizeWindow(X11Utils::XDisplayFromHandle(GetHandle()),
+ X11Utils::XWindowFromHandle(GetHandle()),
+ client_rect.x, client_rect.y,
+ client_rect.width, client_rect.height);
#endif
m_LogWindow->Refresh();
m_LogWindow->Update();
diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
index f6e678151f..3bfe9fb86f 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
@@ -313,11 +313,6 @@ void cX11Window::XEventThread()
if ((unsigned long) event.xclient.data.l[0] ==
XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False))
Host_Message(WM_USER_STOP);
- if ((unsigned long) event.xclient.data.l[0] ==
- XInternAtom(GLWin.evdpy, "RESIZE", False))
- XMoveResizeWindow(GLWin.evdpy, GLWin.win,
- event.xclient.data.l[1], event.xclient.data.l[2],
- event.xclient.data.l[3], event.xclient.data.l[4]);
break;
default:
break;
diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp
index 9be4d23fbf..4ee0cc63e9 100644
--- a/Source/Core/DolphinWX/Src/X11Utils.cpp
+++ b/Source/Core/DolphinWX/Src/X11Utils.cpp
@@ -32,26 +32,6 @@ extern char **environ;
namespace X11Utils
{
-void SendClientEvent(Display *dpy, const char *message,
- int data1, int data2, int data3, int data4)
-{
- XEvent event;
- Window win = (Window)Core::GetWindowHandle();
-
- // Init X event structure for client message
- event.xclient.type = ClientMessage;
- event.xclient.format = 32;
- event.xclient.data.l[0] = XInternAtom(dpy, message, False);
- event.xclient.data.l[1] = data1;
- event.xclient.data.l[2] = data2;
- event.xclient.data.l[3] = data3;
- event.xclient.data.l[4] = data4;
-
- // Send the event
- if (!XSendEvent(dpy, win, False, False, &event))
- ERROR_LOG(VIDEO, "Failed to send message %s to the emulator window.", message);
-}
-
void SendKeyEvent(Display *dpy, int key)
{
XEvent event;
diff --git a/Source/Core/DolphinWX/Src/X11Utils.h b/Source/Core/DolphinWX/Src/X11Utils.h
index ff4171e249..dd8d888d17 100644
--- a/Source/Core/DolphinWX/Src/X11Utils.h
+++ b/Source/Core/DolphinWX/Src/X11Utils.h
@@ -43,8 +43,6 @@
namespace X11Utils
{
-void SendClientEvent(Display *dpy, const char *message,
- int data1, int data2, int data3, int data4);
void SendKeyEvent(Display *dpy, int key);
void SendButtonEvent(Display *dpy, int button, int x, int y, bool pressed);
void SendMotionEvent(Display *dpy, int x, int y);