diff options
| author | Léo Lam <leo@leolam.fr> | 2021-03-01 11:36:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 11:36:39 +0100 |
| commit | 858f00b6418538dcbbc552edecb4bbe152a7fd66 (patch) | |
| tree | 3ac7d7a2d667d6c60971ee33f6313d39bd35764e /Source/Core/DolphinNoGUI | |
| parent | 26f0bf8f34d5fcdeabc4a2a6d21f4a34c5430789 (diff) | |
| parent | d4b293e969341b630340f3d3c35e1c0d3edf4152 (diff) | |
Merge pull request #9492 from nolange/fix_norandr_build
Cleanup X11 and XRANDR Macros
Diffstat (limited to 'Source/Core/DolphinNoGUI')
| -rw-r--r-- | Source/Core/DolphinNoGUI/PlatformX11.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp index 8eb8f2b802..b44620a048 100644 --- a/Source/Core/DolphinNoGUI/PlatformX11.cpp +++ b/Source/Core/DolphinNoGUI/PlatformX11.cpp @@ -18,6 +18,7 @@ #include <X11/Xatom.h> #include <X11/Xlib.h> +#include <X11/Xutil.h> #include <X11/keysym.h> #include "UICommon/X11Utils.h" #include "VideoCommon/RenderBase.h" @@ -47,7 +48,7 @@ private: Display* m_display = nullptr; Window m_window = {}; Cursor m_blank_cursor = None; -#if defined(HAVE_XRANDR) && HAVE_XRANDR +#ifdef HAVE_XRANDR X11Utils::XRRConfiguration* m_xrr_config = nullptr; #endif int m_window_x = Config::Get(Config::MAIN_RENDER_WINDOW_XPOS); @@ -58,7 +59,7 @@ private: PlatformX11::~PlatformX11() { -#if defined(HAVE_XRANDR) && HAVE_XRANDR +#ifdef HAVE_XRANDR delete m_xrr_config; #endif @@ -105,7 +106,7 @@ bool PlatformX11::Init() if (Config::Get(Config::MAIN_DISABLE_SCREENSAVER)) X11Utils::InhibitScreensaver(m_window, true); -#if defined(HAVE_XRANDR) && HAVE_XRANDR +#ifdef HAVE_XRANDR m_xrr_config = new X11Utils::XRRConfiguration(m_display, m_window); #endif @@ -125,7 +126,7 @@ bool PlatformX11::Init() if (Config::Get(Config::MAIN_FULLSCREEN)) { m_window_fullscreen = X11Utils::ToggleFullscreen(m_display, m_window); -#if defined(HAVE_XRANDR) && HAVE_XRANDR +#ifdef HAVE_XRANDR m_xrr_config->ToggleDisplayMode(True); #endif ProcessEvents(); @@ -209,7 +210,7 @@ void PlatformX11::ProcessEvents() { m_window_fullscreen = !m_window_fullscreen; X11Utils::ToggleFullscreen(m_display, m_window); -#if defined(HAVE_XRANDR) && HAVE_XRANDR +#ifdef HAVE_XRANDR m_xrr_config->ToggleDisplayMode(m_window_fullscreen); #endif UpdateWindowPosition(); |