aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sway/resize.h14
-rw-r--r--sway/CMakeLists.txt1
-rw-r--r--sway/commands.c1
-rw-r--r--sway/commands/resize.c343
-rw-r--r--sway/handlers.c1
-rw-r--r--sway/resize.c338
6 files changed, 342 insertions, 356 deletions
diff --git a/include/sway/resize.h b/include/sway/resize.h
deleted file mode 100644
index 0d382994..00000000
--- a/include/sway/resize.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _SWAY_RESIZE_H
-#define _SWAY_RESIZE_H
-#include <stdbool.h>
-
-enum resize_dim_types {
- RESIZE_DIM_PX,
- RESIZE_DIM_PPT,
- RESIZE_DIM_DEFAULT,
-};
-
-bool set_size(int dimension, bool use_width);
-bool resize(int dimension, bool use_width, enum resize_dim_types dim_type);
-
-#endif
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt
index 36c03923..bb9ea81f 100644
--- a/sway/CMakeLists.txt
+++ b/sway/CMakeLists.txt
@@ -33,7 +33,6 @@ add_executable(sway
layout.c
main.c
output.c
- resize.c
workspace.c
border.c
)
diff --git a/sway/commands.c b/sway/commands.c
index 54c104b2..317122cd 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -23,7 +23,6 @@
#include "sway/container.h"
#include "sway/output.h"
#include "sway/handlers.h"
-#include "sway/resize.h"
#include "sway/input_state.h"
#include "sway/criteria.h"
#include "sway/ipc-server.h"
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index 90ab824f..2c5b3f6b 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -1,11 +1,352 @@
#include <errno.h>
+#include <math.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
+#include <wlc/wlc.h>
#include "sway/commands.h"
-#include "sway/resize.h"
+#include "sway/layout.h"
+#include "sway/focus.h"
+#include "sway/input_state.h"
+#include "sway/handlers.h"
#include "log.h"
+enum resize_dim_types {
+ RESIZE_DIM_PX,
+ RESIZE_DIM_PPT,
+ RESIZE_DIM_DEFAULT,
+};
+
+static bool set_size_floating(int new_dimension, bool use_width) {
+ swayc_t *view = get_focused_float(swayc_active_workspace());
+ if (view) {
+ if (use_width) {
+ int current_width = view->width;
+ view->desired_width = new_dimension;
+ floating_view_sane_size(view);
+
+ int new_x = view->x + (int)(((view->desired_width - current_width) / 2) * -1);
+ view->width = view->desired_width;
+ view->x = new_x;
+
+ update_geometry(view);
+ } else {
+ int current_height = view->height;
+ view->desired_height = new_dimension;
+ floating_view_sane_size(view);
+
+ int new_y = view->y + (int)(((view->desired_height - current_height) / 2) * -1);
+ view->height = view->desired_height;
+ view->y = new_y;
+
+ update_geometry(view);
+ }
+
+ return true;
+ }
+
+ return false;
+}
+
+static bool resize_floating(int amount, bool use_width) {
+ swayc_t *view = get_focused_float(swayc_active_workspace());
+
+ if (view) {
+ if (use_width) {
+ return set_size_floating(view->width + amount, true);
+ } else {
+ return set_size_floating(view->height + amount, false);
+ }
+ }
+
+ return false;
+}
+
+static bool resize_tiled(int amount, bool use_width) {
+ swayc_t *parent = get_focused_view(swayc_active_workspace());
+ swayc_t *focused = parent;
+ swayc_t *sibling;
+ if (!parent) {
+ return true;
+ }
+ // Find the closest parent container which has siblings of the proper layout.
+ // Then apply the resize to all of them.
+ int i;
+ if (use_width) {
+ int lnumber = 0;
+ int rnumber = 0;
+ while (parent->parent) {
+ if (parent->parent->layout == L_HORIZ && parent->parent->children) {
+ for (i = 0; i < parent->parent->children->length; i++) {
+ sibling = parent->parent->children->items[i];
+ if (sibling->x != focused->x) {
+ if (sibling->x < parent->x) {
+ lnumber++;
+ } else if (sibling->x > parent->x) {
+ rnumber++;
+ }
+ }
+ }
+ if (rnumber || lnumber) {
+ break;
+ }
+ }
+ parent = parent->parent;
+ }
+ if (parent == &root_container) {
+ return true;
+ }
+ sway_log(L_DEBUG, "Found the proper parent: %p. It has %d l conts, and %d r conts", parent->parent, lnumber, rnumber);
+ //TODO: Ensure rounding is done in such a way that there are NO pixel leaks
+ bool valid = true;
+ for (i = 0; i < parent->parent->children->length; i++) {
+ sibling = parent->parent->children->items[i];
+ if (sibling->x != focused->x) {
+ if (sibling->x < parent->x) {
+ double pixels = -1 * amount;
+ pixels /= lnumber;
+ if (rnumber) {
+ if ((sibling->width + pixels/2) < min_sane_w) {
+ valid = false;
+ break;
+ }
+ } else {
+ if ((sibling->width + pixels) < min_sane_w) {
+ valid = false;
+ break;
+ }
+ }
+ } else if (sibling->x > parent->x) {
+ double pixels = -1 * amount;
+ pixels /= rnumber;
+ if (lnumber) {
+ if ((sibling->width + pixels/2) < min_sane_w) {
+ valid = false;
+ break;
+ }
+ } else {
+ if ((sibling->width + pixels) < min_sane_w) {
+ valid = false;
+ break;
+ }
+ }
+ }
+ } else {
+ double pixels = amount;
+ if (parent->width + pixels < min_sane_w) {
+ valid = false;
+ break;
+ }
+ }
+ }
+ if (valid) {
+ for (i = 0; i < parent->parent->children->length; i++) {
+ sibling = parent->parent->children->items[i];
+ if (sibling->x != focused->x) {
+ if (sibling->x < parent->x) {
+ double pixels = -1 * amount;
+ pixels /= lnumber;
+ if (rnumber) {
+ recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_RIGHT);
+ } else {
+ recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_RIGHT);
+ }
+ } else if (sibling->x > parent->x) {
+ double pixels = -1 * amount;
+ pixels /= rnumber;
+ if (lnumber) {
+ recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_LEFT);
+ } else {
+ recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_LEFT);
+ }
+ }
+ } else {
+ if (rnumber != 0 && lnumber != 0) {
+ double pixels = amount;
+ pixels /= 2;
+ recursive_resize(parent, pixels, WLC_RESIZE_EDGE_LEFT);
+ recursive_resize(parent, pixels, WLC_RESIZE_EDGE_RIGHT);
+ } else if (rnumber) {
+ recursive_resize(parent, amount, WLC_RESIZE_EDGE_RIGHT);
+ } else if (lnumber) {
+ recursive_resize(parent, amount, WLC_RESIZE_EDGE_LEFT);
+ }
+ }
+ }
+ // Recursive resize does not handle positions, let arrange_windows
+ // take care of that.
+ arrange_windows(swayc_active_workspace(), -1, -1);
+ }
+ return true;
+ } else {
+ int tnumber = 0;
+ int bnumber = 0;
+ while (parent->parent) {
+ if (parent->parent->layout == L_VERT) {
+ for (i = 0; i < parent->parent->children->length; i++) {
+ sibling = parent->parent->children->items[i];
+ if (sibling->y != focused->y) {
+ if (sibling->y < parent->y) {
+ bnumber++;
+ } else if (sibling->y > parent->y) {
+ tnumber++;
+ }
+ }
+ }
+ if (bnumber || tnumber) {
+ break;
+ }
+ }
+ parent = parent->parent;
+ }
+ if (parent->parent == NULL || parent->parent->children == NULL) {
+ return true;
+ }
+ sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber);
+ //TODO: Ensure rounding is done in such a way that there are NO pixel leaks
+ bool valid = true;
+ for (i = 0; i < parent->parent->children->length; i++) {
+ sibling = parent->parent->children->items[i];
+ if (sibling->y != focused->y) {
+ if (sibling->y < parent->y) {
+ double pixels = -1 * amount;
+ pixels /= bnumber;
+ if (tnumber) {
+ if ((sibling->height + pixels/2) < min_sane_h) {
+ valid = false;
+ break;
+ }
+ } else {
+ if ((sibling->height + pixels) < min_sane_h) {
+ valid = false;
+ break;
+ }
+ }
+ } else if (sibling->y > parent->y) {
+ double pixels = -1 * amount;
+ pixels /= tnumber;
+ if (bnumber) {
+ if ((sibling->height + pixels/2) < min_sane_h) {
+ valid = false;
+ break;
+ }
+ } else {
+ if ((sibling->height + pixels) < min_sane_h) {
+ valid = false;
+ break;
+ }
+ }
+ }
+ } else {
+ double pixels = amount;
+ if (parent->height + pixels < min_sane_h) {
+ valid = false;
+ break;
+ }
+ }
+ }
+ if (valid) {
+ for (i = 0; i < parent->parent->children->length; i++) {
+ sibling = parent->parent->children->items[i];
+ if (sibling->y != focused->y) {
+ if (sibling->y < parent->y) {
+ double pixels = -1 * amount;
+ pixels /= bnumber;
+ if (tnumber) {
+ recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_BOTTOM);
+ } else {
+ recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_BOTTOM);
+ }
+ } else if (sibling->x > parent->x) {
+ double pixels = -1 * amount;
+ pixels /= tnumber;
+ if (bnumber) {
+ recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_TOP);
+ } else {
+ recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_TOP);
+ }
+ }
+ } else {
+ if (bnumber != 0 && tnumber != 0) {
+ double pixels = amount/2;
+ recursive_resize(parent, pixels, WLC_RESIZE_EDGE_TOP);
+ recursive_resize(parent, pixels, WLC_RESIZE_EDGE_BOTTOM);
+ } else if (tnumber) {
+ recursive_resize(parent, amount, WLC_RESIZE_EDGE_TOP);
+ } else if (bnumber) {
+ recursive_resize(parent, amount, WLC_RESIZE_EDGE_BOTTOM);
+ }
+ }
+ }
+ arrange_windows(swayc_active_workspace(), -1, -1);
+ }
+ return true;
+ }
+ return true;
+}
+
+static bool set_size_tiled(int amount, bool use_width) {
+ int desired;
+ swayc_t *focused = get_focused_view(swayc_active_workspace());
+
+ if (use_width) {
+ desired = amount - focused->width;
+ } else {
+ desired = amount - focused->height;
+ }
+
+ return resize_tiled(desired, use_width);
+}
+
+static bool set_size(int dimension, bool use_width) {
+ swayc_t *focused = get_focused_view_include_floating(swayc_active_workspace());
+
+ if (focused) {
+ if (focused->is_floating) {
+ return set_size_floating(dimension, use_width);
+ } else {
+ return set_size_tiled(dimension, use_width);
+ }
+ }
+
+ return false;
+}
+
+static bool resize(int dimension, bool use_width, enum resize_dim_types dim_type) {
+ swayc_t *focused = get_focused_view_include_floating(swayc_active_workspace());
+
+ // translate "10 ppt" (10%) to appropriate # of pixels in case we need it
+ float ppt_dim = (float)dimension / 100;
+
+ if (use_width) {
+ ppt_dim = focused->width * ppt_dim;
+ } else {
+ ppt_dim = focused->height * ppt_dim;
+ }
+
+ if (focused) {
+ if (focused->is_floating) {
+ // floating view resize dimensions should default to px, so only
+ // use ppt if specified
+ if (dim_type == RESIZE_DIM_PPT) {
+ dimension = (int)ppt_dim;
+ }
+
+ return resize_floating(dimension, use_width);
+ } else {
+ // tiled view resize dimensions should default to ppt, so only use
+ // px if specified
+ if (dim_type != RESIZE_DIM_PX) {
+ dimension = (int)ppt_dim;
+ }
+
+ return resize_tiled(dimension, use_width);
+ }
+ }
+
+ return false;
+}
+
static struct cmd_results *cmd_resize_set(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "resize set", EXPECTED_AT_LEAST, 2))) {
diff --git a/sway/handlers.c b/sway/handlers.c
index 26da5407..1afdcbbb 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -17,7 +17,6 @@
#include "sway/output.h"
#include "sway/focus.h"
#include "sway/input_state.h"
-#include "sway/resize.h"
#include "sway/extensions.h"
#include "sway/criteria.h"
#include "sway/ipc-server.h"
diff --git a/sway/resize.c b/sway/resize.c
deleted file mode 100644
index b32d2431..00000000
--- a/sway/resize.c
+++ /dev/null
@@ -1,338 +0,0 @@
-#include <wlc/wlc.h>
-#include <math.h>
-#include "sway/layout.h"
-#include "sway/focus.h"
-#include "sway/input_state.h"
-#include "sway/handlers.h"
-#include "sway/resize.h"
-#include "log.h"
-
-static bool set_size_floating(int new_dimension, bool use_width) {
- swayc_t *view = get_focused_float(swayc_active_workspace());
- if (view) {
- if (use_width) {
- int current_width = view->width;
- view->desired_width = new_dimension;
- floating_view_sane_size(view);
-
- int new_x = view->x + (int)(((view->desired_width - current_width) / 2) * -1);
- view->width = view->desired_width;
- view->x = new_x;
-
- update_geometry(view);
- } else {
- int current_height = view->height;
- view->desired_height = new_dimension;
- floating_view_sane_size(view);
-
- int new_y = view->y + (int)(((view->desired_height - current_height) / 2) * -1);
- view->height = view->desired_height;
- view->y = new_y;
-
- update_geometry(view);
- }
-
- return true;
- }
-
- return false;
-}
-
-static bool resize_floating(int amount, bool use_width) {
- swayc_t *view = get_focused_float(swayc_active_workspace());
-
- if (view) {
- if (use_width) {
- return set_size_floating(view->width + amount, true);
- } else {
- return set_size_floating(view->height + amount, false);
- }
- }
-
- return false;
-}
-
-static bool resize_tiled(int amount, bool use_width) {
- swayc_t *parent = get_focused_view(swayc_active_workspace());
- swayc_t *focused = parent;
- swayc_t *sibling;
- if (!parent) {
- return true;
- }
- // Find the closest parent container which has siblings of the proper layout.
- // Then apply the resize to all of them.
- int i;
- if (use_width) {
- int lnumber = 0;
- int rnumber = 0;
- while (parent->parent) {
- if (parent->parent->layout == L_HORIZ && parent->parent->children) {
- for (i = 0; i < parent->parent->children->length; i++) {
- sibling = parent->parent->children->items[i];
- if (sibling->x != focused->x) {
- if (sibling->x < parent->x) {
- lnumber++;
- } else if (sibling->x > parent->x) {
- rnumber++;
- }
- }
- }
- if (rnumber || lnumber) {
- break;
- }
- }
- parent = parent->parent;
- }
- if (parent == &root_container) {
- return true;
- }
- sway_log(L_DEBUG, "Found the proper parent: %p. It has %d l conts, and %d r conts", parent->parent, lnumber, rnumber);
- //TODO: Ensure rounding is done in such a way that there are NO pixel leaks
- bool valid = true;
- for (i = 0; i < parent->parent->children->length; i++) {
- sibling = parent->parent->children->items[i];
- if (sibling->x != focused->x) {
- if (sibling->x < parent->x) {
- double pixels = -1 * amount;
- pixels /= lnumber;
- if (rnumber) {
- if ((sibling->width + pixels/2) < min_sane_w) {
- valid = false;
- break;
- }
- } else {
- if ((sibling->width + pixels) < min_sane_w) {
- valid = false;
- break;
- }
- }
- } else if (sibling->x > parent->x) {
- double pixels = -1 * amount;
- pixels /= rnumber;
- if (lnumber) {
- if ((sibling->width + pixels/2) < min_sane_w) {
- valid = false;
- break;
- }
- } else {
- if ((sibling->width + pixels) < min_sane_w) {
- valid = false;
- break;
- }
- }
- }
- } else {
- double pixels = amount;
- if (parent->width + pixels < min_sane_w) {
- valid = false;
- break;
- }
- }
- }
- if (valid) {
- for (i = 0; i < parent->parent->children->length; i++) {
- sibling = parent->parent->children->items[i];
- if (sibling->x != focused->x) {
- if (sibling->x < parent->x) {
- double pixels = -1 * amount;
- pixels /= lnumber;
- if (rnumber) {
- recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_RIGHT);
- } else {
- recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_RIGHT);
- }
- } else if (sibling->x > parent->x) {
- double pixels = -1 * amount;
- pixels /= rnumber;
- if (lnumber) {
- recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_LEFT);
- } else {
- recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_LEFT);
- }
- }
- } else {
- if (rnumber != 0 && lnumber != 0) {
- double pixels = amount;
- pixels /= 2;
- recursive_resize(parent, pixels, WLC_RESIZE_EDGE_LEFT);
- recursive_resize(parent, pixels, WLC_RESIZE_EDGE_RIGHT);
- } else if (rnumber) {
- recursive_resize(parent, amount, WLC_RESIZE_EDGE_RIGHT);
- } else if (lnumber) {
- recursive_resize(parent, amount, WLC_RESIZE_EDGE_LEFT);
- }
- }
- }
- // Recursive resize does not handle positions, let arrange_windows
- // take care of that.
- arrange_windows(swayc_active_workspace(), -1, -1);
- }
- return true;
- } else {
- int tnumber = 0;
- int bnumber = 0;
- while (parent->parent) {
- if (parent->parent->layout == L_VERT) {
- for (i = 0; i < parent->parent->children->length; i++) {
- sibling = parent->parent->children->items[i];
- if (sibling->y != focused->y) {
- if (sibling->y < parent->y) {
- bnumber++;
- } else if (sibling->y > parent->y) {
- tnumber++;
- }
- }
- }
- if (bnumber || tnumber) {
- break;
- }
- }
- parent = parent->parent;
- }
- if (parent->parent == NULL || parent->parent->children == NULL) {
- return true;
- }
- sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber);
- //TODO: Ensure rounding is done in such a way that there are NO pixel leaks
- bool valid = true;
- for (i = 0; i < parent->parent->children->length; i++) {
- sibling = parent->parent->children->items[i];
- if (sibling->y != focused->y) {
- if (sibling->y < parent->y) {
- double pixels = -1 * amount;
- pixels /= bnumber;
- if (tnumber) {
- if ((sibling->height + pixels/2) < min_sane_h) {
- valid = false;
- break;
- }
- } else {
- if ((sibling->height + pixels) < min_sane_h) {
- valid = false;
- break;
- }
- }
- } else if (sibling->y > parent->y) {
- double pixels = -1 * amount;
- pixels /= tnumber;
- if (bnumber) {
- if ((sibling->height + pixels/2) < min_sane_h) {
- valid = false;
- break;
- }
- } else {
- if ((sibling->height + pixels) < min_sane_h) {
- valid = false;
- break;
- }
- }
- }
- } else {
- double pixels = amount;
- if (parent->height + pixels < min_sane_h) {
- valid = false;
- break;
- }
- }
- }
- if (valid) {
- for (i = 0; i < parent->parent->children->length; i++) {
- sibling = parent->parent->children->items[i];
- if (sibling->y != focused->y) {
- if (sibling->y < parent->y) {
- double pixels = -1 * amount;
- pixels /= bnumber;
- if (tnumber) {
- recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_BOTTOM);
- } else {
- recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_BOTTOM);
- }
- } else if (sibling->x > parent->x) {
- double pixels = -1 * amount;
- pixels /= tnumber;
- if (bnumber) {
- recursive_resize(sibling, pixels/2, WLC_RESIZE_EDGE_TOP);
- } else {
- recursive_resize(sibling, pixels, WLC_RESIZE_EDGE_TOP);
- }
- }
- } else {
- if (bnumber != 0 && tnumber != 0) {
- double pixels = amount/2;
- recursive_resize(parent, pixels, WLC_RESIZE_EDGE_TOP);
- recursive_resize(parent, pixels, WLC_RESIZE_EDGE_BOTTOM);
- } else if (tnumber) {
- recursive_resize(parent, amount, WLC_RESIZE_EDGE_TOP);
- } else if (bnumber) {
- recursive_resize(parent, amount, WLC_RESIZE_EDGE_BOTTOM);
- }
- }
- }
- arrange_windows(swayc_active_workspace(), -1, -1);
- }
- return true;
- }
- return true;
-}
-
-static bool set_size_tiled(int amount, bool use_width) {
- int desired;
- swayc_t *focused = get_focused_view(swayc_active_workspace());
-
- if (use_width) {
- desired = amount - focused->width;
- } else {
- desired = amount - focused->height;
- }
-
- return resize_tiled(desired, use_width);
-}
-
-bool set_size(int dimension, bool use_width) {
- swayc_t *focused = get_focused_view_include_floating(swayc_active_workspace());
-
- if (focused) {
- if (focused->is_floating) {
- return set_size_floating(dimension, use_width);
- } else {
- return set_size_tiled(dimension, use_width);
- }
- }
-
- return false;
-}
-
-bool resize(int dimension, bool use_width, enum resize_dim_types dim_type) {
- swayc_t *focused = get_focused_view_include_floating(swayc_active_workspace());
-
- // translate "10 ppt" (10%) to appropriate # of pixels in case we need it
- float ppt_dim = (float)dimension / 100;
-
- if (use_width) {
- ppt_dim = focused->width * ppt_dim;
- } else {
- ppt_dim = focused->height * ppt_dim;
- }
-
- if (focused) {
- if (focused->is_floating) {
- // floating view resize dimensions should default to px, so only
- // use ppt if specified
- if (dim_type == RESIZE_DIM_PPT) {
- dimension = (int)ppt_dim;
- }
-
- return resize_floating(dimension, use_width);
- } else {
- // tiled view resize dimensions should default to ppt, so only use
- // px if specified
- if (dim_type != RESIZE_DIM_PX) {
- dimension = (int)ppt_dim;
- }
-
- return resize_tiled(dimension, use_width);
- }
- }
-
- return false;
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 17:35:08 +0000