changeset 2030:68dbb349566e

mwm fullscreen bug fixed (?)
author pontscho
date Mon, 01 Oct 2001 13:09:04 +0000
parents 41ed89701ece
children 624df8ea0e0e
files Gui/mplayer/sw.h Gui/wm/ws.c
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/mplayer/sw.h	Mon Oct 01 12:28:39 2001 +0000
+++ b/Gui/mplayer/sw.h	Mon Oct 01 13:09:04 2001 +0000
@@ -7,7 +7,6 @@
 void mplSubDraw( wsParamDisplay )
 {
  if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible=0;
- 
  if ( !appMPlayer.subWindow.Mapped ||
       appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
 
@@ -62,7 +61,12 @@
            }
           break;
    case wsRLMouseButton:
-          if ( ( !mplSubMoved )&&( ( SubVisible++%2 ) ) ) wsMoveTopWindow( &appMPlayer.mainWindow );
+//          if ( ( !mplSubMoved )&&( ( SubVisible++%2 ) ) ) wsMoveTopWindow( &appMPlayer.mainWindow );
+          if ( !mplSubMoved )
+	   {
+	    if( SubVisible++%2 ) wsMoveTopWindow( &appMPlayer.subWindow );
+	     else wsMoveTopWindow( &appMPlayer.mainWindow );
+	   }
           msButton=0;
           mplSubMoved=0;
           break;
--- a/Gui/wm/ws.c	Mon Oct 01 12:28:39 2001 +0000
+++ b/Gui/wm/ws.c	Mon Oct 01 13:09:04 2001 +0000
@@ -856,8 +856,8 @@
 //    Move top the window.
 // ----------------------------------------------------------------------------------------------
 void wsMoveTopWindow( wsTWindow * win )
-//{ XRaiseWindow( wsDisplay,win->WindowID ); }
-{ XUnmapWindow( wsDisplay,win->WindowID ); XMapWindow( wsDisplay,win->WindowID ); }
+{ XRaiseWindow( wsDisplay,win->WindowID ); }
+//{ XUnmapWindow( wsDisplay,win->WindowID ); XMapWindow( wsDisplay,win->WindowID ); }
 
 // ----------------------------------------------------------------------------------------------
 //    Set window background to 'color'.