* ./plugins/dummy/dummy.c: added a CATEGORY_HINT to the config.

* ./plugins/x11/xcommon.c: small change to the ToggleFullscreen routine
to avoid a flickering during the switch.

diff --git a/plugins/dummy/dummy.c b/plugins/dummy/dummy.c
index 6acf9206539719b8264021539a8544bcf48cb152..471a3f28ce225fdd5da588c695b56d47bab301ea 100644 (file)
--- a/plugins/dummy/dummy.c
+++ b/plugins/dummy/dummy.c
@@ -2,7 +2,7 @@
  * dummy.c : dummy plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: dummy.c,v 1.19 2002/05/20 19:02:22 sam Exp $
+ * $Id: dummy.c,v 1.20 2002/05/29 10:08:03 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -48,6 +48,7 @@ void _M( intf_getfunctions )  ( function_list_t * p_function_list );
     "efficient one.")
 
 MODULE_CONFIG_START
+ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
 ADD_STRING  ( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT )
 MODULE_CONFIG_STOP
 

diff --git a/plugins/x11/xcommon.c b/plugins/x11/xcommon.c
index 4de03a751727072d5caa2c789affd974adf30a56..3bd30502ba28fc1c064a98ec40fe9d9e3bf6b7c4 100644 (file)
--- a/plugins/x11/xcommon.c
+++ b/plugins/x11/xcommon.c
@@ -2,7 +2,7 @@
  * xcommon.c: Functions common to the X11 and XVideo plugins
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: xcommon.c,v 1.34 2002/05/20 22:30:19 sam Exp $
+ * $Id: xcommon.c,v 1.35 2002/05/29 10:08:03 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -1540,13 +1540,20 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
                                  &attributes);
     }
 
-    /* We need to unmap and remap the window if we want the window 
-     * manager to take our changes into effect */
+    /* We need to reparent the window if we want the window 
+     * manager to take our changes into effect. We also resize the window
+     * twice to avoid an annoying flickering. */
+    if( !p_vout->b_fullscreen )
+        XMoveResizeWindow( p_vout->p_sys->p_display,
+                           p_vout->p_sys->window,
+                           i_xpos,
+                           i_ypos,
+                           i_width,
+                           i_height );
     XReparentWindow( p_vout->p_sys->p_display,
                      p_vout->p_sys->window,
                      DefaultRootWindow( p_vout->p_sys->p_display ),
                      0, 0 );
-    XSync( p_vout->p_sys->p_display, True );
     XMoveResizeWindow( p_vout->p_sys->p_display,
                        p_vout->p_sys->window,
                        i_xpos,