From e5d23eb8038b042e92fb057b0f55b1ecbf549890 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Thu, 20 May 2010 20:49:37 +0200 Subject: [PATCH] Fixed initial fullscreen support in XCB vout display modules. --- modules/video_output/xcb/glx.c | 7 +++++-- modules/video_output/xcb/x11.c | 7 +++++-- modules/video_output/xcb/xvideo.c | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c index 2d4b4dc3ba..4be6d0df22 100644 --- a/modules/video_output/xcb/glx.c +++ b/modules/video_output/xcb/glx.c @@ -388,8 +388,11 @@ static int Open (vlc_object_t *obj) vd->manage = Manage; /* */ - vout_display_SendEventFullscreen (vd, false); - vout_display_SendEventDisplaySize (vd, width, height, false); + bool is_fullscreen = vd->cfg->is_fullscreen; + if (is_fullscreen && vout_window_SetFullScreen (sys->embed, true)) + is_fullscreen = false; + vout_display_SendEventFullscreen (vd, is_fullscreen); + vout_display_SendEventDisplaySize (vd, width, height, is_fullscreen); return VLC_SUCCESS; diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c index 8bc8a87d61..225594bc7c 100644 --- a/modules/video_output/xcb/x11.c +++ b/modules/video_output/xcb/x11.c @@ -295,8 +295,11 @@ static int Open (vlc_object_t *obj) vd->manage = Manage; /* */ - vout_display_SendEventFullscreen (vd, false); - vout_display_SendEventDisplaySize (vd, width, height, false); + bool is_fullscreen = vd->cfg->is_fullscreen; + if (is_fullscreen && vout_window_SetFullScreen (p_sys->embed, true)) + is_fullscreen = false; + vout_display_SendEventFullscreen (vd, is_fullscreen); + vout_display_SendEventDisplaySize (vd, width, height, is_fullscreen); return VLC_SUCCESS; diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c index 9335fba49f..0fe9b13712 100644 --- a/modules/video_output/xcb/xvideo.c +++ b/modules/video_output/xcb/xvideo.c @@ -532,10 +532,13 @@ static int Open (vlc_object_t *obj) vd->manage = Manage; /* */ - vout_display_SendEventFullscreen (vd, false); + bool is_fullscreen = vd->cfg->is_fullscreen; + if (is_fullscreen && vout_window_SetFullScreen (p_sys->embed, true)) + is_fullscreen = false; + vout_display_SendEventFullscreen (vd, is_fullscreen); unsigned width, height; if (!GetWindowSize (p_sys->embed, conn, &width, &height)) - vout_display_SendEventDisplaySize (vd, width, height, false); + vout_display_SendEventDisplaySize (vd, width, height, is_fullscreen); return VLC_SUCCESS; -- 2.39.2