Have the ability to disable screensaver due to Nvidia + Displayport can cause annoying flickering

Bring up to standards guidelines and also support Windows

Switch this around...
This commit is contained in:
Ryan Houdek
2011-08-25 14:44:13 -05:00
committed by Shawn Hoffman
parent 7737b2cef1
commit 62e790f109
7 changed files with 13 additions and 6 deletions

View File

@ -146,7 +146,8 @@ void X11_MainLoop()
Window win = (Window)Core::GetWindowHandle();
XSelectInput(dpy, win, KeyPressMask | FocusChangeMask);
X11Utils::InhibitScreensaver(dpy, win, true);
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
X11Utils::InhibitScreensaver(dpy, win, true);
#if defined(HAVE_XRANDR) && HAVE_XRANDR
X11Utils::XRRConfiguration *XRRConfig = new X11Utils::XRRConfiguration(dpy, win);
@ -258,8 +259,8 @@ void X11_MainLoop()
#if defined(HAVE_XRANDR) && HAVE_XRANDR
delete XRRConfig;
#endif
X11Utils::InhibitScreensaver(dpy, win, false);
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
X11Utils::InhibitScreensaver(dpy, win, false);
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
XFreeCursor(dpy, blankCursor);