mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-21 11:51:48 +02:00
2f22c76db1
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.
54 lines
1.3 KiB
C++
54 lines
1.3 KiB
C++
// Copyright 2010 Dolphin Emulator Project
|
|
// Licensed under GPLv2+
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#if defined(HAVE_XRANDR) && HAVE_XRANDR
|
|
#include <X11/extensions/Xrandr.h>
|
|
#endif
|
|
#include <X11/Xlib.h>
|
|
|
|
// EWMH state actions, see
|
|
// http://freedesktop.org/wiki/Specifications/wm-spec?action=show&redirect=Standards%2Fwm-spec
|
|
#define _NET_WM_STATE_REMOVE 0 // remove/unset property
|
|
#define _NET_WM_STATE_ADD 1 // add/set property
|
|
#define _NET_WM_STATE_TOGGLE 2 // toggle property
|
|
|
|
namespace X11Utils
|
|
{
|
|
bool ToggleFullscreen(Display* dpy, Window win);
|
|
Window XWindowFromHandle(void* Handle);
|
|
Display* XDisplayFromHandle(void* Handle);
|
|
|
|
void InhibitScreensaver(Window win, bool suspend);
|
|
|
|
#if defined(HAVE_XRANDR) && HAVE_XRANDR
|
|
class XRRConfiguration
|
|
{
|
|
public:
|
|
XRRConfiguration(Display* _dpy, Window _win);
|
|
~XRRConfiguration();
|
|
|
|
void Update();
|
|
void ToggleDisplayMode(bool bFullscreen);
|
|
void AddResolutions(std::vector<std::string>& resos);
|
|
|
|
private:
|
|
Display* dpy;
|
|
Window win;
|
|
int screen;
|
|
XRRScreenResources* screenResources;
|
|
XRROutputInfo* outputInfo;
|
|
XRRCrtcInfo* crtcInfo;
|
|
RRMode fullMode;
|
|
int fb_width, fb_height, fb_width_mm, fb_height_mm;
|
|
int fs_fb_width, fs_fb_height, fs_fb_width_mm, fs_fb_height_mm;
|
|
bool bValid;
|
|
bool bIsFullscreen;
|
|
};
|
|
#endif
|
|
}
|