action: add ToggleSnapToEdge/Region actions

Behaves identical like SnapToEdge and SnapToRegion, but
untiles the window when already being tiled to the given
region or direction.

Co-authored-by: tokyo4j <hrak1529@gmail.com>

diff --git a/docs/labwc-actions.5.scd b/docs/labwc-actions.5.scd
index 6379ccef15fab0a59f4aab826683107d1ae746fe..0731f8cc61f20e2327867489f5ac20c45b39d5f5 100644 (file)
--- a/docs/labwc-actions.5.scd
+++ b/docs/labwc-actions.5.scd
@@ -91,12 +91,21 @@ Actions are used in menus and keyboard/mouse bindings.
        Move window relative to its current position. Positive value of x moves
        it right, negative left. Positive value of y moves it down, negative up.
 
+*<action name="ToggleSnapToEdge" direction="value" />*++
 *<action name="SnapToEdge" direction="value" />*
        Resize window to fill half the output in the given direction. Supports
        directions "left", "up", "right", "down" and "center".
 
+       ToggleSnapToEdge additionally toggles the active window between
+       tiled to the given direction and its untiled position.
+
+*<action name="ToggleSnapToRegion" region="value" />*++
 *<action name="SnapToRegion" region="value" />*
        Resize and move active window according to the given region.
+
+       ToggleSnapToRegion additionally toggles the active window between
+       tiled to the given region and its untiled position.
+
        See labwc-config(5) for further information on how to define regions.
 
 *<action name="NextWindow" />*++

diff --git a/src/action.c b/src/action.c
index 07b2fb3f1b446dc633c6a56c1915ffc6e5308198..fcbfc47ab4cbb45b5b23031b67658c74f43acaac 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -69,6 +69,7 @@ enum action_type {
        ACTION_TYPE_EXECUTE,
        ACTION_TYPE_EXIT,
        ACTION_TYPE_MOVE_TO_EDGE,
+       ACTION_TYPE_TOGGLE_SNAP_TO_EDGE,
        ACTION_TYPE_SNAP_TO_EDGE,
        ACTION_TYPE_GROW_TO_EDGE,
        ACTION_TYPE_SHRINK_TO_EDGE,
@@ -99,6 +100,7 @@ enum action_type {
        ACTION_TYPE_MOVE_RELATIVE,
        ACTION_TYPE_SEND_TO_DESKTOP,
        ACTION_TYPE_GO_TO_DESKTOP,
+       ACTION_TYPE_TOGGLE_SNAP_TO_REGION,
        ACTION_TYPE_SNAP_TO_REGION,
        ACTION_TYPE_TOGGLE_KEYBINDS,
        ACTION_TYPE_FOCUS_OUTPUT,
@@ -130,6 +132,7 @@ const char *action_names[] = {
        "Execute",
        "Exit",
        "MoveToEdge",
+       "ToggleSnapToEdge",
        "SnapToEdge",
        "GrowToEdge",
        "ShrinkToEdge",
@@ -160,6 +163,7 @@ const char *action_names[] = {
        "MoveRelative",
        "SendToDesktop",
        "GoToDesktop",
+       "ToggleSnapToRegion",
        "SnapToRegion",
        "ToggleKeybinds",
        "FocusOutput",
@@ -319,12 +323,15 @@ action_arg_from_xml_node(struct action *action, const char *nodename, const char
                        goto cleanup;
                }
                /* Falls through */
+       case ACTION_TYPE_TOGGLE_SNAP_TO_EDGE:
        case ACTION_TYPE_SNAP_TO_EDGE:
        case ACTION_TYPE_GROW_TO_EDGE:
        case ACTION_TYPE_SHRINK_TO_EDGE:
                if (!strcmp(argument, "direction")) {
                        enum view_edge edge = view_edge_parse(content);
-                       if ((edge == VIEW_EDGE_CENTER && action->type != ACTION_TYPE_SNAP_TO_EDGE)
+                       bool allow_center = action->type == ACTION_TYPE_TOGGLE_SNAP_TO_EDGE
+                               || action->type == ACTION_TYPE_SNAP_TO_EDGE;
+                       if ((edge == VIEW_EDGE_CENTER && !allow_center)
                                        || edge == VIEW_EDGE_INVALID) {
                                wlr_log(WLR_ERROR, "Invalid argument for action %s: '%s' (%s)",
                                        action_names[action->type], argument, content);
@@ -413,6 +420,7 @@ action_arg_from_xml_node(struct action *action, const char *nodename, const char
                        goto cleanup;
                }
                break;
+       case ACTION_TYPE_TOGGLE_SNAP_TO_REGION:
        case ACTION_TYPE_SNAP_TO_REGION:
                if (!strcmp(argument, "region")) {
                        action_arg_add_str(action, argument, content);
@@ -538,6 +546,7 @@ action_is_valid(struct action *action)
                arg_name = "command";
                break;
        case ACTION_TYPE_MOVE_TO_EDGE:
+       case ACTION_TYPE_TOGGLE_SNAP_TO_EDGE:
        case ACTION_TYPE_SNAP_TO_EDGE:
        case ACTION_TYPE_GROW_TO_EDGE:
        case ACTION_TYPE_SHRINK_TO_EDGE:
@@ -551,6 +560,7 @@ action_is_valid(struct action *action)
        case ACTION_TYPE_SEND_TO_DESKTOP:
                arg_name = "to";
                break;
+       case ACTION_TYPE_TOGGLE_SNAP_TO_REGION:
        case ACTION_TYPE_SNAP_TO_REGION:
                arg_name = "region";
                break;
@@ -889,10 +899,20 @@ actions_run(struct view *activator, struct server *server,
                                view_move_to_edge(view, edge, snap_to_windows);
                        }
                        break;
+               case ACTION_TYPE_TOGGLE_SNAP_TO_EDGE:
                case ACTION_TYPE_SNAP_TO_EDGE:
                        if (view) {
                                /* Config parsing makes sure that direction is a valid direction */
                                enum view_edge edge = action_get_int(action, "direction", 0);
+                               if (action->type == ACTION_TYPE_TOGGLE_SNAP_TO_EDGE
+                                               && view->maximized == VIEW_AXIS_NONE
+                                               && !view->fullscreen
+                                               && view_is_tiled(view)
+                                               && view->tiled == edge) {
+                                       view_set_untiled(view);
+                                       view_apply_natural_geometry(view);
+                                       break;
+                               }
                                view_snap_to_edge(view, edge,
                                        /*across_outputs*/ true,
                                        /*store_natural_geometry*/ true);
@@ -1122,6 +1142,7 @@ actions_run(struct view *activator, struct server *server,
                        }
                        view_constrain_size_to_that_of_usable_area(view);
                        break;
+               case ACTION_TYPE_TOGGLE_SNAP_TO_REGION:
                case ACTION_TYPE_SNAP_TO_REGION:
                        if (!view) {
                                break;
@@ -1133,6 +1154,15 @@ actions_run(struct view *activator, struct server *server,
                        const char *region_name = action_get_str(action, "region", NULL);
                        struct region *region = regions_from_name(region_name, output);
                        if (region) {
+                               if (action->type == ACTION_TYPE_TOGGLE_SNAP_TO_REGION
+                                               && view->maximized == VIEW_AXIS_NONE
+                                               && !view->fullscreen
+                                               && view_is_tiled(view)
+                                               && view->tiled_region == region) {
+                                       view_set_untiled(view);
+                                       view_apply_natural_geometry(view);
+                                       break;
+                               }
                                view_snap_to_region(view, region,
                                        /*store_natural_geometry*/ true);
                        } else {