Update of /cvsroot/mplayer/main/Gui/wm In directory mail:/var/tmp.root/cvs-serv26564/Gui/wm Modified Files: ws.c Log Message: some bugfix, x[11|mga|v] ( fullscreen with more files ) Index: ws.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ws.c 7 May 2002 13:31:13 -0000 1.38 +++ ws.c 8 May 2002 16:41:44 -0000 1.39 @@ -961,30 +961,30 @@ // ---------------------------------------------------------------------------------------------- void wsMoveTopWindow( wsTWindow * win ) { - if ( wsWMType == wsWMIceWM ) + switch ( wsWMType ) { - XUnmapWindow( wsDisplay,win->WindowID ); - XMapWindow( wsDisplay,win->WindowID ); - return; + case wsWMIceWM: + XUnmapWindow( wsDisplay,win->WindowID ); + XMapWindow( wsDisplay,win->WindowID ); + break; + case wsWMNetWM: + case wsWMKDE: + { + XEvent e; + 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.format=32; + e.xclient.data.l[0]=0; + XSendEvent( wsDisplay,wsRootWin,False,SubstructureRedirectMask,&e ); + break; + } + default: + XMapRaised( wsDisplay,win->WindowID ); + XRaiseWindow( wsDisplay,win->WindowID ); + break; } -/* - if ( XInternAtom( wsDisplay,"_NET_ACTIVE_WINDOW",False ) != None ) - { - XEvent e; - - 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.format=32; - e.xclient.data.l[0]=0; - XSendEvent( wsDisplay,wsRootWin,False,SubstructureRedirectMask,&e ); - } - else */ - { - XMapRaised( wsDisplay,win->WindowID ); - XRaiseWindow( wsDisplay,win->WindowID ); - } } // ----------------------------------------------------------------------------------------------