add RECT_CONTAINS

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index b976a84d09da68e2ee50230b585049e388d759b1..b05e34504ec82af9914cb94c59537cb30f5e8deb 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -3,6 +3,7 @@
 #include "frame.h"
 #include "screen.h"
 #include "action.h"
+#include "snap.h"
 
 #include <glib.h>
 
@@ -29,18 +30,34 @@ void action_free(Action *a)
 
 void action_execute(union ActionData *data)
 {
-    GError *e;
+    GError *e = NULL;
     if (!g_spawn_command_line_async(data->execute.path, &e)) {
         g_warning("failed to execute '%s': %s",
                   data->execute.path, e->message);
     }
 }
 
+void action_focus(union ActionData *data)
+{
+    client_focus(data->client.c);
+}
+
+void action_unfocus (union ActionData *data)
+{
+    client_unfocus(data->client.c);
+}
+
 void action_iconify(union ActionData *data)
 {
     client_iconify(data->client.c, TRUE, TRUE);
 }
 
+void action_focusraise(union ActionData *data)
+{
+    client_focus(data->client.c);
+    stacking_raise(data->client.c);
+}
+
 void action_raise(union ActionData *data)
 {
     stacking_raise(data->client.c);
@@ -385,6 +402,9 @@ void action_move(union ActionData *data)
     int x = data->move.x;
     int y = data->move.y;
 
+    snap_move(c, &x, &y, c->frame->area.width, c->frame->area.height);
+
+    frame_frame_gravity(c->frame, &x, &y); /* get where the client should be */
     client_configure(c, Corner_TopLeft, x, y, c->area.width, c->area.height,
                      TRUE, data->move.final);
 }
@@ -395,6 +415,8 @@ void action_resize(union ActionData *data)
     int w = data->resize.x - c->frame->size.left - c->frame->size.right;
     int h = data->resize.y - c->frame->size.top - c->frame->size.bottom;
 
+    /* XXX window snapping/struts */
+
     client_configure(c, data->resize.corner, c->area.x, c->area.y, w, h,
                      TRUE, data->resize.final);
 }