[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.41,1.42 ws.h,1.15,1.16

[Zoltan Ponekker]

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

Modified Files:
	ws.c ws.h 
Log Message:
fix some gtk bug...

Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ws.c	14 May 2002 11:41:01 -0000	1.41
+++ ws.c	20 May 2002 13:56:16 -0000	1.42
@@ -810,8 +810,6 @@
 {
  int decoration = 0;
  
- if ( wsWMType == wsWMUnknown ) XUnmapWindow( wsDisplay,win->WindowID );
-
  switch ( wsWMType )
    {
     case wsWMUnknown:
@@ -990,13 +988,13 @@
 // ----------------------------------------------------------------------------------------------
 //    Move top the window.
 // ----------------------------------------------------------------------------------------------
-void wsMoveTopWindow( wsTWindow * win )
+void wsMoveTopWindow( Display * wsDisplay,Window win )
 {
  switch ( wsWMType )
   {
    case wsWMIceWM:
-	  XUnmapWindow( wsDisplay,win->WindowID );
-	  XMapWindow( wsDisplay,win->WindowID );
+	  XUnmapWindow( wsDisplay,win );
+	  XMapWindow( wsDisplay,win );
 	  break;
    case wsWMNetWM:
    case wsWMKDE:
@@ -1005,15 +1003,15 @@
 	  e.xclient.type=ClientMessage;
 	  e.xclient.message_type=XInternAtom( wsDisplay,"_NET_ACTIVE_WINDOW",False );
 	  e.xclient.display=wsDisplay;
-	  e.xclient.window=win->WindowID;
+	  e.xclient.window=win;
 	  e.xclient.format=32;
 	  e.xclient.data.l[0]=0;
-	  XSendEvent( wsDisplay,wsRootWin,False,SubstructureRedirectMask,&e );
+	  XSendEvent( wsDisplay,RootWindow( wsDisplay,DefaultScreen( wsDisplay ) ),False,SubstructureRedirectMask,&e );
 	  break;
 	 }
    default:
-         XMapRaised( wsDisplay,win->WindowID );
-	 XRaiseWindow( wsDisplay,win->WindowID );
+         XMapRaised( wsDisplay,win );
+	 XRaiseWindow( wsDisplay,win );
          break;
   }
 }

Index: ws.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ws.h	14 May 2002 11:41:01 -0000	1.15
+++ ws.h	20 May 2002 13:56:16 -0000	1.16
@@ -220,7 +220,7 @@
 extern void wsMoveWindow( wsTWindow * win,int b,int x, int y );
 extern void wsResizeWindow( wsTWindow * win,int sx, int sy );
 extern void wsIconify( wsTWindow win );
-extern void wsMoveTopWindow( wsTWindow * win );
+extern void wsMoveTopWindow( Display * wsDisplay,Window win );
 extern void wsSetBackground( wsTWindow * win,int color );
 extern void wsSetForegroundRGB( wsTWindow * win,int r,int g,int b );
 extern void wsSetBackgroundRGB( wsTWindow * win,int r,int g,int b );