more build fixes, calling the other makefiles instead of including them

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 614b196ad17857fa33bbc181223172ca8e67fe58..7e0321bc2bc2091dbd80cf41e2bb9c2871d0e7c8 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -301,7 +301,7 @@ void action_resize_relative_horz(union ActionData *data)
 void action_resize_relative_vert(union ActionData *data)
 {
     Client *c = data->relative.c;
-    if (c)
+    if (c && !c->shaded)
         client_configure(c, Corner_TopLeft, c->area.x, c->area.y,
                          c->area.width, c->area.height + data->relative.delta,
                          TRUE, TRUE);
@@ -451,7 +451,6 @@ static void cur_row_col(guint *r, guint *c)
                 screen_desktop / screen_desktop_layout.columns;
             *c = screen_desktop % screen_desktop_layout.columns;
             break;
-        break;
         case Corner_TopRight:
             *r = screen_desktop / screen_desktop_layout.columns;
             *c = screen_desktop_layout.columns - 1 -
@@ -463,8 +462,8 @@ static void cur_row_col(guint *r, guint *c)
             *c = screen_desktop_layout.columns - 1 -
                 screen_desktop % screen_desktop_layout.columns;
             break;
-        break;
         }
+        break;
     case Orientation_Vert:
         switch (screen_desktop_layout.start_corner) {
         case Corner_TopLeft:
@@ -476,7 +475,6 @@ static void cur_row_col(guint *r, guint *c)
                 screen_desktop % screen_desktop_layout.rows;
             *c = screen_desktop / screen_desktop_layout.rows;
             break;
-        break;
         case Corner_TopRight:
             *r = screen_desktop % screen_desktop_layout.rows;
             *c = screen_desktop_layout.columns - 1 -
@@ -488,7 +486,6 @@ static void cur_row_col(guint *r, guint *c)
             *c = screen_desktop_layout.columns - 1 -
                 screen_desktop / screen_desktop_layout.rows;
             break;
-        break;
         }
         break;
     }
@@ -632,10 +629,8 @@ void action_resize(union ActionData *data)
     int w = data->resize.x;
     int h = data->resize.y;
  
-    if (!c || !client_normal(c)) return;
+    if (!c || c->shaded || !client_normal(c)) return;
 
-    /* XXX window snapping/struts */
-    
     dispatch_resize(c, &w, &h, data->resize.corner);
     
     w -= c->frame->size.left + c->frame->size.right;