]> Dogcows Code - chaz/openbox/blobdiff - openbox/action.c
projects / chaz / openbox / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
<group> option for raise/lower related actions. hi floam.
[chaz/openbox] / openbox / action.c
diff --git a/openbox/action.c b/openbox/action.c
index c07fa1625826cbf47cc5a220a6bbde9f30e23ba8..d83926b7740b4e4613f5aae648787eef99d66b90 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -395,7 +395,7 @@ void setup_action_showmenu(ObAction **a, ObUserAction uact)
        a time! */
     if (uact == OB_USER_ACTION_MENU_SELECTION) {
         action_unref(*a);
-        a = NULL;
+        *a = NULL;
     }
 }
 
@@ -536,6 +536,11 @@ ActionString actionstrings[] =
         action_move_relative_vert,
         setup_client_action
     },
+    {
+        "movetocenter",
+        action_move_to_center,
+        setup_client_action
+    },
     {
         "resizerelativehorz",
         action_resize_relative_horz,
@@ -591,6 +596,11 @@ ActionString actionstrings[] =
         action_toggle_maximize_vert,
         setup_client_action
     },
+    {
+        "togglefullscreen",
+        action_toggle_fullscreen,
+        setup_client_action
+    },
     {
         "sendtodesktop",
         action_send_to_desktop,
@@ -676,6 +686,11 @@ ActionString actionstrings[] =
         action_moveresize,
         setup_action_resize
     },
+    {
+        "toggledockautohide",
+        action_toggle_dockautohide,
+        NULL
+    },
     {
         "toggleshowdesktop",
         action_toggle_show_desktop,
@@ -817,7 +832,8 @@ ObAction *action_from_string(const gchar *name, ObUserAction uact)
             a = action_new(actionstrings[i].func);
             if (actionstrings[i].setup)
                 actionstrings[i].setup(&a, uact);
-            INTERACTIVE_LIMIT(a, uact);
+            if (a)
+                INTERACTIVE_LIMIT(a, uact);
             break;
         }
     if (!exist)
@@ -890,6 +906,13 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             } else if (act->func == action_directional_focus) {
                 if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
                     act->data.cycle.dialog = parse_bool(doc, n);
+            } else if (act->func == action_raise ||
+                       act->func == action_lower ||
+                       act->func == action_raiselower ||
+                       act->func == action_shadelower ||
+                       act->func == action_unshaderaise) {
+                if ((n = parse_find_node("group", node->xmlChildrenNode)))
+                    act->data.stacking.group = parse_bool(doc, n);
             }
             INTERACTIVE_LIMIT(act, uact);
         }
@@ -978,13 +1001,23 @@ void action_run_string(const gchar *name, struct _ObClient *c)
 void action_execute(union ActionData *data)
 {
     GError *e = NULL;
-    gchar *cmd;
+    gchar *cmd, **argv = 0;
     if (data->execute.path) {
         cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL);
         if (cmd) {
-            if (!g_spawn_command_line_async(cmd, &e)) {
+            if (!g_shell_parse_argv (cmd, NULL, &argv, &e)) {
                 g_warning("failed to execute '%s': %s",
                           cmd, e->message);
+                g_error_free(e);
+            } else {
+                if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH |
+                                   G_SPAWN_DO_NOT_REAP_CHILD,
+                                   NULL, NULL, NULL, &e)) {
+                    g_warning("failed to execute '%s': %s",
+                              cmd, e->message);
+                    g_error_free(e);
+                }
+                g_strfreev(argv);
             }
             g_free(cmd);
         } else {
@@ -1014,7 +1047,9 @@ void action_unfocus (union ActionData *data)
 
 void action_iconify(union ActionData *data)
 {
+    client_action_start(data);
     client_iconify(data->client.any.c, TRUE, TRUE);
+    client_action_end(data);
 }
 
 void action_raiselower(union ActionData *data)
@@ -1039,39 +1074,40 @@ void action_raiselower(union ActionData *data)
         }
     }
 
-    action_run_string((raise ? "Raise" : "Lower"), c);
+    if (raise)
+        action_raise(data);
+    else
+        action_lower(data);
 }
 
 void action_raise(union ActionData *data)
 {
     client_action_start(data);
-    stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
+    stacking_raise(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group);
     client_action_end(data);
 }
 
 void action_unshaderaise(union ActionData *data)
 {
     if (data->client.any.c->shaded)
-        action_run_string("Unshade", data->client.any.c);
+        action_unshade(data);
     else
-        action_run_string("Raise", data->client.any.c);
+        action_raise(data);
 }
 
 void action_shadelower(union ActionData *data)
 {
     if (data->client.any.c->shaded)
-        action_run_string("Lower", data->client.any.c);
+        action_lower(data);
     else
-        action_run_string("Shade", data->client.any.c);
+        action_shade(data);
 }
 
 void action_lower(union ActionData *data)
 {
     client_action_start(data);
-    stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
+    stacking_lower(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group);
     client_action_end(data);
-
-    focus_order_to_bottom(data->client.any.c);
 }
 
 void action_close(union ActionData *data)
@@ -1128,6 +1164,17 @@ void action_move_relative_vert(union ActionData *data)
     client_action_end(data);
 }
 
+void action_move_to_center(union ActionData *data)
+{
+    ObClient *c = data->client.any.c;
+    Rect *area;
+    area = screen_area_monitor(c->desktop, 0);
+    client_action_start(data);
+    client_move(c, area->width / 2 - c->area.width / 2,
+                area->height / 2 - c->area.height / 2);
+    client_action_end(data);
+}
+
 void action_resize_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
@@ -1217,6 +1264,14 @@ void action_toggle_maximize_vert(union ActionData *data)
     client_action_end(data);
 }
 
+void action_toggle_fullscreen(union ActionData *data)
+{
+    client_action_start(data);
+    client_fullscreen(data->client.any.c,
+                      !(data->client.any.c->fullscreen), TRUE);
+    client_action_end(data);
+}
+
 void action_send_to_desktop(union ActionData *data)
 {
     ObClient *c = data->sendto.any.c;
@@ -1314,25 +1369,40 @@ void action_toggle_decorations(union ActionData *data)
 
 static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch)
 {
-    if ((cw / 3 < 1) || (x - cx > cw / 3 * 2)) {
-        if ((ch / 3 < 1) || (y - cy > ch / 3 * 2))
-            return prop_atoms.net_wm_moveresize_size_bottomright;
-        else if (y - cy < ch / 3)
-            return prop_atoms.net_wm_moveresize_size_topright;
-        else
-            return prop_atoms.net_wm_moveresize_size_right;
-    } else if (x - cx < cw / 3) {
-        if (y - cy > ch / 3 * 2)
-            return prop_atoms.net_wm_moveresize_size_bottomleft;
-        else if (y - cy < ch / 3)
-            return prop_atoms.net_wm_moveresize_size_topleft;
-        else
-            return prop_atoms.net_wm_moveresize_size_left;
+    if (config_resize_four_corners) {
+        if (x - cx > cw / 2) {
+            if (y - cy > ch / 2)
+                return prop_atoms.net_wm_moveresize_size_bottomright;
+            else
+                return prop_atoms.net_wm_moveresize_size_topright;
+        } else {
+            if (y - cy > ch / 2)
+                return prop_atoms.net_wm_moveresize_size_bottomleft;
+            else
+                return prop_atoms.net_wm_moveresize_size_topleft;
+        }
     } else {
-        if (y - cy > ch / 2)
-            return prop_atoms.net_wm_moveresize_size_bottom;
-        else
-            return prop_atoms.net_wm_moveresize_size_top;
+        if (x - cx > cw * 2 / 3) {
+            if (y - cy > ch * 2 / 3)
+                return prop_atoms.net_wm_moveresize_size_bottomright;
+            else if (y - cy < ch / 3)
+                return prop_atoms.net_wm_moveresize_size_topright;
+            else
+                return prop_atoms.net_wm_moveresize_size_right;
+        } else if (x - cx < cw / 3) {
+            if (y - cy > ch * 2 / 3)
+                return prop_atoms.net_wm_moveresize_size_bottomleft;
+            else if (y - cy < ch / 3)
+                return prop_atoms.net_wm_moveresize_size_topleft;
+            else
+                return prop_atoms.net_wm_moveresize_size_left;
+        } else
+            if (y - cy > ch * 2 / 3)
+                return prop_atoms.net_wm_moveresize_size_bottom;
+            else if (y - cy < ch / 3)
+                return prop_atoms.net_wm_moveresize_size_top;
+            else
+                return prop_atoms.net_wm_moveresize_move;
     }
 }
 
@@ -1394,7 +1464,7 @@ void action_cycle_windows(union ActionData *data)
        on us */
     event_halt_focus_delay();
 
-    focus_cycle(data->cycle.forward, data->cycle.linear,
+    focus_cycle(data->cycle.forward, data->cycle.linear, data->any.interactive,
                 data->cycle.dialog,
                 data->cycle.inter.final, data->cycle.inter.cancel);
 }
@@ -1406,6 +1476,7 @@ void action_directional_focus(union ActionData *data)
     event_halt_focus_delay();
 
     focus_directional_cycle(data->interdiraction.direction,
+                            data->any.interactive,
                             data->interdiraction.dialog,
                             data->interdiraction.inter.final,
                             data->interdiraction.inter.cancel);
@@ -1449,6 +1520,10 @@ void action_growtoedge(union ActionData *data)
     ObClient *c = data->diraction.any.c;
     Rect *a;
 
+    //FIXME growtoedge resizes shaded windows to 0 height
+    if (c->shaded)
+        return;
+
     a = screen_area(c->desktop);
     x = c->frame->area.x;
     y = c->frame->area.y;
@@ -1522,6 +1597,12 @@ void action_toggle_layer(union ActionData *data)
     client_action_end(data);
 }
 
+void action_toggle_dockautohide(union ActionData *data)
+{
+    config_dock_hide = !config_dock_hide;
+    dock_configure();
+}
+
 void action_toggle_show_desktop(union ActionData *data)
 {
     screen_show_desktop(!screen_showing_desktop);
my patches for the openbox window manager
This page took 0.029344 seconds and 4 git commands to generate.