# HG changeset patch
# User pontscho
# Date 1053938057 0
# Node ID f0bcaf5ea6757f26d1868fb43e49cd169b3ad317
# Parent  dcdc6ae3ebafdbab5869e7488c7c95fd004d7c29
From: Michael Joosten <joost@c-lab.de>
PATCH: fullscreen issues with GUI, WM layers, gmplayer plays first file always twice

diff -r dcdc6ae3ebaf -r f0bcaf5ea675 Gui/interface.c
--- a/Gui/interface.c	Mon May 26 06:47:52 2003 +0000
+++ b/Gui/interface.c	Mon May 26 08:34:17 2003 +0000
@@ -1145,6 +1145,7 @@
   }
 
   mplCurr(); // Update filename
+  mplGotoTheNext=1;
 
   if (!enqueue)
     filename=guiIntfStruct.Filename; // Backward compatibility; if file is specified on commandline,
diff -r dcdc6ae3ebaf -r f0bcaf5ea675 Gui/mplayer/play.c
--- a/Gui/mplayer/play.c	Mon May 26 06:47:52 2003 +0000
+++ b/Gui/mplayer/play.c	Mon May 26 08:34:17 2003 +0000
@@ -32,7 +32,7 @@
 extern float rel_seek_secs;
 extern int abs_seek_pos;
 
-static int mplGotoTheNext = 1;
+int mplGotoTheNext = 1;
 
 void mplFullScreen( void )
 {
@@ -57,7 +57,7 @@
   if ( guiIntfStruct.Playing || gtkShowVideoWindow ) wsFullScreen( &appMPlayer.subWindow );
   fullscreen=vo_fs=appMPlayer.subWindow.isFullScreen;
   wsSetLayer( wsDisplay,appMPlayer.mainWindow.WindowID,appMPlayer.subWindow.isFullScreen );
-  wsSetLayer( wsDisplay,appMPlayer.menuWindow.WindowID,appMPlayer.subWindow.isFullScreen );
+  if ( appMPlayer.menuIsPresent ) wsSetLayer( wsDisplay,appMPlayer.menuWindow.WindowID,appMPlayer.subWindow.isFullScreen );
 
  if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
   else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B );
diff -r dcdc6ae3ebaf -r f0bcaf5ea675 Gui/mplayer/play.h
--- a/Gui/mplayer/play.h	Mon May 26 06:47:52 2003 +0000
+++ b/Gui/mplayer/play.h	Mon May 26 08:34:17 2003 +0000
@@ -6,6 +6,8 @@
 
 #include "./mplayer.h"
 
+extern int mplGotoTheNext;
+
 extern void mplEnd( void );
 extern void mplFullScreen( void );
 extern void mplPlay( void );
diff -r dcdc6ae3ebaf -r f0bcaf5ea675 libvo/x11_common.c
--- a/libvo/x11_common.c	Mon May 26 06:47:52 2003 +0000
+++ b/libvo/x11_common.c	Mon May 26 08:34:17 2003 +0000
@@ -783,7 +783,7 @@
   {
     XClientMessageEvent xev;
     
-    if (layer) orig_layer=vo_x11_get_gnome_layer( mDisplay, vo_window );
+    if (!orig_layer) orig_layer=vo_x11_get_gnome_layer( mDisplay, vo_window );
 
     memset(&xev, 0, sizeof(xev));
     xev.type = ClientMessage;