ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Suppress screensaver only if requested by user settings.

This commit is contained in:
Torsten Paul 2016-05-08 19:19:31 +02:00
parent 510c804781
commit 1979ea52d2
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/common/x11_common.c
View File

@ -141,12 +141,15 @@ void x11_set_window_attr(Display *dpy, Window win)
x11_set_window_class(dpy, win); x11_set_window_class(dpy, win);
} }
void x11_suspend_screensaver(Window wnd) void x11_suspend_screensaver(Window wnd, bool enable)
{ {
int ret; int ret;
char cmd[64] = {0}; char cmd[64] = {0};
static bool screensaver_na = false; static bool screensaver_na = false;
if (!enable)
return;
if (screensaver_na) if (screensaver_na)
return; return;

2
gfx/common/x11_common.h
View File

@ -43,7 +43,7 @@ extern unsigned g_x11_screen;
void x11_save_last_used_monitor(Window win); void x11_save_last_used_monitor(Window win);
void x11_show_mouse(Display *dpy, Window win, bool state); void x11_show_mouse(Display *dpy, Window win, bool state);
void x11_windowed_fullscreen(Display *dpy, Window win); void x11_windowed_fullscreen(Display *dpy, Window win);
void x11_suspend_screensaver(Window win); void x11_suspend_screensaver(Window win, bool enable);
bool x11_enter_fullscreen(Display *dpy, unsigned width, bool x11_enter_fullscreen(Display *dpy, unsigned width,
unsigned height, XF86VidModeModeInfo *desktop_mode); unsigned height, XF86VidModeModeInfo *desktop_mode);

2
gfx/drivers/sdl2_gfx.c
View File

@ -569,7 +569,7 @@ static bool sdl2_gfx_suppress_screensaver(void *data, bool enable)
if (video_driver_display_type_get() == RARCH_DISPLAY_X11) if (video_driver_display_type_get() == RARCH_DISPLAY_X11)
{ {
#ifdef HAVE_X11 #ifdef HAVE_X11
x11_suspend_screensaver(video_driver_window_get()); x11_suspend_screensaver(video_driver_window_get(), enable);
#endif #endif
return true; return true;
} }

2
gfx/drivers/sdl_gfx.c
View File

@ -401,7 +401,7 @@ static bool sdl_gfx_suppress_screensaver(void *data, bool enable)
#ifdef HAVE_X11 #ifdef HAVE_X11
if (video_driver_display_type_get() == RARCH_DISPLAY_X11) if (video_driver_display_type_get() == RARCH_DISPLAY_X11)
{ {
x11_suspend_screensaver(video_driver_window_get()); x11_suspend_screensaver(video_driver_window_get(), enable);
return true; return true;
} }
#endif #endif

4
gfx/drivers/xvideo.c
View File

@ -806,10 +806,12 @@ static bool xv_frame(void *data, const void *frame, unsigned width,
static bool xv_suppress_screensaver(void *data, bool enable) static bool xv_suppress_screensaver(void *data, bool enable)
{ {
(void)data;
if (video_driver_display_type_get() != RARCH_DISPLAY_X11) if (video_driver_display_type_get() != RARCH_DISPLAY_X11)
return false; return false;
x11_suspend_screensaver(video_driver_window_get()); x11_suspend_screensaver(video_driver_window_get(), enable);
return true; return true;
} }

4
gfx/drivers_context/x_ctx.c
View File

@ -765,10 +765,12 @@ static void gfx_ctx_x_input_driver(void *data,
static bool gfx_ctx_x_suppress_screensaver(void *data, bool enable) static bool gfx_ctx_x_suppress_screensaver(void *data, bool enable)
{ {
(void)data;
if (video_driver_display_type_get() != RARCH_DISPLAY_X11) if (video_driver_display_type_get() != RARCH_DISPLAY_X11)
return false; return false;
x11_suspend_screensaver(video_driver_window_get()); x11_suspend_screensaver(video_driver_window_get(), enable);
return true; return true;
} }

3
gfx/drivers_context/xegl_ctx.c
View File

@ -444,12 +444,11 @@ static bool gfx_ctx_xegl_has_focus(void *data)
static bool gfx_ctx_xegl_suppress_screensaver(void *data, bool enable) static bool gfx_ctx_xegl_suppress_screensaver(void *data, bool enable)
{ {
(void)data; (void)data;
(void)enable;
if (video_driver_display_type_get() != RARCH_DISPLAY_X11) if (video_driver_display_type_get() != RARCH_DISPLAY_X11)
return false; return false;
x11_suspend_screensaver(video_driver_window_get()); x11_suspend_screensaver(video_driver_window_get(), enable);
return true; return true;
} }