changeset 12798:33423862b159

Indentation fix from previous patch, as discussed on IRC. Patch by Alexander Strasser

--- a/Gui/wm/ws.c	Sun Jul 11 22:23:57 2004 +0000
+++ b/Gui/wm/ws.c	Sun Jul 11 22:27:18 2004 +0000
@@ -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 );
   }
 
 

--- a/libvo/x11_common.c	Sun Jul 11 22:23:57 2004 +0000
+++ b/libvo/x11_common.c	Sun Jul 11 22:27:18 2004 +0000
@@ -1405,13 +1405,13 @@
         // fs->win
         if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
         {
-        if (vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight)
-            return;
-        x = vo_old_x;
-        y = vo_old_y;
-        w = vo_old_width;
-        h = vo_old_height;
-        }
+            if (vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight)
+                return;
+            x = vo_old_x;
+            y = vo_old_y;
+            w = vo_old_width;
+            h = vo_old_height;
+	}
 
         vo_x11_ewmh_fullscreen(_NET_WM_STATE_REMOVE);   // removes fullscreen state if wm supports EWMH
         vo_fs = VO_FALSE;
@@ -1423,18 +1423,18 @@
         vo_fs = VO_TRUE;
         if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
         {
-        if (vo_old_width &&
-            (vo_dwidth == vo_screenwidth && vo_dwidth != vo_old_width) &&
-            (vo_dheight == vo_screenheight && vo_dheight != vo_old_height))
-            return;
-        vo_old_x = vo_dx;
-        vo_old_y = vo_dy;
-        vo_old_width = vo_dwidth;
-        vo_old_height = vo_dheight;
-        x = 0;
-        y = 0;
-        w = vo_screenwidth;
-        h = vo_screenheight;
+            if (vo_old_width &&
+                (vo_dwidth == vo_screenwidth && vo_dwidth != vo_old_width) &&
+                (vo_dheight == vo_screenheight && vo_dheight != vo_old_height))
+                return;
+            vo_old_x = vo_dx;
+            vo_old_y = vo_dy;
+            vo_old_width = vo_dwidth;
+            vo_old_height = vo_dheight;
+            x = 0;
+            y = 0;
+            w = vo_screenwidth;
+            h = vo_screenheight;
         }
     }
     {
@@ -1455,14 +1455,14 @@
 
     if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
     {
-    vo_x11_decoration(mDisplay, vo_window, (vo_fs) ? 0 : 1);
-    vo_x11_sizehint(x, y, w, h, 0);
-    vo_x11_setlayer(mDisplay, vo_window, vo_fs);
+        vo_x11_decoration(mDisplay, vo_window, (vo_fs) ? 0 : 1);
+        vo_x11_sizehint(x, y, w, h, 0);
+        vo_x11_setlayer(mDisplay, vo_window, vo_fs);
 
-    if ((!(vo_fs)) & vo_ontop)
-        vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
+        if ((!(vo_fs)) & vo_ontop)
+            vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
-    XMoveResizeWindow(mDisplay, vo_window, x, y, w, h);
+        XMoveResizeWindow(mDisplay, vo_window, x, y, w, h);
     }
 #ifdef HAVE_XINERAMA
     vo_x11_xinerama_move(mDisplay, vo_window);