window: handle fullscreen state at initialization

croepha · Oct 29, 2015 · c41b960 · c41b960
1 parent d2d4277
commit c41b960
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
@@ -65,12 +65,13 @@ enum {
 };
 
 typedef struct vout_window_cfg_t {
-    /* If true, a standalone window is requested */
-    bool is_standalone;
-
     /* Window handle type */
     unsigned type;
 
+    /* If true, a standalone window is requested */
+    bool is_standalone;
+    bool is_fullscreen;
+
 #ifdef __APPLE__
     /* Window position hint */
     int x;

diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
@@ -87,9 +87,9 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
 
         p_wnd->type = VOUT_WINDOW_TYPE_NSOBJECT;
         p_wnd->control = WindowControl;
-
-        return VLC_SUCCESS;
     }
+    vout_window_SetFullScreen(p_wnd, cfg->is_fullscreen);
+    return VLC_SUCCESS;
 }
 
 static int WindowControl(vout_window_t *p_wnd, int i_query, va_list args)

diff --git a/modules/gui/minimal_macosx/intf.m b/modules/gui/minimal_macosx/intf.m
@@ -130,6 +130,7 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
         p_wnd->control = WindowControl;
     }
 
+    vout_window_SetFullScreen(p_wnd, cfg->is_fullscreen);
     return VLC_SUCCESS;
 }
 

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
@@ -713,6 +713,7 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
 
     p_wnd->control = WindowControl;
     p_wnd->sys = (vout_window_sys_t*)p_mi;
+    emit p_mi->askVideoSetFullScreen( cfg->is_fullscreen );
     return VLC_SUCCESS;
 }
 

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
@@ -408,6 +408,7 @@ static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
         return VLC_EGENERIC;
     }
 
+    vout_window_SetFullScreen( pWnd, cfg->is_fullscreen );
     return VLC_SUCCESS;
 }
 

diff --git a/modules/video_output/wayland/shell_surface.c b/modules/video_output/wayland/shell_surface.c
@@ -362,6 +362,7 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
         goto error;
 
     vout_window_ReportSize(wnd, cfg->width, cfg->height);
+    vout_window_SetFullScreen(wnd, cfg->is_fullscreen);
     return VLC_SUCCESS;
 
 error:

diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
@@ -348,6 +348,7 @@ static int Open (vout_window_t *wnd, const vout_window_cfg_t *cfg)
     }
 
     xcb_flush (conn); /* Make sure map_window is sent (should be useless) */
+    vout_window_SetFullScreen (wnd, cfg->is_fullscreen);
     return VLC_SUCCESS;
 
 error:
-Original file line number
+Diff line change
@@ Expand Up @@
             p_wnd->control = WindowControl;
         }
+        vout_window_SetFullScreen(p_wnd, cfg->is_fullscreen);
         return VLC_SUCCESS;
     }
@@ Expand Down @@