]> git.sesse.net Git - vlc/commitdiff
Fixed initial fullscreen support in XCB vout display modules.
authorLaurent Aimar <fenrir@videolan.org>
Thu, 20 May 2010 18:49:37 +0000 (20:49 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Thu, 20 May 2010 21:51:26 +0000 (23:51 +0200)
modules/video_output/xcb/glx.c
modules/video_output/xcb/x11.c
modules/video_output/xcb/xvideo.c

index 2d4b4dc3ba57d95a5a6f2c04d272d3fe5be09949..4be6d0df222210cb2bc736494a5b3c2b6f7ab1a3 100644 (file)
@@ -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;
 
index 8bc8a87d6122c982733e15ef213a884bd55c87b8..225594bc7c00343e11062385760c6e5482f32767 100644 (file)
@@ -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;
 
index 9335fba49f3c85e5e5f55ac08eb9af8872b0322b..0fe9b13712db50dc1a11bfe36d3a2937d4a449c1 100644 (file)
@@ -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;