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

UICommon: Avoid including Xrandr.h

Browse Source 
Xlib has really terrible headers that declare non-namespaced
macros and typedefs for common words.

Just wasted 10 minutes trying to figure out why a unit test failed
to build before I remembered it was Xrandr.h conflicting with our
enum class members again.

To fix the issue, this removes the Display* parameter from the
EnableScreensaver function (which was unused) so we don't have
to include Xrandr.h anymore.
This commit is contained in:
Léo Lam
2018-04-14 16:48:49 +02:00
parent 62269572e4
commit 2f22c76db1
7 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/UICommon/UICommon.cpp
View File

@ -338,7 +338,7 @@ bool TriggerSTMPowerEvent()
}
#if defined(HAVE_XRANDR) && HAVE_X11
void EnableScreenSaver(Display* display, Window win, bool enable)
void EnableScreenSaver(Window win, bool enable)
#else
void EnableScreenSaver(bool enable)
#endif
@ -349,7 +349,7 @@ void EnableScreenSaver(bool enable)
#if defined(HAVE_X11) && HAVE_X11
if (SConfig::GetInstance().bDisableScreenSaver)
{
X11Utils::InhibitScreensaver(display, win, !enable);
X11Utils::InhibitScreensaver(win, !enable);
}
#endif

6
Source/Core/UICommon/UICommon.h
View File

@ -8,17 +8,13 @@
#include "Common/CommonTypes.h"
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#include <X11/extensions/Xrandr.h>
#endif
namespace UICommon
{
void Init();
void Shutdown();
#if defined(HAVE_XRANDR) && HAVE_XRANDR
void EnableScreenSaver(Display* display, Window win, bool enable);
void EnableScreenSaver(unsigned long win, bool enable);
#else
void EnableScreenSaver(bool enable);
#endif

2
Source/Core/UICommon/X11Utils.cpp
View File

@ -43,7 +43,7 @@ bool ToggleFullscreen(Display* dpy, Window win)
return true;
}
void InhibitScreensaver(Display* dpy, Window win, bool suspend)
void InhibitScreensaver(Window win, bool suspend)
{
char id[11];
snprintf(id, sizeof(id), "0x%lx", win);

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

@ -24,7 +24,7 @@ bool ToggleFullscreen(Display* dpy, Window win);
Window XWindowFromHandle(void* Handle);
Display* XDisplayFromHandle(void* Handle);
void InhibitScreensaver(Display* dpy, Window win, bool suspend);
void InhibitScreensaver(Window win, bool suspend);
#if defined(HAVE_XRANDR) && HAVE_XRANDR
class XRRConfiguration