[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.75,1.76

Roberto Togni CVS syncmail at mplayerhq.hu
Mon Jul 12 00:27:21 CEST 2004


CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main/Gui/wm
In directory mail:/var2/tmp/cvs-serv24579/Gui/wm

Modified Files:
	ws.c 
Log Message:
Indentation fix from previous patch, as discussed on IRC.
Patch by Alexander Strasser


Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ws.c	11 Jul 2004 22:16:52 -0000	1.75
+++ ws.c	11 Jul 2004 22:27:18 -0000	1.76
@@ -772,13 +772,13 @@
   {
    vo_x11_ewmh_fullscreen( _NET_WM_STATE_REMOVE ); // removes fullscreen state if wm supports EWMH
    if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // shouldn't be needed with EWMH fs
-   {
-   win->X=win->OldX;
-   win->Y=win->OldY;
-   win->Width=win->OldWidth;
-   win->Height=win->OldHeight;
-   decoration=win->Decorations;
-   }
+    {
+     win->X=win->OldX;
+     win->Y=win->OldY;
+     win->Width=win->OldWidth;
+     win->Height=win->OldHeight;
+     decoration=win->Decorations;
+    }
 
 #ifdef ENABLE_DPMS
    wsScreenSaverOn( wsDisplay );
@@ -789,12 +789,12 @@
   else
    {
     if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // shouldn't be needed with EWMH fs
-    {
-    win->OldX=win->X; win->OldY=win->Y;
-    win->OldWidth=win->Width; win->OldHeight=win->Height;
-    win->X=wsOrgX; win->Y=wsOrgY;
-    win->Width=wsMaxX; win->Height=wsMaxY;
-    }
+     {
+      win->OldX=win->X; win->OldY=win->Y;
+      win->OldWidth=win->Width; win->OldHeight=win->Height;
+      win->X=wsOrgX; win->Y=wsOrgY;
+      win->Width=wsMaxX; win->Height=wsMaxY;
+     }
 
     win->isFullScreen=True;
 #ifdef ENABLE_DPMS
@@ -805,19 +805,19 @@
    }
 
   if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // shouldn't be needed with EWMH fs
- {
- vo_x11_decoration( wsDisplay,win->WindowID,decoration );
- vo_x11_sizehint( win->X,win->Y,win->Width,win->Height,0 );
- vo_x11_setlayer( wsDisplay,win->WindowID,win->isFullScreen );
+   {
+    vo_x11_decoration( wsDisplay,win->WindowID,decoration );
+    vo_x11_sizehint( win->X,win->Y,win->Width,win->Height,0 );
+    vo_x11_setlayer( wsDisplay,win->WindowID,win->isFullScreen );
 
-if ((!(win->isFullScreen)) & vo_ontop) vo_x11_setlayer(wsDisplay, win->WindowID,1);
+    if ((!(win->isFullScreen)) & vo_ontop) vo_x11_setlayer(wsDisplay, win->WindowID,1);
+
+    XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );
+   }
 
- XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );
- }
-    
  if ( vo_wm_type == 0 && !(vo_fsmode&16) )
   {
-  XWithdrawWindow( wsDisplay,win->WindowID,wsScreen );
+   XWithdrawWindow( wsDisplay,win->WindowID,wsScreen );
   }
 
 




More information about the MPlayer-cvslog mailing list