diff options
author | wm4 <wm4@nowhere> | 2017-08-15 20:32:44 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-08-15 20:32:44 +0200 |
commit | 6694048272619b7f91d161c040b818ff63e65279 (patch) | |
tree | 1f77460e4593f9682a25d6a334b311ceff4ff37c /video/out/x11_common.h | |
parent | 34ab0386cb1f28197ca11e90cd0236e352083758 (diff) | |
download | mpv-6694048272619b7f91d161c040b818ff63e65279.tar.bz2 mpv-6694048272619b7f91d161c040b818ff63e65279.tar.xz |
x11: use xdg-screensaver suspend/resume
If it doesn't work this time, I'll remove all X11 screensaver code.
Fixes #4763.
Diffstat (limited to 'video/out/x11_common.h')
-rw-r--r-- | video/out/x11_common.h | 11 |
1 files changed, 5 insertions, 6 deletions
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 <X11/Xlib.h> #include <X11/Xutil.h> -#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; |