From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 11 Jul 2010 10:59:29 +0000 (+0300)
Subject: XCB: reset the X11 screen saver when displaying a picture
X-Git-Tag: 1.2.0-pre1~5366
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=48be35499d7545a31a160c7578ffa073f761e814;p=vlc

XCB: reset the X11 screen saver when displaying a picture
---

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 6aa89765b0..42ff5cf111 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -466,8 +466,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 ef9ba5ec76..51963dd6f0 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -433,6 +433,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 90097db293..9a0ce12de0 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -685,6 +685,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,