From 6694048272619b7f91d161c040b818ff63e65279 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 15 Aug 2017 20:32:44 +0200 Subject: x11: use xdg-screensaver suspend/resume If it doesn't work this time, I'll remove all X11 screensaver code. Fixes #4763. --- video/out/x11_common.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'video/out/x11_common.h') diff --git a/video/out/x11_common.h b/video/out/x11_common.h index e69640cc64..b2f6336d25 100644 --- a/video/out/x11_common.h +++ b/video/out/x11_common.h @@ -24,9 +24,6 @@ #include #include -#include "osdep/atomic.h" -#include "osdep/semaphore.h" - #include "common/common.h" struct vo; @@ -66,11 +63,13 @@ struct vo_x11_state { bool screensaver_enabled; bool dpms_touched; - double screensaver_time_last; + + long screensaver_thread_window; pthread_t screensaver_thread; + pthread_mutex_t screensaver_thread_lock; + pthread_cond_t screensaver_thread_wakeup; bool screensaver_thread_running; - sem_t screensaver_sem; - atomic_bool screensaver_terminate; + bool screensaver_thread_suspend; XIM xim; XIC xic; -- cgit v1.2.3