fix some gtk bug...

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

2 files changed, 8 insertions, 10 deletions

diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index e221c78e8e..a8c249c6a5 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -810,8 +810,6 @@ void wsFullScreen( wsTWindow * win )
 {
  int decoration = 0;
  
- if ( wsWMType == wsWMUnknown ) XUnmapWindow( wsDisplay,win->WindowID );
-
  switch ( wsWMType )
    {
     case wsWMUnknown:
@@ -990,13 +988,13 @@ void wsIconify( wsTWindow win )
 // ----------------------------------------------------------------------------------------------
 //    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 @@ void wsMoveTopWindow( wsTWindow * win )
 	  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;
   }
 }
diff --git a/Gui/wm/ws.h b/Gui/wm/ws.h
index 19e7a3ecbf..870320af3d 100644
--- a/Gui/wm/ws.h
+++ b/Gui/wm/ws.h
@@ -220,7 +220,7 @@ extern void wsDestroyWindow( wsTWindow * win );
 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 );