Commit 9226863d authored by Ilkka Ollakka's avatar Ilkka Ollakka

revert changes regarding x11 vout from commit 8689e8be

This partly reverts commit 8689e8be.
Didn't meant to include this change in commit.
parent a45ba22e
...@@ -2261,7 +2261,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) ...@@ -2261,7 +2261,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
EnablePixelDoubling( p_vout ); EnablePixelDoubling( p_vout );
#endif #endif
#if 0
/* Activate the window (give it the focus) */ /* Activate the window (give it the focus) */
XClientMessageEvent event; XClientMessageEvent event;
...@@ -2283,7 +2282,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) ...@@ -2283,7 +2282,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
DefaultRootWindow( p_vout->p_sys->p_display ), DefaultRootWindow( p_vout->p_sys->p_display ),
False, SubstructureRedirectMask, False, SubstructureRedirectMask,
(XEvent*)&event ); (XEvent*)&event );
#endif
} }
else else
{ {
...@@ -2309,7 +2307,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) ...@@ -2309,7 +2307,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
* window has already been mapped because the XMapWindow() request * window has already been mapped because the XMapWindow() request
* has not necessarily been sent directly to our window (remember, * has not necessarily been sent directly to our window (remember,
* the call is first redirected to the window manager) */ * the call is first redirected to the window manager) */
#if 0
do do
{ {
XWindowEvent( p_vout->p_sys->p_display, XWindowEvent( p_vout->p_sys->p_display,
...@@ -2323,9 +2320,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) ...@@ -2323,9 +2320,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
p_vout->p_sys->p_win->base_window, p_vout->p_sys->p_win->base_window,
RevertToParent, RevertToParent,
CurrentTime); CurrentTime);
#else
XSync( p_vout->p_sys->p_display, False );
#endif
/* signal that the size needs to be updated */ /* signal that the size needs to be updated */
p_vout->i_changes |= VOUT_SIZE_CHANGE; p_vout->i_changes |= VOUT_SIZE_CHANGE;
......
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