aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-30 21:00:10 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-05 18:01:43 +1000
commit7586f150c058997d9dde387ea7c091ffa7a3c3c7 (patch)
tree63d19027974c1db62ce3a74ca1d2314eb6d5049b /sway/commands.c
parentMerge pull request #2569 from RyanDwyer/deny-reload-repeat (diff)
downloadsway-7586f150c058997d9dde387ea7c091ffa7a3c3c7.tar.gz
sway-7586f150c058997d9dde387ea7c091ffa7a3c3c7.tar.zst
sway-7586f150c058997d9dde387ea7c091ffa7a3c3c7.zip
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.
Diffstat (limited to 'sway/commands.c')
-rw-r--r--sway/commands.c27
1 files changed, 20 insertions, 7 deletions
diff --git a/sway/commands.c b/sway/commands.c
index e72b8916..b32628cd 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -212,6 +212,24 @@ struct cmd_handler *find_handler(char *line, struct cmd_handler *cmd_handlers,
212 return res; 212 return res;
213} 213}
214 214
215static void set_config_node(struct sway_node *node) {
216 config->handler_context.node = node;
217 switch (node->type) {
218 case N_CONTAINER:
219 config->handler_context.container = node->sway_container;
220 config->handler_context.workspace = node->sway_container->workspace;
221 break;
222 case N_WORKSPACE:
223 config->handler_context.container = NULL;
224 config->handler_context.workspace = node->sway_workspace;
225 break;
226 default:
227 config->handler_context.container = NULL;
228 config->handler_context.workspace = NULL;
229 break;
230 }
231}
232
215struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) { 233struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
216 // Even though this function will process multiple commands we will only 234 // Even though this function will process multiple commands we will only
217 // return the last error, if any (for now). (Since we have access to an 235 // return the last error, if any (for now). (Since we have access to an
@@ -295,12 +313,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
295 if (!config->handler_context.using_criteria) { 313 if (!config->handler_context.using_criteria) {
296 // without criteria, the command acts upon the focused 314 // without criteria, the command acts upon the focused
297 // container 315 // container
298 config->handler_context.current_container = 316 set_config_node(seat_get_focus_inactive(seat, &root->node));
299 seat_get_focus_inactive(seat, &root_container);
300 if (!sway_assert(config->handler_context.current_container,
301 "could not get focus-inactive for root container")) {
302 return NULL;
303 }
304 struct cmd_results *res = handler->handle(argc-1, argv+1); 317 struct cmd_results *res = handler->handle(argc-1, argv+1);
305 if (res->status != CMD_SUCCESS) { 318 if (res->status != CMD_SUCCESS) {
306 free_argv(argc, argv); 319 free_argv(argc, argv);
@@ -314,7 +327,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
314 } else { 327 } else {
315 for (int i = 0; i < views->length; ++i) { 328 for (int i = 0; i < views->length; ++i) {
316 struct sway_view *view = views->items[i]; 329 struct sway_view *view = views->items[i];
317 config->handler_context.current_container = view->swayc; 330 set_config_node(&view->container->node);
318 struct cmd_results *res = handler->handle(argc-1, argv+1); 331 struct cmd_results *res = handler->handle(argc-1, argv+1);
319 if (res->status != CMD_SUCCESS) { 332 if (res->status != CMD_SUCCESS) {
320 free_argv(argc, argv); 333 free_argv(argc, argv);