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

Merge pull request #9492 from nolange/fix_norandr_build

Browse Source 
Cleanup X11 and XRANDR Macros
This commit is contained in:
Léo Lam
2021-03-01 11:36:39 +01:00
committed by GitHub
parent 26f0bf8f34 d4b293e969
commit 858f00b641
10 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/DolphinNoGUI/PlatformX11.cpp
View File

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