summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-01 11:17:56 +0100
committerwm4 <wm4@nowhere>2013-03-01 11:17:56 +0100
commitfdc1560a0ed31f0c275c47ac8cb7521c0c636ddf (patch)
tree7b39076555227f4cd4d16396a08267c9b47f06da /video
parent9d8bb0fbf62f3113c2a522f711addea9b0fe9797 (diff)
downloadmpv-fdc1560a0ed31f0c275c47ac8cb7521c0c636ddf.tar.bz2
mpv-fdc1560a0ed31f0c275c47ac8cb7521c0c636ddf.tar.xz
core: move X11 specific code to x11_common.c
Nothing changes, because vo_check_events() is called at the same place anyway.
Diffstat (limited to 'video')
-rw-r--r--video/out/x11_common.c5
-rw-r--r--video/out/x11_common.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 0514e88fef..8ad9be3dc9 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -128,6 +128,7 @@ typedef struct
static void vo_x11_update_geometry(struct vo *vo, bool update_pos);
static int vo_x11_get_fs_type(struct vo *vo);
+static void xscreensaver_heartbeat(struct vo_x11_state *x11);
static void saver_on(struct vo_x11_state *x11);
static void saver_off(struct vo_x11_state *x11);
static void vo_x11_selectinput_witherr(Display *display, Window w,
@@ -689,6 +690,8 @@ int vo_x11_check_events(struct vo *vo)
x11->mouse_waiting_hide = 0;
}
+ xscreensaver_heartbeat(vo->x11);
+
if (WinID > 0)
ret |= check_resize(vo);
while (XPending(display)) {
@@ -1359,7 +1362,7 @@ void vo_x11_border(struct vo *vo)
vo_x11_decoration(vo, vo_border && !vo_fs);
}
-void xscreensaver_heartbeat(struct vo_x11_state *x11)
+static void xscreensaver_heartbeat(struct vo_x11_state *x11)
{
unsigned int time = GetTimerMS();
diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index 87067fc2a6..57db73b847 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -134,6 +134,4 @@ void vo_x11_update_screeninfo(struct vo *vo);
double vo_x11_vm_get_fps(struct vo *vo);
-void xscreensaver_heartbeat(struct vo_x11_state *x11);
-
#endif /* MPLAYER_X11_COMMON_H */