2018-04-05 11:32:31 +10:00
|
|
|
#include <errno.h>
|
2018-07-14 10:00:22 +10:00
|
|
|
#include <limits.h>
|
2018-04-05 11:32:31 +10:00
|
|
|
#include <math.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <strings.h>
|
2018-08-21 12:41:57 +10:00
|
|
|
#include <wlr/util/edges.h>
|
2018-04-05 11:32:31 +10:00
|
|
|
#include <wlr/util/log.h>
|
|
|
|
#include "sway/commands.h"
|
2018-04-28 11:26:14 +10:00
|
|
|
#include "sway/tree/arrange.h"
|
2018-07-11 21:30:43 +10:00
|
|
|
#include "sway/tree/view.h"
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
#include "sway/tree/workspace.h"
|
2018-04-05 11:32:31 +10:00
|
|
|
#include "log.h"
|
|
|
|
|
|
|
|
static const int MIN_SANE_W = 100, MIN_SANE_H = 60;
|
|
|
|
|
|
|
|
enum resize_unit {
|
|
|
|
RESIZE_UNIT_PX,
|
|
|
|
RESIZE_UNIT_PPT,
|
|
|
|
RESIZE_UNIT_DEFAULT,
|
|
|
|
RESIZE_UNIT_INVALID,
|
|
|
|
};
|
|
|
|
|
|
|
|
enum resize_axis {
|
|
|
|
RESIZE_AXIS_HORIZONTAL,
|
|
|
|
RESIZE_AXIS_VERTICAL,
|
2018-07-11 21:30:43 +10:00
|
|
|
RESIZE_AXIS_UP,
|
|
|
|
RESIZE_AXIS_DOWN,
|
|
|
|
RESIZE_AXIS_LEFT,
|
|
|
|
RESIZE_AXIS_RIGHT,
|
2018-04-05 11:32:31 +10:00
|
|
|
RESIZE_AXIS_INVALID,
|
|
|
|
};
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
struct resize_amount {
|
|
|
|
int amount;
|
|
|
|
enum resize_unit unit;
|
|
|
|
};
|
|
|
|
|
2018-04-05 11:32:31 +10:00
|
|
|
static enum resize_unit parse_resize_unit(const char *unit) {
|
|
|
|
if (strcasecmp(unit, "px") == 0) {
|
|
|
|
return RESIZE_UNIT_PX;
|
|
|
|
}
|
|
|
|
if (strcasecmp(unit, "ppt") == 0) {
|
|
|
|
return RESIZE_UNIT_PPT;
|
|
|
|
}
|
|
|
|
if (strcasecmp(unit, "default") == 0) {
|
|
|
|
return RESIZE_UNIT_DEFAULT;
|
|
|
|
}
|
|
|
|
return RESIZE_UNIT_INVALID;
|
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
// Parse arguments such as "10", "10px" or "10 px".
|
|
|
|
// Returns the number of arguments consumed.
|
|
|
|
static int parse_resize_amount(int argc, char **argv,
|
|
|
|
struct resize_amount *amount) {
|
|
|
|
char *err;
|
|
|
|
amount->amount = (int)strtol(argv[0], &err, 10);
|
|
|
|
if (*err) {
|
|
|
|
// e.g. 10px
|
|
|
|
amount->unit = parse_resize_unit(err);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (argc == 1) {
|
|
|
|
amount->unit = RESIZE_UNIT_DEFAULT;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
// Try the second argument
|
|
|
|
amount->unit = parse_resize_unit(argv[1]);
|
|
|
|
if (amount->unit == RESIZE_UNIT_INVALID) {
|
|
|
|
amount->unit = RESIZE_UNIT_DEFAULT;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
|
2018-07-14 10:00:22 +10:00
|
|
|
static void calculate_constraints(int *min_width, int *max_width,
|
|
|
|
int *min_height, int *max_height) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
struct sway_container *con = config->handler_context.container;
|
2018-07-14 10:00:22 +10:00
|
|
|
|
|
|
|
if (config->floating_minimum_width == -1) { // no minimum
|
|
|
|
*min_width = 0;
|
|
|
|
} else if (config->floating_minimum_width == 0) { // automatic
|
|
|
|
*min_width = 75;
|
|
|
|
} else {
|
|
|
|
*min_width = config->floating_minimum_width;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (config->floating_minimum_height == -1) { // no minimum
|
|
|
|
*min_height = 0;
|
|
|
|
} else if (config->floating_minimum_height == 0) { // automatic
|
|
|
|
*min_height = 50;
|
|
|
|
} else {
|
|
|
|
*min_height = config->floating_minimum_height;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (config->floating_maximum_width == -1) { // no maximum
|
|
|
|
*max_width = INT_MAX;
|
|
|
|
} else if (config->floating_maximum_width == 0) { // automatic
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
*max_width = con->workspace->width;
|
2018-07-14 10:00:22 +10:00
|
|
|
} else {
|
|
|
|
*max_width = config->floating_maximum_width;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (config->floating_maximum_height == -1) { // no maximum
|
|
|
|
*max_height = INT_MAX;
|
|
|
|
} else if (config->floating_maximum_height == 0) { // automatic
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
*max_height = con->workspace->height;
|
2018-07-14 10:00:22 +10:00
|
|
|
} else {
|
|
|
|
*max_height = config->floating_maximum_height;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-05 11:32:31 +10:00
|
|
|
static enum resize_axis parse_resize_axis(const char *axis) {
|
|
|
|
if (strcasecmp(axis, "width") == 0 || strcasecmp(axis, "horizontal") == 0) {
|
|
|
|
return RESIZE_AXIS_HORIZONTAL;
|
|
|
|
}
|
|
|
|
if (strcasecmp(axis, "height") == 0 || strcasecmp(axis, "vertical") == 0) {
|
|
|
|
return RESIZE_AXIS_VERTICAL;
|
|
|
|
}
|
2018-07-11 21:30:43 +10:00
|
|
|
if (strcasecmp(axis, "up") == 0) {
|
|
|
|
return RESIZE_AXIS_UP;
|
|
|
|
}
|
|
|
|
if (strcasecmp(axis, "down") == 0) {
|
|
|
|
return RESIZE_AXIS_DOWN;
|
|
|
|
}
|
|
|
|
if (strcasecmp(axis, "left") == 0) {
|
|
|
|
return RESIZE_AXIS_LEFT;
|
|
|
|
}
|
|
|
|
if (strcasecmp(axis, "right") == 0) {
|
|
|
|
return RESIZE_AXIS_RIGHT;
|
|
|
|
}
|
2018-04-05 11:32:31 +10:00
|
|
|
return RESIZE_AXIS_INVALID;
|
|
|
|
}
|
|
|
|
|
2018-08-09 19:36:44 +10:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2018-04-05 11:32:31 +10:00
|
|
|
static int parallel_coord(struct sway_container *c, enum resize_axis a) {
|
2018-08-09 19:36:44 +10:00
|
|
|
return normalize_axis(a) == RESIZE_AXIS_HORIZONTAL ? c->x : c->y;
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
|
|
|
|
static int parallel_size(struct sway_container *c, enum resize_axis a) {
|
2018-08-09 19:36:44 +10:00
|
|
|
return normalize_axis(a) == RESIZE_AXIS_HORIZONTAL ? c->width : c->height;
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
|
2018-08-26 12:05:16 +10:00
|
|
|
static void container_recursive_resize(struct sway_container *container,
|
|
|
|
double amount, enum wlr_edges edge) {
|
|
|
|
bool layout_match = true;
|
|
|
|
wlr_log(WLR_DEBUG, "Resizing %p with amount: %f", container, amount);
|
|
|
|
if (edge == WLR_EDGE_LEFT || edge == WLR_EDGE_RIGHT) {
|
|
|
|
container->width += amount;
|
|
|
|
layout_match = container->layout == L_HORIZ;
|
|
|
|
} else if (edge == WLR_EDGE_TOP || edge == WLR_EDGE_BOTTOM) {
|
|
|
|
container->height += amount;
|
|
|
|
layout_match = container->layout == L_VERT;
|
|
|
|
}
|
|
|
|
if (container->children) {
|
|
|
|
for (int i = 0; i < container->children->length; i++) {
|
|
|
|
struct sway_container *child = container->children->items[i];
|
|
|
|
double amt = layout_match ?
|
|
|
|
amount / container->children->length : amount;
|
|
|
|
container_recursive_resize(child, amt, edge);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-29 17:05:55 +10:00
|
|
|
static bool resize_tiled(struct sway_container *parent, int amount,
|
2018-08-10 14:10:09 +10:00
|
|
|
enum resize_axis axis) {
|
2018-04-05 11:32:31 +10:00
|
|
|
struct sway_container *focused = parent;
|
|
|
|
if (!parent) {
|
2018-09-29 17:05:55 +10:00
|
|
|
return false;
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
|
|
|
|
enum sway_container_layout parallel_layout =
|
2018-08-09 19:36:44 +10:00
|
|
|
normalize_axis(axis) == RESIZE_AXIS_HORIZONTAL ? L_HORIZ : L_VERT;
|
2018-04-05 11:32:31 +10:00
|
|
|
int minor_weight = 0;
|
|
|
|
int major_weight = 0;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
while (parent) {
|
|
|
|
list_t *siblings = container_get_siblings(parent);
|
|
|
|
if (container_parent_layout(parent) == parallel_layout) {
|
|
|
|
for (int i = 0; i < siblings->length; i++) {
|
|
|
|
struct sway_container *sibling = siblings->items[i];
|
2018-04-05 11:32:31 +10:00
|
|
|
|
|
|
|
int sibling_pos = parallel_coord(sibling, axis);
|
|
|
|
int focused_pos = parallel_coord(focused, axis);
|
|
|
|
int parent_pos = parallel_coord(parent, axis);
|
|
|
|
|
|
|
|
if (sibling_pos != focused_pos) {
|
|
|
|
if (sibling_pos < parent_pos) {
|
|
|
|
minor_weight++;
|
|
|
|
} else if (sibling_pos > parent_pos) {
|
|
|
|
major_weight++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (major_weight || minor_weight) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
parent = parent->parent;
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
if (!parent) {
|
|
|
|
// Can't resize in this direction
|
2018-09-29 17:05:55 +10:00
|
|
|
return false;
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
|
2018-08-09 19:36:44 +10:00
|
|
|
// 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);
|
|
|
|
|
2018-04-05 11:32:31 +10:00
|
|
|
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
|
|
|
|
// ^ ?????
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
list_t *siblings = container_get_siblings(parent);
|
2018-04-05 11:32:31 +10:00
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
for (int i = 0; i < siblings->length; i++) {
|
|
|
|
struct sway_container *sibling = siblings->items[i];
|
2018-04-05 11:32:31 +10:00
|
|
|
|
|
|
|
int sibling_pos = parallel_coord(sibling, axis);
|
|
|
|
int focused_pos = parallel_coord(focused, axis);
|
|
|
|
int parent_pos = parallel_coord(parent, axis);
|
|
|
|
|
|
|
|
int sibling_size = parallel_size(sibling, axis);
|
|
|
|
int parent_size = parallel_size(parent, axis);
|
|
|
|
|
|
|
|
if (sibling_pos != focused_pos) {
|
2018-08-09 19:36:44 +10:00
|
|
|
if (sibling_pos < parent_pos && minor_weight) {
|
2018-04-05 11:32:31 +10:00
|
|
|
double pixels = -amount / minor_weight;
|
|
|
|
if (major_weight && (sibling_size + pixels / 2) < min_sane) {
|
2018-09-29 17:05:55 +10:00
|
|
|
return false; // Too small
|
2018-08-09 20:25:24 +10:00
|
|
|
} else if (!major_weight && sibling_size + pixels < min_sane) {
|
2018-09-29 17:05:55 +10:00
|
|
|
return false; // Too small
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
2018-08-09 19:36:44 +10:00
|
|
|
} else if (sibling_pos > parent_pos && major_weight) {
|
2018-04-05 11:32:31 +10:00
|
|
|
double pixels = -amount / major_weight;
|
|
|
|
if (minor_weight && (sibling_size + pixels / 2) < min_sane) {
|
2018-09-29 17:05:55 +10:00
|
|
|
return false; // Too small
|
2018-08-09 20:25:24 +10:00
|
|
|
} else if (!minor_weight && sibling_size + pixels < min_sane) {
|
2018-09-29 17:05:55 +10:00
|
|
|
return false; // Too small
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
double pixels = amount;
|
|
|
|
if (parent_size + pixels < min_sane) {
|
2018-09-29 17:05:55 +10:00
|
|
|
return false; // Too small
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-21 12:41:57 +10:00
|
|
|
enum wlr_edges minor_edge = axis == RESIZE_AXIS_HORIZONTAL ?
|
|
|
|
WLR_EDGE_LEFT : WLR_EDGE_TOP;
|
|
|
|
enum wlr_edges major_edge = axis == RESIZE_AXIS_HORIZONTAL ?
|
|
|
|
WLR_EDGE_RIGHT : WLR_EDGE_BOTTOM;
|
2018-04-05 11:32:31 +10:00
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
for (int i = 0; i < siblings->length; i++) {
|
|
|
|
struct sway_container *sibling = siblings->items[i];
|
2018-04-05 11:32:31 +10:00
|
|
|
|
|
|
|
int sibling_pos = parallel_coord(sibling, axis);
|
|
|
|
int focused_pos = parallel_coord(focused, axis);
|
|
|
|
int parent_pos = parallel_coord(parent, axis);
|
|
|
|
|
|
|
|
if (sibling_pos != focused_pos) {
|
2018-08-09 19:36:44 +10:00
|
|
|
if (sibling_pos < parent_pos && minor_weight) {
|
2018-04-05 11:32:31 +10:00
|
|
|
double pixels = -1 * amount;
|
|
|
|
pixels /= minor_weight;
|
|
|
|
if (major_weight) {
|
|
|
|
container_recursive_resize(sibling, pixels / 2, major_edge);
|
|
|
|
} else {
|
|
|
|
container_recursive_resize(sibling, pixels, major_edge);
|
|
|
|
}
|
2018-08-09 19:36:44 +10:00
|
|
|
} else if (sibling_pos > parent_pos && major_weight) {
|
2018-04-05 11:32:31 +10:00
|
|
|
double pixels = -1 * amount;
|
|
|
|
pixels /= major_weight;
|
|
|
|
if (minor_weight) {
|
|
|
|
container_recursive_resize(sibling, pixels / 2, minor_edge);
|
|
|
|
} else {
|
|
|
|
container_recursive_resize(sibling, pixels, minor_edge);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (major_weight != 0 && minor_weight != 0) {
|
|
|
|
double pixels = amount;
|
|
|
|
pixels /= 2;
|
|
|
|
container_recursive_resize(parent, pixels, minor_edge);
|
|
|
|
container_recursive_resize(parent, pixels, major_edge);
|
|
|
|
} else if (major_weight) {
|
|
|
|
container_recursive_resize(parent, amount, major_edge);
|
|
|
|
} else if (minor_weight) {
|
|
|
|
container_recursive_resize(parent, amount, minor_edge);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
if (parent->parent) {
|
|
|
|
arrange_container(parent->parent);
|
|
|
|
} else {
|
|
|
|
arrange_workspace(parent->workspace);
|
|
|
|
}
|
2018-09-29 17:05:55 +10:00
|
|
|
return true;
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
|
2018-09-29 17:05:55 +10:00
|
|
|
bool container_resize_tiled(struct sway_container *parent,
|
2018-08-10 14:10:09 +10:00
|
|
|
enum wlr_edges edge, int amount) {
|
|
|
|
enum resize_axis axis = RESIZE_AXIS_INVALID;
|
|
|
|
switch (edge) {
|
|
|
|
case WLR_EDGE_TOP:
|
|
|
|
axis = RESIZE_AXIS_UP;
|
|
|
|
break;
|
|
|
|
case WLR_EDGE_RIGHT:
|
|
|
|
axis = RESIZE_AXIS_RIGHT;
|
|
|
|
break;
|
|
|
|
case WLR_EDGE_BOTTOM:
|
|
|
|
axis = RESIZE_AXIS_DOWN;
|
|
|
|
break;
|
|
|
|
case WLR_EDGE_LEFT:
|
|
|
|
axis = RESIZE_AXIS_LEFT;
|
|
|
|
break;
|
|
|
|
case WLR_EDGE_NONE:
|
|
|
|
break;
|
|
|
|
}
|
2018-09-29 17:05:55 +10:00
|
|
|
return resize_tiled(parent, amount, axis);
|
2018-08-10 14:10:09 +10:00
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
/**
|
|
|
|
* Implement `resize <grow|shrink>` for a floating container.
|
|
|
|
*/
|
|
|
|
static struct cmd_results *resize_adjust_floating(enum resize_axis axis,
|
|
|
|
struct resize_amount *amount) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
struct sway_container *con = config->handler_context.container;
|
2018-07-11 21:30:43 +10:00
|
|
|
int grow_width = 0, grow_height = 0;
|
|
|
|
switch (axis) {
|
|
|
|
case RESIZE_AXIS_HORIZONTAL:
|
2018-07-14 10:00:22 +10:00
|
|
|
case RESIZE_AXIS_LEFT:
|
|
|
|
case RESIZE_AXIS_RIGHT:
|
2018-07-13 18:06:11 +10:00
|
|
|
grow_width = amount->amount;
|
2018-07-11 21:30:43 +10:00
|
|
|
break;
|
|
|
|
case RESIZE_AXIS_VERTICAL:
|
2018-07-14 10:00:22 +10:00
|
|
|
case RESIZE_AXIS_UP:
|
|
|
|
case RESIZE_AXIS_DOWN:
|
2018-07-13 18:06:11 +10:00
|
|
|
grow_height = amount->amount;
|
2018-07-11 21:30:43 +10:00
|
|
|
break;
|
2018-07-14 10:00:22 +10:00
|
|
|
case RESIZE_AXIS_INVALID:
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize", "Invalid axis/direction");
|
|
|
|
}
|
|
|
|
// Make sure we're not adjusting beyond floating min/max size
|
|
|
|
int min_width, max_width, min_height, max_height;
|
|
|
|
calculate_constraints(&min_width, &max_width, &min_height, &max_height);
|
|
|
|
if (con->width + grow_width < min_width) {
|
|
|
|
grow_width = min_width - con->width;
|
|
|
|
} else if (con->width + grow_width > max_width) {
|
|
|
|
grow_width = max_width - con->width;
|
|
|
|
}
|
|
|
|
if (con->height + grow_height < min_height) {
|
|
|
|
grow_height = min_height - con->height;
|
|
|
|
} else if (con->height + grow_height > max_height) {
|
|
|
|
grow_height = max_height - con->height;
|
|
|
|
}
|
|
|
|
int grow_x = 0, grow_y = 0;
|
|
|
|
switch (axis) {
|
|
|
|
case RESIZE_AXIS_HORIZONTAL:
|
|
|
|
grow_x = -grow_width / 2;
|
|
|
|
break;
|
|
|
|
case RESIZE_AXIS_VERTICAL:
|
|
|
|
grow_y = -grow_height / 2;
|
|
|
|
break;
|
2018-07-11 21:30:43 +10:00
|
|
|
case RESIZE_AXIS_UP:
|
2018-07-14 10:00:22 +10:00
|
|
|
grow_y = -grow_height;
|
2018-07-11 21:30:43 +10:00
|
|
|
break;
|
|
|
|
case RESIZE_AXIS_LEFT:
|
2018-07-14 10:00:22 +10:00
|
|
|
grow_x = -grow_width;
|
2018-07-11 21:30:43 +10:00
|
|
|
break;
|
|
|
|
case RESIZE_AXIS_DOWN:
|
|
|
|
case RESIZE_AXIS_RIGHT:
|
|
|
|
break;
|
|
|
|
case RESIZE_AXIS_INVALID:
|
2018-07-13 18:06:11 +10:00
|
|
|
return cmd_results_new(CMD_INVALID, "resize", "Invalid axis/direction");
|
2018-07-11 21:30:43 +10:00
|
|
|
}
|
2018-09-29 17:05:55 +10:00
|
|
|
if (grow_x == 0 && grow_y == 0) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize",
|
|
|
|
"Cannot resize any further");
|
|
|
|
}
|
2018-07-11 21:30:43 +10:00
|
|
|
con->x += grow_x;
|
|
|
|
con->y += grow_y;
|
|
|
|
con->width += grow_width;
|
|
|
|
con->height += grow_height;
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
if (con->view) {
|
|
|
|
struct sway_view *view = con->view;
|
2018-07-11 21:30:43 +10:00
|
|
|
view->x += grow_x;
|
|
|
|
view->y += grow_y;
|
|
|
|
view->width += grow_width;
|
|
|
|
view->height += grow_height;
|
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
arrange_container(con);
|
2018-07-13 18:06:11 +10:00
|
|
|
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
2018-07-11 21:30:43 +10:00
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
/**
|
|
|
|
* Implement `resize <grow|shrink>` for a tiled container.
|
|
|
|
*/
|
|
|
|
static struct cmd_results *resize_adjust_tiled(enum resize_axis axis,
|
|
|
|
struct resize_amount *amount) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
struct sway_container *current = config->handler_context.container;
|
2018-07-11 21:30:43 +10:00
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
if (amount->unit == RESIZE_UNIT_DEFAULT) {
|
|
|
|
amount->unit = RESIZE_UNIT_PPT;
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
2018-07-13 18:06:11 +10:00
|
|
|
if (amount->unit == RESIZE_UNIT_PPT) {
|
|
|
|
float pct = amount->amount / 100.0f;
|
2018-04-05 11:32:31 +10:00
|
|
|
switch (axis) {
|
2018-07-13 18:06:11 +10:00
|
|
|
case RESIZE_AXIS_LEFT:
|
|
|
|
case RESIZE_AXIS_RIGHT:
|
2018-04-05 11:32:31 +10:00
|
|
|
case RESIZE_AXIS_HORIZONTAL:
|
2018-07-13 18:06:11 +10:00
|
|
|
amount->amount = (float)current->width * pct;
|
2018-04-05 11:32:31 +10:00
|
|
|
break;
|
2018-07-13 18:06:11 +10:00
|
|
|
case RESIZE_AXIS_UP:
|
|
|
|
case RESIZE_AXIS_DOWN:
|
2018-04-05 11:32:31 +10:00
|
|
|
case RESIZE_AXIS_VERTICAL:
|
2018-07-13 18:06:11 +10:00
|
|
|
amount->amount = (float)current->height * pct;
|
2018-04-05 11:32:31 +10:00
|
|
|
break;
|
2018-07-13 18:06:11 +10:00
|
|
|
case RESIZE_AXIS_INVALID:
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize",
|
|
|
|
"Invalid resize axis/direction");
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-29 17:05:55 +10:00
|
|
|
if (!resize_tiled(current, amount->amount, axis)) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize",
|
|
|
|
"Cannot resize any further");
|
|
|
|
}
|
2018-07-13 18:06:11 +10:00
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
/**
|
|
|
|
* Implement `resize set` for a tiled container.
|
|
|
|
*/
|
|
|
|
static struct cmd_results *resize_set_tiled(struct sway_container *con,
|
|
|
|
struct resize_amount *width, struct resize_amount *height) {
|
2018-08-09 20:25:24 +10:00
|
|
|
if (width->amount) {
|
|
|
|
if (width->unit == RESIZE_UNIT_PPT ||
|
|
|
|
width->unit == RESIZE_UNIT_DEFAULT) {
|
|
|
|
// Convert to px
|
|
|
|
struct sway_container *parent = con->parent;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
while (parent && parent->layout != L_HORIZ) {
|
2018-08-09 20:25:24 +10:00
|
|
|
parent = parent->parent;
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
if (parent) {
|
2018-08-09 20:25:24 +10:00
|
|
|
width->amount = parent->width * width->amount / 100;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
} else {
|
|
|
|
width->amount = con->workspace->width * width->amount / 100;
|
2018-08-09 20:25:24 +10:00
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
width->unit = RESIZE_UNIT_PX;
|
2018-08-09 20:25:24 +10:00
|
|
|
}
|
|
|
|
if (width->unit == RESIZE_UNIT_PX) {
|
2018-08-10 14:10:09 +10:00
|
|
|
resize_tiled(con, width->amount - con->width,
|
|
|
|
RESIZE_AXIS_HORIZONTAL);
|
2018-08-09 20:25:24 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (height->amount) {
|
|
|
|
if (height->unit == RESIZE_UNIT_PPT ||
|
|
|
|
height->unit == RESIZE_UNIT_DEFAULT) {
|
|
|
|
// Convert to px
|
|
|
|
struct sway_container *parent = con->parent;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
while (parent && parent->layout != L_VERT) {
|
2018-08-09 20:25:24 +10:00
|
|
|
parent = parent->parent;
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
if (parent) {
|
2018-08-09 20:25:24 +10:00
|
|
|
height->amount = parent->height * height->amount / 100;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
} else {
|
|
|
|
height->amount = con->workspace->height * height->amount / 100;
|
2018-08-09 20:25:24 +10:00
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
height->unit = RESIZE_UNIT_PX;
|
2018-08-09 20:25:24 +10:00
|
|
|
}
|
|
|
|
if (height->unit == RESIZE_UNIT_PX) {
|
2018-08-10 14:10:09 +10:00
|
|
|
resize_tiled(con, height->amount - con->height,
|
|
|
|
RESIZE_AXIS_HORIZONTAL);
|
2018-08-09 20:25:24 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
2018-07-13 18:06:11 +10:00
|
|
|
}
|
2018-07-11 21:30:43 +10:00
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
/**
|
|
|
|
* Implement `resize set` for a floating container.
|
|
|
|
*/
|
|
|
|
static struct cmd_results *resize_set_floating(struct sway_container *con,
|
|
|
|
struct resize_amount *width, struct resize_amount *height) {
|
2018-07-14 10:00:22 +10:00
|
|
|
int min_width, max_width, min_height, max_height;
|
|
|
|
calculate_constraints(&min_width, &max_width, &min_height, &max_height);
|
|
|
|
width->amount = fmax(min_width, fmin(width->amount, max_width));
|
|
|
|
height->amount = fmax(min_height, fmin(height->amount, max_height));
|
2018-07-13 18:06:11 +10:00
|
|
|
int grow_width = width->amount - con->width;
|
|
|
|
int grow_height = height->amount - con->height;
|
2018-07-11 21:30:43 +10:00
|
|
|
con->x -= grow_width / 2;
|
|
|
|
con->y -= grow_height / 2;
|
2018-07-13 18:06:11 +10:00
|
|
|
con->width = width->amount;
|
|
|
|
con->height = height->amount;
|
2018-07-11 21:30:43 +10:00
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
if (con->view) {
|
|
|
|
struct sway_view *view = con->view;
|
2018-07-11 21:30:43 +10:00
|
|
|
view->x -= grow_width / 2;
|
|
|
|
view->y -= grow_height / 2;
|
|
|
|
view->width += grow_width;
|
|
|
|
view->height += grow_height;
|
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
arrange_container(con);
|
2018-07-11 21:30:43 +10:00
|
|
|
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
/**
|
|
|
|
* resize set <args>
|
|
|
|
*
|
|
|
|
* args: <width> [px|ppt] <height> [px|ppt]
|
|
|
|
*/
|
|
|
|
static struct cmd_results *cmd_resize_set(int argc, char **argv) {
|
2018-05-03 23:04:09 +10:00
|
|
|
struct cmd_results *error;
|
|
|
|
if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) {
|
|
|
|
return error;
|
|
|
|
}
|
2018-07-13 18:06:11 +10:00
|
|
|
const char *usage = "Expected 'resize set <width> <height>'";
|
2018-05-03 23:04:09 +10:00
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
// Width
|
|
|
|
struct resize_amount width;
|
|
|
|
int num_consumed_args = parse_resize_amount(argc, argv, &width);
|
|
|
|
argc -= num_consumed_args;
|
|
|
|
argv += num_consumed_args;
|
|
|
|
if (width.unit == RESIZE_UNIT_INVALID) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize", usage);
|
|
|
|
}
|
|
|
|
if (!argc) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize", usage);
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
// Height
|
|
|
|
struct resize_amount height;
|
|
|
|
num_consumed_args = parse_resize_amount(argc, argv, &height);
|
|
|
|
argc -= num_consumed_args;
|
|
|
|
argv += num_consumed_args;
|
|
|
|
if (height.unit == RESIZE_UNIT_INVALID) {
|
2018-04-05 11:32:31 +10:00
|
|
|
return cmd_results_new(CMD_INVALID, "resize", usage);
|
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
// If 0, don't resize that dimension
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
struct sway_container *con = config->handler_context.container;
|
2018-07-13 18:06:11 +10:00
|
|
|
if (width.amount <= 0) {
|
|
|
|
width.amount = con->width;
|
|
|
|
}
|
|
|
|
if (height.amount <= 0) {
|
|
|
|
height.amount = con->height;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (container_is_floating(con)) {
|
|
|
|
return resize_set_floating(con, &width, &height);
|
|
|
|
}
|
|
|
|
return resize_set_tiled(con, &width, &height);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* resize <grow|shrink> <args>
|
|
|
|
*
|
|
|
|
* args: <direction>
|
|
|
|
* args: <direction> <amount> <unit>
|
|
|
|
* args: <direction> <amount> <unit> or <amount> <other_unit>
|
|
|
|
*/
|
|
|
|
static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
|
|
|
|
int multiplier) {
|
|
|
|
const char *usage = "Expected 'resize grow|shrink <direction> "
|
|
|
|
"[<amount> px|ppt [or <amount> px|ppt]]'";
|
2018-04-05 11:32:31 +10:00
|
|
|
enum resize_axis axis = parse_resize_axis(*argv);
|
|
|
|
if (axis == RESIZE_AXIS_INVALID) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize", usage);
|
|
|
|
}
|
|
|
|
--argc; ++argv;
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
// First amount
|
|
|
|
struct resize_amount first_amount;
|
2018-04-05 11:32:31 +10:00
|
|
|
if (argc) {
|
2018-07-13 18:06:11 +10:00
|
|
|
int num_consumed_args = parse_resize_amount(argc, argv, &first_amount);
|
|
|
|
argc -= num_consumed_args;
|
|
|
|
argv += num_consumed_args;
|
|
|
|
if (first_amount.unit == RESIZE_UNIT_INVALID) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize", usage);
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
2018-07-13 18:06:11 +10:00
|
|
|
} else {
|
|
|
|
first_amount.amount = 10;
|
|
|
|
first_amount.unit = RESIZE_UNIT_DEFAULT;
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
// "or"
|
2018-04-05 11:32:31 +10:00
|
|
|
if (argc) {
|
2018-07-13 18:06:11 +10:00
|
|
|
if (strcmp(*argv, "or") != 0) {
|
2018-04-05 11:32:31 +10:00
|
|
|
return cmd_results_new(CMD_INVALID, "resize", usage);
|
|
|
|
}
|
|
|
|
--argc; ++argv;
|
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
// Second amount
|
|
|
|
struct resize_amount second_amount;
|
2018-04-05 11:32:31 +10:00
|
|
|
if (argc) {
|
2018-07-13 18:06:11 +10:00
|
|
|
int num_consumed_args = parse_resize_amount(argc, argv, &second_amount);
|
|
|
|
argc -= num_consumed_args;
|
|
|
|
argv += num_consumed_args;
|
|
|
|
if (second_amount.unit == RESIZE_UNIT_INVALID) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize", usage);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
second_amount.unit = RESIZE_UNIT_INVALID;
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|
|
|
|
|
2018-07-13 18:06:11 +10:00
|
|
|
first_amount.amount *= multiplier;
|
|
|
|
second_amount.amount *= multiplier;
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
struct sway_container *con = config->handler_context.container;
|
2018-07-13 18:06:11 +10:00
|
|
|
if (container_is_floating(con)) {
|
|
|
|
// Floating containers can only resize in px. Choose an amount which
|
|
|
|
// uses px, with fallback to an amount that specified no unit.
|
|
|
|
if (first_amount.unit == RESIZE_UNIT_PX) {
|
|
|
|
return resize_adjust_floating(axis, &first_amount);
|
|
|
|
} else if (second_amount.unit == RESIZE_UNIT_PX) {
|
|
|
|
return resize_adjust_floating(axis, &second_amount);
|
|
|
|
} else if (first_amount.unit == RESIZE_UNIT_DEFAULT) {
|
|
|
|
return resize_adjust_floating(axis, &first_amount);
|
|
|
|
} else if (second_amount.unit == RESIZE_UNIT_DEFAULT) {
|
|
|
|
return resize_adjust_floating(axis, &second_amount);
|
|
|
|
} else {
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize",
|
|
|
|
"Floating containers cannot use ppt measurements");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// For tiling, prefer ppt -> default -> px
|
|
|
|
if (first_amount.unit == RESIZE_UNIT_PPT) {
|
|
|
|
return resize_adjust_tiled(axis, &first_amount);
|
|
|
|
} else if (second_amount.unit == RESIZE_UNIT_PPT) {
|
|
|
|
return resize_adjust_tiled(axis, &second_amount);
|
|
|
|
} else if (first_amount.unit == RESIZE_UNIT_DEFAULT) {
|
|
|
|
return resize_adjust_tiled(axis, &first_amount);
|
|
|
|
} else if (second_amount.unit == RESIZE_UNIT_DEFAULT) {
|
|
|
|
return resize_adjust_tiled(axis, &second_amount);
|
|
|
|
} else {
|
|
|
|
return resize_adjust_tiled(axis, &first_amount);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cmd_results *cmd_resize(int argc, char **argv) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 21:00:10 +10:00
|
|
|
struct sway_container *current = config->handler_context.container;
|
2018-07-13 18:06:11 +10:00
|
|
|
if (!current) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize", "Cannot resize nothing");
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cmd_results *error;
|
|
|
|
if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) {
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strcasecmp(argv[0], "set") == 0) {
|
|
|
|
return cmd_resize_set(argc - 1, &argv[1]);
|
|
|
|
}
|
|
|
|
if (strcasecmp(argv[0], "grow") == 0) {
|
|
|
|
return cmd_resize_adjust(argc - 1, &argv[1], 1);
|
|
|
|
}
|
|
|
|
if (strcasecmp(argv[0], "shrink") == 0) {
|
|
|
|
return cmd_resize_adjust(argc - 1, &argv[1], -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *usage = "Expected 'resize <shrink|grow> "
|
|
|
|
"<width|height|up|down|left|right> [<amount>] [px|ppt]'";
|
|
|
|
|
|
|
|
return cmd_results_new(CMD_INVALID, "resize", usage);
|
2018-04-05 11:32:31 +10:00
|
|
|
}
|