fix other bugs

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2046 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 27 insertions, 10 deletions

diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index 947dd91c01..38ac506512 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -17,7 +17,7 @@ char * Translate( char * str )
  static char   trbuf[512];
         char   tmp[128];
         int    i,c;
-        int    t,h,m,s;
+        int    t;
  memset( trbuf,0,512 );
  memset( tmp,0,128 );
  for ( c=0,i=0;i < strlen( str );i++ )
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index 22c6305005..e766d0df21 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -52,6 +52,8 @@ void mplFullScreen( void )
     wsWindowDecoration( &appMPlayer.subWindow,0 );
     appMPlayer.subWindow.isFullScreen=1;
    }
+ if ( mplShMem->Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
+  else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
  wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
  mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
 }
@@ -71,8 +73,8 @@ void mplStop()
    wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
   }
  mplSubRender=1;
- wsClearWindow( appMPlayer.subWindow );
  wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
+ wsClearWindow( appMPlayer.subWindow );
  wsPostRedisplay( &appMPlayer.subWindow );
 }
 
diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h
index a97dc88921..8f0ca754da 100644
--- a/Gui/mplayer/sw.h
+++ b/Gui/mplayer/sw.h
@@ -6,7 +6,8 @@ int             SubVisible = 0;
 
 void mplSubDraw( wsParamDisplay )
 {
- if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible=0;
+ if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible++;
+ 
  if ( !appMPlayer.subWindow.Mapped ||
       appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
 
@@ -64,8 +65,16 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
 //          if ( ( !mplSubMoved )&&( ( SubVisible++%2 ) ) ) wsMoveTopWindow( &appMPlayer.mainWindow );
           if ( !mplSubMoved )
 	   {
-	    if( SubVisible++%2 ) wsMoveTopWindow( &appMPlayer.subWindow );
-	     else wsMoveTopWindow( &appMPlayer.mainWindow );
+	    if( SubVisible++%2 )
+	     {
+	      wsMoveTopWindow( &appMPlayer.mainWindow );
+	      fprintf( stderr,"[sw] MAIN TOP\n" );
+	     } 
+	     else 
+	      {
+	       wsMoveTopWindow( &appMPlayer.subWindow );
+	       fprintf( stderr,"[sw] SUB TOP\n" );
+	      }
 	   }
           msButton=0;
           mplSubMoved=0;
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index b8d278383a..afaf6dd3ed 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -613,8 +613,10 @@ buttonreleased:
         break;
 
    case PropertyNotify:
-	break;
-        fprintf(stderr,"[ws] PropertyNotify %s\n",XGetAtomName( wsDisplay,Event->xproperty.atom ) );
+//	break;
+//	#ifdef DEBUG
+//         fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",wsWindowList[l]->WindowID,XGetAtomName( wsDisplay,Event->xproperty.atom ),Event->xproperty.atom );
+//	#endif
         if ( Event->xproperty.atom == wsWindowList[l]->AtomRemote )
          {
           Atom            type;
@@ -634,6 +636,9 @@ buttonreleased:
            {
             args[strlen( args ) - 1]=0;
             wsWindowList[l]->RemoteHandler( args );
+	    #ifdef DEBUG
+ 	     fprintf( stderr,"[ws]   args: '%s'\n",args );
+	    #endif
             args[strlen( args ) - 1]=1;
             XFree( args );
            }
@@ -856,8 +861,10 @@ void wsIconify( wsTWindow win )
 //    Move top the window.
 // ----------------------------------------------------------------------------------------------
 void wsMoveTopWindow( wsTWindow * win )
-{ XRaiseWindow( wsDisplay,win->WindowID ); }
-//{ XUnmapWindow( wsDisplay,win->WindowID ); XMapWindow( wsDisplay,win->WindowID ); }
+{ 
+// XUnmapWindow( wsDisplay,win->WindowID ); XMapWindow( wsDisplay,win->WindowID ); 
+ XRaiseWindow( wsDisplay,win->WindowID ); 
+}
 
 // ----------------------------------------------------------------------------------------------
 //    Set window background to 'color'.
@@ -897,7 +904,6 @@ void wsSetForegroundRGB( wsTWindow * win,int r,int g,int b )
    case wsBGR15: PACK_RGB15( b,g,r,color ); break;
   }
  XSetForeground( wsDisplay,win->wGC,color );
-// XSetWindowBackground( wsDisplay,win->WindowID,color );
 }
 
 // ----------------------------------------------------------------------------------------------