Merge branch 'backport'

[dana/openbox.git] / openbox / actions / growtoedge.c

diff --git a/openbox/actions/growtoedge.c b/openbox/actions/growtoedge.c
index fffcc4e..630ead1 100644 (file)
--- a/openbox/actions/growtoedge.c
+++ b/openbox/actions/growtoedge.c
@@ -7,19 +7,27 @@
 
 typedef struct {
     ObDirection dir;
+    gboolean shrink;
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_shrink_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_growtoedge_startup()
+void action_growtoedge_startup(void)
 {
     actions_register("GrowToEdge",
                      setup_func,
                      free_func,
                      run_func,
                      NULL, NULL);
+
+    actions_register("ShrinkToEdge",
+                     setup_shrink_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -29,6 +37,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 
     o = g_new0(Options, 1);
     o->dir = OB_DIRECTION_NORTH;
+    o->shrink = FALSE;
 
     if ((n = parse_find_node("direction", node))) {
         gchar *s = parse_string(doc, n);
@@ -50,6 +59,16 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_shrink_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o;
+
+    o = setup_func(i, doc, node);
+    o->shrink = TRUE;
+
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
@@ -57,30 +76,91 @@ static void free_func(gpointer options)
     g_free(o);
 }
 
+static gboolean do_grow(ObActionsData *data, gint x, gint y, gint w, gint h)
+{
+    gint realw, realh, lw, lh;
+
+    realw = w;
+    realh = h;
+    client_try_configure(data->client, &x, &y, &realw, &realh,
+                         &lw, &lh, TRUE);
+    /* if it's going to be resized smaller than it intended, don't
+       move the window over */
+    if (x != data->client->area.x) x += w - realw;
+    if (y != data->client->area.y) y += h - realh;
+
+    if (x != data->client->area.x || y != data->client->area.y ||
+        realw != data->client->area.width ||
+        realh != data->client->area.height)
+    {
+        actions_client_move(data, TRUE);
+        client_move_resize(data->client, x, y, realw, realh);
+        actions_client_move(data, FALSE);
+        return TRUE;
+    }
+    return FALSE;
+}
+
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
     Options *o = options;
+    gint x, y, w, h;
+    ObDirection opp;
+    gint half;
 
-    if (data->client) {
-        gint x, y, w, h;
-
+    if (!data->client ||
         /* don't allow vertical resize if shaded */
-        if (o->dir != OB_DIRECTION_NORTH || o->dir != OB_DIRECTION_SOUTH ||
-            !data->client->shaded)
-        {
-            client_find_resize_directional(data->client, o->dir, TRUE,
-                                           &x, &y, &w, &h);
-            if (x != data->client->area.x || y != data->client->area.y ||
-                w != data->client->area.width ||
-                h != data->client->area.height)
-            {
-                actions_client_move(data, TRUE);
-                client_move_resize(data->client, x, y, w, h);
-                actions_client_move(data, FALSE);
-            }
+        ((o->dir == OB_DIRECTION_NORTH || o->dir == OB_DIRECTION_SOUTH) &&
+         data->client->shaded))
+    {
+        return FALSE;
+    }
+
+    if (!o->shrink) {
+        /* try grow */
+        client_find_resize_directional(data->client, o->dir, TRUE,
+                                       &x, &y, &w, &h);
+        if (do_grow(data, x, y, w, h))
+            return FALSE;
+    }
+
+    /* we couldn't grow, so try shrink! */
+    opp = (o->dir == OB_DIRECTION_NORTH ? OB_DIRECTION_SOUTH :
+           (o->dir == OB_DIRECTION_SOUTH ? OB_DIRECTION_NORTH :
+            (o->dir == OB_DIRECTION_EAST ? OB_DIRECTION_WEST :
+             OB_DIRECTION_EAST)));
+    client_find_resize_directional(data->client, opp, FALSE,
+                                   &x, &y, &w, &h);
+    switch (opp) {
+    case OB_DIRECTION_NORTH:
+        half = data->client->area.y + data->client->area.height / 2;
+        if (y > half) {
+            h += y - half;
+            y = half;
+        }
+        break;
+    case OB_DIRECTION_SOUTH:
+        half = data->client->area.height / 2;
+        if (h < half)
+            h = half;
+        break;
+    case OB_DIRECTION_WEST:
+        half = data->client->area.x + data->client->area.width / 2;
+        if (x > half) {
+            w += x - half;
+            x = half;
         }
+        break;
+    case OB_DIRECTION_EAST:
+        half = data->client->area.width / 2;
+        if (w < half)
+            w = half;
+        break;
+    default: g_assert_not_reached();
     }
+    if (do_grow(data, x, y, w, h))
+        return FALSE;
 
     return FALSE;
 }