vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Jul 11 13:59:29 2010 +0300| [6cd86bc29ae431131543f659ae83b7a760c7455a] | committer: Rémi Denis-Courmont
XCB: reset the X11 screen saver when displaying a picture (cherry picked from commit 48be35499d7545a31a160c7578ffa073f761e814) > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=6cd86bc29ae431131543f659ae83b7a760c7455a --- modules/video_output/xcb/glx.c | 3 +++ modules/video_output/xcb/x11.c | 2 ++ modules/video_output/xcb/xvideo.c | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c index 46f8a90..43e7227 100644 --- a/modules/video_output/xcb/glx.c +++ b/modules/video_output/xcb/glx.c @@ -468,8 +468,11 @@ static void PictureRender (vout_display_t *vd, picture_t *pic) static void PictureDisplay (vout_display_t *vd, picture_t *pic) { vout_display_sys_t *sys = vd->sys; + xcb_connection_t *conn = XGetXCBConnection (sys->display); + xcb_force_screen_saver (conn, XCB_SCREEN_SAVER_RESET); vout_display_opengl_Display (&sys->vgl, &vd->source); + xcb_flush (conn); picture_Release (pic); } diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c index 8ec9232..3642c7c 100644 --- a/modules/video_output/xcb/x11.c +++ b/modules/video_output/xcb/x11.c @@ -430,6 +430,8 @@ static void Display (vout_display_t *vd, picture_t *pic) if (!p_sys->visible) goto out; + xcb_force_screen_saver (p_sys->conn, XCB_SCREEN_SAVER_RESET); + if (segment != 0) ck = xcb_shm_put_image_checked (p_sys->conn, p_sys->window, p_sys->gc, /* real width */ pic->p->i_pitch / pic->p->i_pixel_pitch, diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c index 5582427..e7386e6 100644 --- a/modules/video_output/xcb/xvideo.c +++ b/modules/video_output/xcb/xvideo.c @@ -675,6 +675,8 @@ static void Display (vout_display_t *vd, picture_t *pic) if (!p_sys->visible) goto out; + xcb_force_screen_saver (p_sys->conn, XCB_SCREEN_SAVER_RESET); + if (segment) ck = xcb_xv_shm_put_image_checked (p_sys->conn, p_sys->port, p_sys->window, p_sys->gc, segment, p_sys->id, 0, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
