Commit c41b9606 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

window: handle fullscreen state at initialization

parent d2d4277c
...@@ -65,12 +65,13 @@ enum { ...@@ -65,12 +65,13 @@ enum {
}; };
typedef struct vout_window_cfg_t { typedef struct vout_window_cfg_t {
/* If true, a standalone window is requested */
bool is_standalone;
/* Window handle type */ /* Window handle type */
unsigned type; unsigned type;
/* If true, a standalone window is requested */
bool is_standalone;
bool is_fullscreen;
#ifdef __APPLE__ #ifdef __APPLE__
/* Window position hint */ /* Window position hint */
int x; int x;
......
...@@ -87,9 +87,9 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg) ...@@ -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->type = VOUT_WINDOW_TYPE_NSOBJECT;
p_wnd->control = WindowControl; 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) static int WindowControl(vout_window_t *p_wnd, int i_query, va_list args)
......
...@@ -130,6 +130,7 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg) ...@@ -130,6 +130,7 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
p_wnd->control = WindowControl; p_wnd->control = WindowControl;
} }
vout_window_SetFullScreen(p_wnd, cfg->is_fullscreen);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -713,6 +713,7 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg ) ...@@ -713,6 +713,7 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
p_wnd->control = WindowControl; p_wnd->control = WindowControl;
p_wnd->sys = (vout_window_sys_t*)p_mi; p_wnd->sys = (vout_window_sys_t*)p_mi;
emit p_mi->askVideoSetFullScreen( cfg->is_fullscreen );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -408,6 +408,7 @@ static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg ) ...@@ -408,6 +408,7 @@ static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
vout_window_SetFullScreen( pWnd, cfg->is_fullscreen );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -362,6 +362,7 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg) ...@@ -362,6 +362,7 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
goto error; goto error;
vout_window_ReportSize(wnd, cfg->width, cfg->height); vout_window_ReportSize(wnd, cfg->width, cfg->height);
vout_window_SetFullScreen(wnd, cfg->is_fullscreen);
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
......
...@@ -348,6 +348,7 @@ static int Open (vout_window_t *wnd, const vout_window_cfg_t *cfg) ...@@ -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) */ xcb_flush (conn); /* Make sure map_window is sent (should be useless) */
vout_window_SetFullScreen (wnd, cfg->is_fullscreen);
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment