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

Revert "Don't sleep in the event thread"

This commit is contained in:
Ryan Houdek 2014-09-05 00:50:40 -05:00
parent a9a6270982
commit 30fef298bb
2 changed files with 71 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/GLInterface/X11_Util.cpp
View File

@ -57,6 +57,8 @@ void cX11Window::XEventThread()
while (win) while (win)
{ {
XEvent event; XEvent event;
for (int num_events = XPending(dpy); num_events > 0; num_events--)
{
XNextEvent(dpy, &event); XNextEvent(dpy, &event);
switch (event.type) switch (event.type)
{ {
@ -68,4 +70,6 @@ void cX11Window::XEventThread()
break; break;
} }
} }
Common::SleepCurrentThread(20);
}
} }

4
Source/Core/DolphinWX/MainNoGUI.cpp
View File

@ -199,6 +199,8 @@ class PlatformX11 : public Platform
{ {
XEvent event; XEvent event;
KeySym key; KeySym key;
for (int num_events = XPending(dpy); num_events > 0; num_events--)
{
XNextEvent(dpy, &event); XNextEvent(dpy, &event);
switch (event.type) switch (event.type)
{ {
@ -263,6 +265,7 @@ class PlatformX11 : public Platform
running = false; running = false;
break; break;
} }
}
if (!fullscreen) if (!fullscreen)
{ {
Window winDummy; Window winDummy;
@ -274,6 +277,7 @@ class PlatformX11 : public Platform
(unsigned int *)&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight, (unsigned int *)&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight,
&borderDummy, &depthDummy); &borderDummy, &depthDummy);
} }
usleep(100000);
} }
} }