mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-15 23:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11: Only call out to xdg-screensaver when D-Bus failed

Browse Source
This commit is contained in:
Bastien Nocera 2016-09-16 13:03:48 +02:00
parent a061b4a801
commit 5afdd35e54
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/common/x11_common.c
View File

@ -182,10 +182,12 @@ static void dbus_screensaver_uninhibit(void)
dbus_screensaver_cookie = 0; dbus_screensaver_cookie = 0;
} }
void x11_suspend_screensaver_dbus(bool enable) /* Returns false when fallback should be attempted */
bool x11_suspend_screensaver_dbus(bool enable)
{ {
if (enable) dbus_screensaver_inhibit(); if (enable) return dbus_screensaver_inhibit();
if (!enable) dbus_screensaver_uninhibit(); dbus_screensaver_uninhibit();
return false;
} }
#endif #endif
@ -346,10 +348,11 @@ void x11_suspend_screensaver_xdg_screensaver(Window wnd, bool enable)
void x11_suspend_screensaver(Window wnd, bool enable) void x11_suspend_screensaver(Window wnd, bool enable)
{ {
x11_suspend_screensaver_xdg_screensaver(wnd, enable);
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
x11_suspend_screensaver_dbus(enable); /* Fall-through */
if (!x11_suspend_screensaver_dbus(enable))
#endif #endif
x11_suspend_screensaver_xdg_screensaver(wnd, enable);
} }
static bool get_video_mode(Display *dpy, unsigned width, unsigned height, static bool get_video_mode(Display *dpy, unsigned width, unsigned height,