|
|
|
#include <string.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#include "sway/commands.h"
|
|
|
|
#include "sway/config.h"
|
|
|
|
#include "sway/tree/arrange.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.
6 years ago
|
|
|
#include "sway/tree/workspace.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "stringop.h"
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
enum gaps_op {
|
|
|
|
GAPS_OP_SET,
|
|
|
|
GAPS_OP_ADD,
|
|
|
|
GAPS_OP_SUBTRACT,
|
|
|
|
GAPS_OP_TOGGLE
|
|
|
|
};
|
|
|
|
|
|
|
|
struct gaps_data {
|
|
|
|
bool inner;
|
|
|
|
struct {
|
|
|
|
bool top;
|
|
|
|
bool right;
|
|
|
|
bool bottom;
|
|
|
|
bool left;
|
|
|
|
} outer;
|
|
|
|
enum gaps_op operation;
|
|
|
|
int amount;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Prevent negative outer gaps from moving windows out of the workspace.
|
|
|
|
static void prevent_invalid_outer_gaps(void) {
|
|
|
|
if (config->gaps_outer.top < -config->gaps_inner) {
|
|
|
|
config->gaps_outer.top = -config->gaps_inner;
|
|
|
|
}
|
|
|
|
if (config->gaps_outer.right < -config->gaps_inner) {
|
|
|
|
config->gaps_outer.right = -config->gaps_inner;
|
|
|
|
}
|
|
|
|
if (config->gaps_outer.bottom < -config->gaps_inner) {
|
|
|
|
config->gaps_outer.bottom = -config->gaps_inner;
|
|
|
|
}
|
|
|
|
if (config->gaps_outer.left < -config->gaps_inner) {
|
|
|
|
config->gaps_outer.left = -config->gaps_inner;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// gaps inner|outer|horizontal|vertical|top|right|bottom|left <px>
|
|
|
|
static const char expected_defaults[] =
|
|
|
|
"'gaps inner|outer|horizontal|vertical|top|right|bottom|left <px>'";
|
|
|
|
static struct cmd_results *gaps_set_defaults(int argc, char **argv) {
|
|
|
|
struct cmd_results *error = checkarg(argc, "gaps", EXPECTED_EQUAL_TO, 2);
|
|
|
|
if (error) {
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *end;
|
|
|
|
int amount = strtol(argv[1], &end, 10);
|
|
|
|
if (strlen(end) && strcasecmp(end, "px") != 0) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "Expected %s", expected_defaults);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool valid = false;
|
|
|
|
if (!strcasecmp(argv[0], "inner")) {
|
|
|
|
valid = true;
|
|
|
|
config->gaps_inner = (amount >= 0) ? amount : 0;
|
|
|
|
} else {
|
|
|
|
if (!strcasecmp(argv[0], "outer") || !strcasecmp(argv[0], "vertical")
|
|
|
|
|| !strcasecmp(argv[0], "top")) {
|
|
|
|
valid = true;
|
|
|
|
config->gaps_outer.top = amount;
|
|
|
|
}
|
|
|
|
if (!strcasecmp(argv[0], "outer") || !strcasecmp(argv[0], "horizontal")
|
|
|
|
|| !strcasecmp(argv[0], "right")) {
|
|
|
|
valid = true;
|
|
|
|
config->gaps_outer.right = amount;
|
|
|
|
}
|
|
|
|
if (!strcasecmp(argv[0], "outer") || !strcasecmp(argv[0], "vertical")
|
|
|
|
|| !strcasecmp(argv[0], "bottom")) {
|
|
|
|
valid = true;
|
|
|
|
config->gaps_outer.bottom = amount;
|
|
|
|
}
|
|
|
|
if (!strcasecmp(argv[0], "outer") || !strcasecmp(argv[0], "horizontal")
|
|
|
|
|| !strcasecmp(argv[0], "left")) {
|
|
|
|
valid = true;
|
|
|
|
config->gaps_outer.left = amount;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!valid) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "Expected %s", expected_defaults);
|
|
|
|
}
|
|
|
|
|
|
|
|
prevent_invalid_outer_gaps();
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void apply_gaps_op(int *prop, enum gaps_op op, int amount) {
|
|
|
|
switch (op) {
|
|
|
|
case GAPS_OP_SET:
|
|
|
|
*prop = amount;
|
|
|
|
break;
|
|
|
|
case GAPS_OP_ADD:
|
|
|
|
*prop += amount;
|
|
|
|
break;
|
|
|
|
case GAPS_OP_SUBTRACT:
|
|
|
|
*prop -= amount;
|
|
|
|
break;
|
|
|
|
case GAPS_OP_TOGGLE:
|
|
|
|
*prop = *prop ? 0 : amount;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void configure_gaps(struct sway_workspace *ws, void *_data) {
|
|
|
|
// Apply operation to gaps
|
|
|
|
struct gaps_data *data = _data;
|
|
|
|
if (data->inner) {
|
|
|
|
apply_gaps_op(&ws->gaps_inner, data->operation, data->amount);
|
|
|
|
}
|
|
|
|
if (data->outer.top) {
|
|
|
|
apply_gaps_op(&(ws->gaps_outer.top), data->operation, data->amount);
|
|
|
|
}
|
|
|
|
if (data->outer.right) {
|
|
|
|
apply_gaps_op(&(ws->gaps_outer.right), data->operation, data->amount);
|
|
|
|
}
|
|
|
|
if (data->outer.bottom) {
|
|
|
|
apply_gaps_op(&(ws->gaps_outer.bottom), data->operation, data->amount);
|
|
|
|
}
|
|
|
|
if (data->outer.left) {
|
|
|
|
apply_gaps_op(&(ws->gaps_outer.left), data->operation, data->amount);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Prevent invalid gaps configurations.
|
|
|
|
if (ws->gaps_inner < 0) {
|
|
|
|
ws->gaps_inner = 0;
|
|
|
|
}
|
|
|
|
prevent_invalid_outer_gaps();
|
|
|
|
arrange_workspace(ws);
|
|
|
|
}
|
|
|
|
|
|
|
|
// gaps inner|outer|horizontal|vertical|top|right|bottom|left current|all
|
|
|
|
// set|plus|minus|toggle <px>
|
|
|
|
static const char expected_runtime[] = "'gaps inner|outer|horizontal|vertical|"
|
|
|
|
"top|right|bottom|left current|all set|plus|minus|toggle <px>'";
|
|
|
|
static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
|
|
|
|
struct cmd_results *error = checkarg(argc, "gaps", EXPECTED_EQUAL_TO, 4);
|
|
|
|
if (error) {
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
if (!root->outputs->length) {
|
|
|
|
return cmd_results_new(CMD_INVALID,
|
|
|
|
"Can't run this command while there's no outputs connected.");
|
|
|
|
}
|
|
|
|
|
|
|
|
struct gaps_data data = {0};
|
|
|
|
|
|
|
|
if (strcasecmp(argv[0], "inner") == 0) {
|
|
|
|
data.inner = true;
|
|
|
|
} else {
|
|
|
|
data.outer.top = !strcasecmp(argv[0], "outer") ||
|
|
|
|
!strcasecmp(argv[0], "vertical") || !strcasecmp(argv[0], "top");
|
|
|
|
data.outer.right = !strcasecmp(argv[0], "outer") ||
|
|
|
|
!strcasecmp(argv[0], "horizontal") || !strcasecmp(argv[0], "right");
|
|
|
|
data.outer.bottom = !strcasecmp(argv[0], "outer") ||
|
|
|
|
!strcasecmp(argv[0], "vertical") || !strcasecmp(argv[0], "bottom");
|
|
|
|
data.outer.left = !strcasecmp(argv[0], "outer") ||
|
|
|
|
!strcasecmp(argv[0], "horizontal") || !strcasecmp(argv[0], "left");
|
|
|
|
}
|
|
|
|
if (!data.inner && !data.outer.top && !data.outer.right &&
|
|
|
|
!data.outer.bottom && !data.outer.left) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool all;
|
|
|
|
if (strcasecmp(argv[1], "current") == 0) {
|
|
|
|
all = false;
|
|
|
|
} else if (strcasecmp(argv[1], "all") == 0) {
|
|
|
|
all = true;
|
|
|
|
} else {
|
|
|
|
return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strcasecmp(argv[2], "set") == 0) {
|
|
|
|
data.operation = GAPS_OP_SET;
|
|
|
|
} else if (strcasecmp(argv[2], "plus") == 0) {
|
|
|
|
data.operation = GAPS_OP_ADD;
|
|
|
|
} else if (strcasecmp(argv[2], "minus") == 0) {
|
|
|
|
data.operation = GAPS_OP_SUBTRACT;
|
|
|
|
} else if (strcasecmp(argv[2], "toggle") == 0) {
|
|
|
|
data.operation = GAPS_OP_TOGGLE;
|
|
|
|
} else {
|
|
|
|
return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime);
|
|
|
|
}
|
|
|
|
|
|
|
|
char *end;
|
|
|
|
data.amount = strtol(argv[3], &end, 10);
|
|
|
|
if (strlen(end) && strcasecmp(end, "px") != 0) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (all) {
|
|
|
|
root_for_each_workspace(configure_gaps, &data);
|
|
|
|
} else {
|
|
|
|
configure_gaps(config->handler_context.workspace, &data);
|
|
|
|
}
|
|
|
|
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
// gaps inner|outer|<dir>|<side> <px> - sets defaults for workspaces
|
|
|
|
// gaps inner|outer|<dir>|<side> current|all set|plus|minus|toggle <px> - runtime only
|
|
|
|
// <dir> = horizontal|vertical
|
|
|
|
// <side> = top|right|bottom|left
|
|
|
|
struct cmd_results *cmd_gaps(int argc, char **argv) {
|
|
|
|
struct cmd_results *error = checkarg(argc, "gaps", EXPECTED_AT_LEAST, 2);
|
|
|
|
if (error) {
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argc == 2) {
|
|
|
|
return gaps_set_defaults(argc, argv);
|
|
|
|
}
|
|
|
|
if (argc == 4 && !config->reading) {
|
|
|
|
return gaps_set_runtime(argc, argv);
|
|
|
|
}
|
|
|
|
if (config->reading) {
|
|
|
|
return cmd_results_new(CMD_INVALID, "Expected %s", expected_defaults);
|
|
|
|
}
|
|
|
|
return cmd_results_new(CMD_INVALID, "Expected %s or %s",
|
|
|
|
expected_runtime, expected_defaults);
|
|
|
|
}
|