From 9395d3c93c7d4dd37cadaea2ca56b3341074863a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 9 Aug 2018 19:36:44 +1000 Subject: [PATCH 1/3] Implement resize grow|shrink for tiled containers --- sway/commands/resize.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/sway/commands/resize.c b/sway/commands/resize.c index e657864c..8cf4591e 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c @@ -133,12 +133,29 @@ static enum resize_axis parse_resize_axis(const char *axis) { return RESIZE_AXIS_INVALID; } +static enum resize_axis normalize_axis(enum resize_axis axis) { + switch (axis) { + case RESIZE_AXIS_HORIZONTAL: + case RESIZE_AXIS_LEFT: + case RESIZE_AXIS_RIGHT: + return RESIZE_AXIS_HORIZONTAL; + case RESIZE_AXIS_VERTICAL: + case RESIZE_AXIS_UP: + case RESIZE_AXIS_DOWN: + return RESIZE_AXIS_VERTICAL; + case RESIZE_AXIS_INVALID: + sway_assert(false, "Never reached"); + } + sway_assert(false, "Never reached"); + return RESIZE_AXIS_INVALID; +} + static int parallel_coord(struct sway_container *c, enum resize_axis a) { - return a == RESIZE_AXIS_HORIZONTAL ? c->x : c->y; + return normalize_axis(a) == RESIZE_AXIS_HORIZONTAL ? c->x : c->y; } static int parallel_size(struct sway_container *c, enum resize_axis a) { - return a == RESIZE_AXIS_HORIZONTAL ? c->width : c->height; + return normalize_axis(a) == RESIZE_AXIS_HORIZONTAL ? c->width : c->height; } static void resize_tiled(int amount, enum resize_axis axis) { @@ -149,7 +166,7 @@ static void resize_tiled(int amount, enum resize_axis axis) { } enum sway_container_layout parallel_layout = - axis == RESIZE_AXIS_HORIZONTAL ? L_HORIZ : L_VERT; + normalize_axis(axis) == RESIZE_AXIS_HORIZONTAL ? L_HORIZ : L_VERT; int minor_weight = 0; int major_weight = 0; while (parent->parent) { @@ -185,6 +202,15 @@ static void resize_tiled(int amount, enum resize_axis axis) { "Found the proper parent: %p. It has %d l conts, and %d r conts", parent->parent, minor_weight, major_weight); + // Implement up/down/left/right direction by zeroing one of the weights, + // then setting the axis to be horizontal or vertical + if (axis == RESIZE_AXIS_UP || axis == RESIZE_AXIS_LEFT) { + major_weight = 0; + } else if (axis == RESIZE_AXIS_RIGHT || axis == RESIZE_AXIS_DOWN) { + minor_weight = 0; + } + axis = normalize_axis(axis); + int min_sane = axis == RESIZE_AXIS_HORIZONTAL ? MIN_SANE_W : MIN_SANE_H; //TODO: Ensure rounding is done in such a way that there are NO pixel leaks @@ -201,14 +227,14 @@ static void resize_tiled(int amount, enum resize_axis axis) { int parent_size = parallel_size(parent, axis); if (sibling_pos != focused_pos) { - if (sibling_pos < parent_pos) { + if (sibling_pos < parent_pos && minor_weight) { double pixels = -amount / minor_weight; if (major_weight && (sibling_size + pixels / 2) < min_sane) { return; // Too small } else if ((sibling_size + pixels) < min_sane) { return; // Too small } - } else if (sibling_pos > parent_pos) { + } else if (sibling_pos > parent_pos && major_weight) { double pixels = -amount / major_weight; if (minor_weight && (sibling_size + pixels / 2) < min_sane) { return; // Too small @@ -237,7 +263,7 @@ static void resize_tiled(int amount, enum resize_axis axis) { int parent_pos = parallel_coord(parent, axis); if (sibling_pos != focused_pos) { - if (sibling_pos < parent_pos) { + if (sibling_pos < parent_pos && minor_weight) { double pixels = -1 * amount; pixels /= minor_weight; if (major_weight) { @@ -245,7 +271,7 @@ static void resize_tiled(int amount, enum resize_axis axis) { } else { container_recursive_resize(sibling, pixels, major_edge); } - } else if (sibling_pos > parent_pos) { + } else if (sibling_pos > parent_pos && major_weight) { double pixels = -1 * amount; pixels /= major_weight; if (minor_weight) { @@ -355,7 +381,6 @@ static struct cmd_results *resize_adjust_tiled(enum resize_axis axis, } if (amount->unit == RESIZE_UNIT_PPT) { float pct = amount->amount / 100.0f; - // TODO: Make left/right/up/down resize in that direction? switch (axis) { case RESIZE_AXIS_LEFT: case RESIZE_AXIS_RIGHT: From 6c730a2cb2baf8be9e48c6dfa984b29214fc2d62 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 9 Aug 2018 20:25:24 +1000 Subject: [PATCH 2/3] Implement resize set for tiled containers Unlike i3, this implementation allows px measurements. Also fixes a sane size check. --- sway/commands/resize.c | 43 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 8cf4591e..c3560985 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c @@ -231,14 +231,14 @@ static void resize_tiled(int amount, enum resize_axis axis) { double pixels = -amount / minor_weight; if (major_weight && (sibling_size + pixels / 2) < min_sane) { return; // Too small - } else if ((sibling_size + pixels) < min_sane) { + } else if (!major_weight && sibling_size + pixels < min_sane) { return; // Too small } } else if (sibling_pos > parent_pos && major_weight) { double pixels = -amount / major_weight; if (minor_weight && (sibling_size + pixels / 2) < min_sane) { return; // Too small - } else if ((sibling_size + pixels) < min_sane) { + } else if (!minor_weight && sibling_size + pixels < min_sane) { return; // Too small } } @@ -407,8 +407,43 @@ static struct cmd_results *resize_adjust_tiled(enum resize_axis axis, */ static struct cmd_results *resize_set_tiled(struct sway_container *con, struct resize_amount *width, struct resize_amount *height) { - return cmd_results_new(CMD_INVALID, "resize", - "'resize set' is not implemented for tiled views"); + if (width->amount) { + if (width->unit == RESIZE_UNIT_PPT || + width->unit == RESIZE_UNIT_DEFAULT) { + // Convert to px + struct sway_container *parent = con->parent; + while (parent->type >= C_WORKSPACE && parent->layout != L_HORIZ) { + parent = parent->parent; + } + if (parent->type >= C_WORKSPACE) { + width->amount = parent->width * width->amount / 100; + width->unit = RESIZE_UNIT_PX; + } + } + if (width->unit == RESIZE_UNIT_PX) { + resize_tiled(width->amount - con->width, RESIZE_AXIS_HORIZONTAL); + } + } + + if (height->amount) { + if (height->unit == RESIZE_UNIT_PPT || + height->unit == RESIZE_UNIT_DEFAULT) { + // Convert to px + struct sway_container *parent = con->parent; + while (parent->type >= C_WORKSPACE && parent->layout != L_VERT) { + parent = parent->parent; + } + if (parent->type >= C_WORKSPACE) { + height->amount = parent->height * height->amount / 100; + height->unit = RESIZE_UNIT_PX; + } + } + if (height->unit == RESIZE_UNIT_PX) { + resize_tiled(height->amount - con->height, RESIZE_AXIS_VERTICAL); + } + } + + return cmd_results_new(CMD_SUCCESS, NULL, NULL); } /** From af693cba26773ea639644529453900a7ed48a5f6 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 10 Aug 2018 08:50:38 +1000 Subject: [PATCH 3/3] Update resize documentation --- sway/sway.5.scd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sway/sway.5.scd b/sway/sway.5.scd index 31ab281b..a09d06c2 100644 --- a/sway/sway.5.scd +++ b/sway/sway.5.scd @@ -170,16 +170,16 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1). *reload* Reloads the sway config file and applies any changes. -*resize* shrink|grow width|height [] [px|ppt] +*resize* shrink|grow width|height [ [px|ppt]] Resizes the currently focused container by _amount_, specified in pixels or - percentage points. If omitted, floating containers are resized in px and - tiled containers by ppt. If omitted, the default _amount_ is 10. + percentage points. If the units are omitted, floating containers are resized + in px and tiled containers by ppt. _amount_ will default to 10 if omitted. -*resize set* [px] [px] - Sets the width and height of the currently focused container to _width_ - pixels and _height_ pixels. The [px] parameters are optional and have no - effect. This command only accepts a size in pixels. Width and height may be - specified in either order. +*resize set* [px|ppt] [px|ppt] + Sets the width and height of the currently focused container to _width_ and + _height_, specified in pixels or percentage points. If the units are + omitted, floating containers are resized in px and tiled containers by ppt. + If _width_ or _height_ is 0, no resize is done on that axis. *scratchpad show* Shows a window from the scratchpad. Repeatedly using this command will