X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=fcbf683a671fce5196366c475e17766550c3ae15;hb=1df4e327607f7dcf56826928efdddb809d8f1fc3;hp=f037944eba175c5f68ac3f7cba203969853f0de0;hpb=0223fed117a2c136d7a4001f4758b780c6712918;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index f037944e..fcbf683a 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -600,6 +600,11 @@ ActionString actionstrings[] =
         action_desktop_last,
         NULL
     },
+    {
+        "reconfigure",
+        action_reconfigure,
+        NULL
+    },
     {
         "restart",
         action_restart,
@@ -921,9 +926,9 @@ void action_move_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c) {
-        grab_pointer(TRUE, None);
+        grab_pointer(TRUE, OB_CURSOR_NONE);
         client_move(c, c->area.x + data->relative.delta, c->area.y);
-        grab_pointer(FALSE, None);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
     }
 }
 
@@ -931,9 +936,9 @@ void action_move_relative_vert(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c) {
-        grab_pointer(TRUE, None);
+        grab_pointer(TRUE, OB_CURSOR_NONE);
         client_move(c, c->area.x, c->area.y + data->relative.delta);
-        grab_pointer(FALSE, None);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
     }
 }
 
@@ -941,11 +946,11 @@ void action_resize_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c) {
-        grab_pointer(TRUE, None);
+        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, None);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
     }
 }
 
@@ -953,10 +958,10 @@ void action_resize_relative_vert(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c && !c->shaded) {
-        grab_pointer(TRUE, None);
+        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, None);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
     }
 }
 
@@ -1094,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);
@@ -1156,9 +1166,9 @@ void action_movetoedge(union ActionData *data)
         g_assert_not_reached();
     }
     frame_frame_gravity(c->frame, &x, &y);
-    grab_pointer(TRUE, None);
+    grab_pointer(TRUE, OB_CURSOR_NONE);
     client_move(c, x, y);
-    grab_pointer(FALSE, None);
+    grab_pointer(FALSE, OB_CURSOR_NONE);
 
 }
 
@@ -1221,9 +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;
-    grab_pointer(TRUE, None);
+    grab_pointer(TRUE, OB_CURSOR_NONE);
     client_move_resize(c, x, y, width, height);
-    grab_pointer(FALSE, None);
+    grab_pointer(FALSE, OB_CURSOR_NONE);
 }
 
 void action_send_to_layer(union ActionData *data)