[Mplayer-cvslog] CVS: main/Gui/mplayer sw.h,1.9,1.10

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv19820

Modified Files:
	sw.h 
Log Message:
hm. clean up

Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sw.h	1 Sep 2001 17:53:07 -0000	1.9
+++ sw.h	2 Sep 2001 18:30:55 -0000	1.10
@@ -3,50 +3,8 @@
 
 int             mplSubRender = 1;
 
-int VisibleMainWindow( void )
-{
- Window   root,parent,me,subw,mainw;
- Window * childs;
- int      nchilds;
- int      i;
- int      visible = 0;
-
- me=appMPlayer.mainWindow.WindowID;
- for (;;) 
-  {
-   XQueryTree( wsDisplay,me,&root,&parent,&childs,&nchilds);
-   XFree((char *) childs);
-   if (root == parent) break;
-   me=parent;
-  }
- XQueryTree( wsDisplay,root,&root,&parent,&childs,&nchilds );
- mainw=me;
-
- me=appMPlayer.subWindow.WindowID;
- for (;;) 
-  {
-   XQueryTree( wsDisplay,me,&root,&parent,&childs,&nchilds);
-   XFree((char *) childs);
-   if (root == parent) break;
-   me=parent;
-  }
- XQueryTree( wsDisplay,root,&root,&parent,&childs,&nchilds );
- subw=me;
-
- for (i=0; i < nchilds; i++) if ( childs[i]==me ) break;
- for ( ;i<nchilds;i++ ) if ( childs[i] == mainw ) visible=1; 
- return visible;
-}
-
-int mainisvisible1;
-int mainisvisible2;
-int count = 0;
-
 void mplSubDraw( wsParamDisplay )
 {
-// mainisvisible1=VisibleMainWindow();
-// printf( "--------> main: %d ---\n",mainisvisible1 );
-
 
 // if ( ( appMPlayer.subWindow.Visible == wsWindowNotVisible )||
 //      ( appMPlayer.subWindow.State != wsWindowExpose ) ) return;
@@ -70,13 +28,11 @@
    XFlush( wsDisplay );
   }
  appMPlayer.subWindow.State=0; 
-// mainis=0;
 }
 
 void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
 {
  static int mplSubMoved = 0;
- static int oldmainisvisible = 0;
 
  mplMouseTimer=mplMouseTimerConst;
  wsVisibleMouse( &appMPlayer.subWindow,wsShowMouseCursor );
@@ -93,7 +49,6 @@
           break;
 // ---	  
    case wsPLMouseButton:
-//mainis=0;
           sx=X; sy=Y;
           msButton=wsPLMouseButton;
           mplSubMoved=0;
@@ -112,23 +67,6 @@
            }
           break;
    case wsRLMouseButton:
-// if ( ( appMPlayer.subWindow.Focused == 0 && appMPlayer.subWindow.OFocused == 2 ) )
-//      ( appMPlayer.mainWindow.Focused == 0 && appMPlayer.mainWindow.OFocused == 2 ) ) 
-//          if ( ( !mplSubMoved )&&( !appMPlayer.mainWindow.Focused ) )
-printf( "-----> mainis: %d ---- \n",mainis );
-if ( !mainis )
-{
-wsMoveTopWindow( &appMPlayer.mainWindow );
-}
-/*
-          if ( ( !mplSubMoved )&&
-	       ( appMPlayer.subWindow.isFullScreen )&&
-	       ( !VisibleMainWindow() ) )
-	   {
-wsMoveTopWindow( &appMPlayer.mainWindow );
-//	     else wsMoveTopWindow( &appMPlayer.mainWindow );
-	   }
-*/	   
           msButton=0;
           mplSubMoved=0;
           break;