Merge pull request #9492 from nolange/fix_norandr_build

Cleanup X11 and XRANDR Macros

CMakeLists.txt

@@ -440,8 +440,6 @@ if(ENABLE_X11)
     check_lib(XRANDR xrandr Xrandr)
     if(XRANDR_FOUND)
       add_definitions(-DHAVE_XRANDR=1)
-    else()
-      add_definitions(-DHAVE_XRANDR=0)
     endif()
     pkg_check_modules(X11_INPUT REQUIRED xi>=1.5.0)
     message(STATUS "X11 support enabled")

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();

Source/Core/DolphinQt/MainWindow.cpp

@@ -119,7 +119,7 @@
 #include "VideoCommon/NetPlayChatUI.h"
 #include "VideoCommon/VideoConfig.h"
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_XRANDR
 #include "UICommon/X11Utils.h"
 // This #define within X11/X.h conflicts with our WiimoteSource enum.
 #undef None
@@ -1174,7 +1174,7 @@ void MainWindow::ShowGraphicsWindow()
 {
   if (!m_graphics_window)
   {
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_XRANDR
     if (GetWindowSystemType() == WindowSystemType::X11)
     {
       m_xrr_config = std::make_unique<X11Utils::XRRConfiguration>(
@@ -1465,7 +1465,7 @@ void MainWindow::UpdateScreenSaverInhibition()
 
   m_is_screensaver_inhibited = inhibit;
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_X11
   if (GetWindowSystemType() == WindowSystemType::X11)
     UICommon::InhibitScreenSaver(winId(), inhibit);
 #else

Source/Core/DolphinQt/MainWindow.h

@@ -191,7 +191,7 @@ private:
   void dropEvent(QDropEvent* event) override;
   QSize sizeHint() const override;
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_XRANDR
   std::unique_ptr<X11Utils::XRRConfiguration> m_xrr_config;
 #endif
 

Source/Core/InputCommon/ControllerInterface/ControllerInterface.h

@@ -18,7 +18,7 @@
 #ifdef _WIN32
 #define CIFACE_USE_WIN32
 #endif
-#if defined(HAVE_X11) && HAVE_X11
+#ifdef HAVE_X11
 #define CIFACE_USE_XLIB
 #endif
 #if defined(__APPLE__)

Source/Core/UICommon/UICommon.cpp

@@ -39,7 +39,7 @@
 #include "UICommon/UICommon.h"
 #include "UICommon/USBUtils.h"
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_X11
 #include "UICommon/X11Utils.h"
 #endif
 
@@ -394,7 +394,7 @@ bool TriggerSTMPowerEvent()
   return true;
 }
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_X11
 void InhibitScreenSaver(Window win, bool inhibit)
 #else
 void InhibitScreenSaver(bool inhibit)
@@ -403,7 +403,7 @@ void InhibitScreenSaver(bool inhibit)
   // Inhibit the screensaver. Depending on the operating system this may also
   // disable low-power states and/or screen dimming.
 
-#if defined(HAVE_X11) && HAVE_X11
+#ifdef HAVE_X11
   X11Utils::InhibitScreensaver(win, inhibit);
 #endif
 

Source/Core/UICommon/UICommon.h

@@ -13,7 +13,7 @@ namespace UICommon
 void Init();
 void Shutdown();
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_X11
 void InhibitScreenSaver(unsigned long win, bool enable);
 #else
 void InhibitScreenSaver(bool enable);

Source/Core/UICommon/VideoUtils.cpp

@@ -11,7 +11,7 @@
 #include <Windows.h>
 #endif
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_XRANDR
 #include "UICommon/X11Utils.h"
 #endif
 

Source/Core/UICommon/X11Utils.cpp

@@ -64,7 +64,7 @@ void InhibitScreensaver(Window win, bool suspend)
   }
 }
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_XRANDR
 XRRConfiguration::XRRConfiguration(Display* _dpy, Window _win)
     : dpy(_dpy), win(_win), screenResources(nullptr), outputInfo(nullptr), crtcInfo(nullptr),
       fullMode(0), fs_fb_width(0), fs_fb_height(0), fs_fb_width_mm(0), fs_fb_height_mm(0),

Source/Core/UICommon/X11Utils.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_XRANDR
 #include <X11/extensions/Xrandr.h>
 #endif
 #include <X11/Xlib.h>
@@ -26,7 +26,7 @@ Display* XDisplayFromHandle(void* Handle);
 
 void InhibitScreensaver(Window win, bool suspend);
 
-#if defined(HAVE_XRANDR) && HAVE_XRANDR
+#ifdef HAVE_XRANDR
 class XRRConfiguration
 {
 public: