[vlc-devel] commit: revert changes regarding x11 vout from commit 8689e8be211fe01376316a99fefb8c908263f97e (Ilkka Ollakka )
git version control
git at videolan.org
Sun Oct 12 14:33:52 CEST 2008
vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Oct 12 15:31:52 2008 +0300| [9226863d629c0ef4d65dbdefc0c7949522d979e4] | committer: Ilkka Ollakka
revert changes regarding x11 vout from commit 8689e8be211fe01376316a99fefb8c908263f97e
This partly reverts commit 8689e8be211fe01376316a99fefb8c908263f97e.
Didn't meant to include this change in commit.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9226863d629c0ef4d65dbdefc0c7949522d979e4
---
modules/video_output/x11/xcommon.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 162e00d..28f2ddc 100644
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -2261,7 +2261,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
EnablePixelDoubling( p_vout );
#endif
-#if 0
/* Activate the window (give it the focus) */
XClientMessageEvent event;
@@ -2283,7 +2282,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
DefaultRootWindow( p_vout->p_sys->p_display ),
False, SubstructureRedirectMask,
(XEvent*)&event );
-#endif
}
else
{
@@ -2309,7 +2307,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
* window has already been mapped because the XMapWindow() request
* has not necessarily been sent directly to our window (remember,
* the call is first redirected to the window manager) */
-#if 0
do
{
XWindowEvent( p_vout->p_sys->p_display,
@@ -2323,9 +2320,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
p_vout->p_sys->p_win->base_window,
RevertToParent,
CurrentTime);
-#else
- XSync( p_vout->p_sys->p_display, False );
-#endif
/* signal that the size needs to be updated */
p_vout->i_changes |= VOUT_SIZE_CHANGE;
More information about the vlc-devel
mailing list