summaryrefslogtreecommitdiffstats
path: root/video/out/x11_common.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-07-20 20:52:08 +0200
committerwm4 <wm4@nowhere>2016-07-20 20:52:08 +0200
commitfde784129f4b94b6fa8b2293127c41dc140b7d3a (patch)
tree423e4cfdd30f54f64de28a7e4957db7b23d764c0 /video/out/x11_common.h
parentbd9c0a10e577e7f839aabc27af6e186a9ba0cdaa (diff)
downloadmpv-fde784129f4b94b6fa8b2293127c41dc140b7d3a.tar.bz2
mpv-fde784129f4b94b6fa8b2293127c41dc140b7d3a.tar.xz
x11: stop using vo.event_fd
Instead let it do its own event loop wakeup handling.
Diffstat (limited to 'video/out/x11_common.h')
-rw-r--r--video/out/x11_common.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index 67e5ac1f0b..d861b32d1c 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -45,6 +45,8 @@ struct vo_x11_state {
struct mp_log *log;
struct input_ctx *input_ctx;
Display *display;
+ int event_fd;
+ int wakeup_pipe[2];
Window window;
Window rootwin;
Window parent; // embedded in this foreign window
@@ -132,6 +134,8 @@ bool vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis,
const char *classname);
void vo_x11_config_vo_window(struct vo *vo);
int vo_x11_control(struct vo *vo, int *events, int request, void *arg);
+void vo_x11_wakeup(struct vo *vo);
+void vo_x11_wait_events(struct vo *vo, int64_t until_time_us);
void vo_x11_silence_xlib(int dir);