RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-22 06:42:03 +00:00
Code Issues Releases Wiki Activity

x11: never forcefully terminate xdg-screensaver process

Browse Source 
It sometimes happens on exit, and it's probably a bad idea. If the
process hangs on exit (possibly due to stupid hardcoded timeouts it's
doing), mpv will also hang now, unfortunately.
This commit is contained in:
wm4 2015-05-18 22:25:59 +02:00
parent 0d020c5c46
commit be9bf4cc7c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
video/out/x11_common.c
View File

@ -483,13 +483,11 @@ static void *screensaver_thread(void *arg)
// don't queue multiple wakeups
while (!sem_trywait(&x11->screensaver_sem)) {}
if (mp_cancel_test(x11->screensaver_terminate))
if (atomic_load(&x11->screensaver_terminate))
break;
char *args[] = {"xdg-screensaver", "reset", NULL};
if (mp_subprocess(args, x11->screensaver_terminate, NULL, NULL,
NULL, &(char*){0}))
{
if (mp_subprocess(args, NULL, NULL, NULL, NULL, &(char*){0})) {
MP_WARN(x11, "Disabling screensaver failed.\n");
break;
}
@ -515,13 +513,12 @@ int vo_x11_init(struct vo *vo)
};
vo->x11 = x11;
x11->screensaver_terminate = mp_cancel_new(x11);
sem_init(&x11->screensaver_sem, 0, 0);
if (pthread_create(&x11->screensaver_thread, NULL, screensaver_thread, x11)) {
x11->screensaver_terminate = NULL;
sem_destroy(&x11->screensaver_sem);
goto error;
}
x11->screensaver_thread_running = true;
x11_error_output = x11->log;
XSetErrorHandler(x11_errorhandler);
@ -731,8 +728,8 @@ void vo_x11_uninit(struct vo *vo)
XCloseDisplay(x11->display);
}
if (x11->screensaver_terminate) {
mp_cancel_trigger(x11->screensaver_terminate);
if (x11->screensaver_thread_running) {
atomic_store(&x11->screensaver_terminate, true);
sem_post(&x11->screensaver_sem);
pthread_join(x11->screensaver_thread, NULL);
sem_destroy(&x11->screensaver_sem);

4
video/out/x11_common.h
View File

@ -24,6 +24,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "osdep/atomics.h"
#include "osdep/semaphore.h"
#include "common/common.h"
@ -61,8 +62,9 @@ struct vo_x11_state {
bool dpms_touched;
double screensaver_time_last;
pthread_t screensaver_thread;
bool screensaver_thread_running;
sem_t screensaver_sem;
struct mp_cancel *screensaver_terminate;
atomic_bool screensaver_terminate;
XIM xim;
XIC xic;