X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=fcbf683a671fce5196366c475e17766550c3ae15;hb=7416313cad8d0dc51d5a5ea31b20296755f3049d;hp=00e87b24f5ab0f9ad2aa5a79460c67e1032fd53f;hpb=1b0a66dcfff539fe973280f94d4e97f4591c64f8;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 00e87b24..fcbf683a 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -9,6 +9,7 @@
 #include "screen.h"
 #include "action.h"
 #include "openbox.h"
+#include "grab.h"
 
 #include <glib.h>
 
@@ -599,6 +600,11 @@ ActionString actionstrings[] =
         action_desktop_last,
         NULL
     },
+    {
+        "reconfigure",
+        action_reconfigure,
+        NULL
+    },
     {
         "restart",
         action_restart,
@@ -699,16 +705,6 @@ ActionString actionstrings[] =
         action_growtoedge,
         setup_action_growtoedge_east
     },
-    {
-        "vibrate",
-        action_vibrate,
-        NULL
-    },
-    {
-        "flash",
-        action_flash,
-        NULL
-    },
     {
         NULL,
         NULL,
@@ -728,6 +724,9 @@ ObAction *action_from_string(char *name)
                 actionstrings[i].setup(a);
             break;
         }
+    if (!a)
+        g_warning("Invalid action '%s' requested. No such action exists.",
+                  name);
     return a;
 }
 
@@ -926,32 +925,44 @@ void action_toggle_omnipresent(union ActionData *data)
 void action_move_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
-    if (c)
+    if (c) {
+        grab_pointer(TRUE, OB_CURSOR_NONE);
         client_move(c, c->area.x + data->relative.delta, c->area.y);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
+    }
 }
 
 void action_move_relative_vert(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
-    if (c)
+    if (c) {
+        grab_pointer(TRUE, OB_CURSOR_NONE);
         client_move(c, c->area.x, c->area.y + data->relative.delta);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
+    }
 }
 
 void action_resize_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
-    if (c)
+    if (c) {
+        grab_pointer(TRUE, OB_CURSOR_NONE);
         client_resize(c,
                       c->area.width + data->relative.delta * c->size_inc.width,
                       c->area.height);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
+    }
 }
 
 void action_resize_relative_vert(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
-    if (c && !c->shaded)
+    if (c && !c->shaded) {
+        grab_pointer(TRUE, OB_CURSOR_NONE);
         client_resize(c, c->area.width, c->area.height +
                       data->relative.delta * c->size_inc.height);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
+    }
 }
 
 void action_maximize_full(union ActionData *data)
@@ -1088,6 +1099,11 @@ void action_moveresize(union ActionData *data)
                      data->moveresize.button, data->moveresize.corner);
 }
 
+void action_reconfigure(union ActionData *data)
+{
+    ob_reconfigure();
+}
+
 void action_restart(union ActionData *data)
 {
     ob_restart_other(data->execute.path);
@@ -1150,7 +1166,9 @@ void action_movetoedge(union ActionData *data)
         g_assert_not_reached();
     }
     frame_frame_gravity(c->frame, &x, &y);
+    grab_pointer(TRUE, OB_CURSOR_NONE);
     client_move(c, x, y);
+    grab_pointer(FALSE, OB_CURSOR_NONE);
 
 }
 
@@ -1213,7 +1231,9 @@ void action_growtoedge(union ActionData *data)
     frame_frame_gravity(c->frame, &x, &y);
     width -= c->frame->size.left + c->frame->size.right;
     height -= c->frame->size.top + c->frame->size.bottom;
-    client_move(c, x, y);
+    grab_pointer(TRUE, OB_CURSOR_NONE);
+    client_move_resize(c, x, y, width, height);
+    grab_pointer(FALSE, OB_CURSOR_NONE);
 }
 
 void action_send_to_layer(union ActionData *data)
@@ -1248,34 +1268,3 @@ void action_unshow_desktop(union ActionData *data)
 {
     screen_show_desktop(FALSE);
 }
-
-void action_vibrate(union ActionData *data)
-{
-    ObClient *c = data->client.any.c;
-    gint x, y, thr, length, i;
-
-    if (!c) return;
-
-    x = c->frame->area.x;
-    y = c->frame->area.y;
-    thr = 120;
-    length = y + thr;
-    for (i = 0; i < 5; ++i) {
-        while (y < length) {
-            client_move(c, x, y);
-            y += 4;
-            x -= 1;
-        }
-        while (y >= length - thr) {
-            client_move(c, x, y);
-            y -= 4;
-            x += 1;
-        }
-    }
-}
-
-void action_flash(union ActionData *data)
-{
-    if (!data->client.any.c) return;
-    frame_flash(data->client.any.c->frame);
-}