Add MoveFromEdge* actions, shorten client_directional_edge_search with some handy...

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index c0195dd820bda25358cbdfa733a666e87b70b6ca..24a0c6346396d39c45de365b372b106e008af1c6 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    action.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -302,28 +303,60 @@ void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
     (*a)->data.cycle.dialog = TRUE;
 }
 
+void setup_action_movefromedge_north(ObAction **a, ObUserAction uact)
+{
+    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.diraction.direction = OB_DIRECTION_NORTH;
+    (*a)->data.diraction.hang = TRUE;
+}
+
+void setup_action_movefromedge_south(ObAction **a, ObUserAction uact)
+{
+    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
+    (*a)->data.diraction.hang = TRUE;
+}
+
+void setup_action_movefromedge_east(ObAction **a, ObUserAction uact)
+{
+    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.diraction.direction = OB_DIRECTION_EAST;
+    (*a)->data.diraction.hang = TRUE;
+}
+
+void setup_action_movefromedge_west(ObAction **a, ObUserAction uact)
+{
+    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.diraction.direction = OB_DIRECTION_WEST;
+    (*a)->data.diraction.hang = TRUE;
+}
+
 void setup_action_movetoedge_north(ObAction **a, ObUserAction uact)
 {
     (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
     (*a)->data.diraction.direction = OB_DIRECTION_NORTH;
+    (*a)->data.diraction.hang = FALSE;
 }
 
 void setup_action_movetoedge_south(ObAction **a, ObUserAction uact)
 {
     (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
     (*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
+    (*a)->data.diraction.hang = FALSE;
 }
 
 void setup_action_movetoedge_east(ObAction **a, ObUserAction uact)
 {
     (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
     (*a)->data.diraction.direction = OB_DIRECTION_EAST;
+    (*a)->data.diraction.hang = FALSE;
 }
 
 void setup_action_movetoedge_west(ObAction **a, ObUserAction uact)
 {
     (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
     (*a)->data.diraction.direction = OB_DIRECTION_WEST;
+    (*a)->data.diraction.hang = FALSE;
 }
 
 void setup_action_growtoedge_north(ObAction **a, ObUserAction uact)
@@ -782,6 +815,26 @@ ActionString actionstrings[] =
         action_cycle_windows,
         setup_action_cycle_windows_previous
     },
+    {
+        "movefromedgenorth",
+        action_movetoedge,
+        setup_action_movefromedge_north
+    },
+    {
+        "movefromedgesouth",
+        action_movetoedge,
+        setup_action_movefromedge_south
+    },
+    {
+        "movefromedgewest",
+        action_movetoedge,
+        setup_action_movefromedge_west
+    },
+    {
+        "movefromedgeeast",
+        action_movetoedge,
+        setup_action_movefromedge_east
+    },
     {
         "movetoedgenorth",
         action_movetoedge,
@@ -1072,7 +1125,7 @@ void action_focus(union ActionData *data)
 
 void action_unfocus (union ActionData *data)
 {
-    if (data->client.any.c == focus_client);
+    if (data->client.any.c == focus_client)
         focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
 }
 
@@ -1095,17 +1148,19 @@ void action_raiselower(union ActionData *data)
     gboolean raise = FALSE;
 
     for (it = stacking_list; it; it = g_list_next(it)) {
-        ObClient *cit = it->data;
-
-        if (cit == c) break;
-        if (client_normal(cit) == client_normal(c) &&
-            cit->layer == c->layer &&
-            cit->frame->visible &&
-            !client_search_transient(c, cit))
-        {
-            if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) {
-                raise = TRUE;
-                break;
+        if (WINDOW_IS_CLIENT(it->data)) {
+            ObClient *cit = it->data;
+
+            if (cit == c) break;
+            if (client_normal(cit) == client_normal(c) &&
+                    cit->layer == c->layer &&
+                    cit->frame->visible &&
+                    !client_search_transient(c, cit))
+            {
+                if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) {
+                    raise = TRUE;
+                    break;
+                }
             }
         }
     }
@@ -1551,18 +1606,20 @@ void action_movetoedge(union ActionData *data)
     
     switch(data->diraction.direction) {
     case OB_DIRECTION_NORTH:
-        y = client_directional_edge_search(c, OB_DIRECTION_NORTH);
+        y = client_directional_edge_search(c, OB_DIRECTION_NORTH, data->diraction.hang)
+            - (data->diraction.hang ? c->frame->area.height : 0);
         break;
     case OB_DIRECTION_WEST:
-        x = client_directional_edge_search(c, OB_DIRECTION_WEST);
+        x = client_directional_edge_search(c, OB_DIRECTION_WEST, data->diraction.hang)
+            - (data->diraction.hang ? c->frame->area.width : 0);
         break;
     case OB_DIRECTION_SOUTH:
-        y = client_directional_edge_search(c, OB_DIRECTION_SOUTH) -
-            c->frame->area.height;
+        y = client_directional_edge_search(c, OB_DIRECTION_SOUTH, data->diraction.hang)
+            - (data->diraction.hang ? 0 : c->frame->area.height);
         break;
     case OB_DIRECTION_EAST:
-        x = client_directional_edge_search(c, OB_DIRECTION_EAST) -
-            c->frame->area.width;
+        x = client_directional_edge_search(c, OB_DIRECTION_EAST, data->diraction.hang)
+            - (data->diraction.hang ? 0 : c->frame->area.width);
         break;
     default:
         g_assert_not_reached();
@@ -1591,7 +1648,7 @@ void action_growtoedge(union ActionData *data)
 
     switch(data->diraction.direction) {
     case OB_DIRECTION_NORTH:
-        dest = client_directional_edge_search(c, OB_DIRECTION_NORTH);
+        dest = client_directional_edge_search(c, OB_DIRECTION_NORTH, FALSE);
         if (a->y == y)
             height = c->frame->area.height / 2;
         else {
@@ -1600,7 +1657,7 @@ void action_growtoedge(union ActionData *data)
         }
         break;
     case OB_DIRECTION_WEST:
-        dest = client_directional_edge_search(c, OB_DIRECTION_WEST);
+        dest = client_directional_edge_search(c, OB_DIRECTION_WEST, FALSE);
         if (a->x == x)
             width = c->frame->area.width / 2;
         else {
@@ -1609,7 +1666,7 @@ void action_growtoedge(union ActionData *data)
         }
         break;
     case OB_DIRECTION_SOUTH:
-        dest = client_directional_edge_search(c, OB_DIRECTION_SOUTH);
+        dest = client_directional_edge_search(c, OB_DIRECTION_SOUTH, FALSE);
         if (a->y + a->height == y + c->frame->area.height) {
             height = c->frame->area.height / 2;
             y = a->y + a->height - height;
@@ -1619,7 +1676,7 @@ void action_growtoedge(union ActionData *data)
         height -= (height - c->frame->area.height) % c->size_inc.height;
         break;
     case OB_DIRECTION_EAST:
-        dest = client_directional_edge_search(c, OB_DIRECTION_EAST);
+        dest = client_directional_edge_search(c, OB_DIRECTION_EAST, FALSE);
         if (a->x + a->width == x + c->frame->area.width) {
             width = c->frame->area.width / 2;
             x = a->x + a->width - width;