mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-27 21:58:16 +01:00
5dbbab7bdc
When we have type safety we'll need to have functions for
workspace_add_tiling and so on. This means the existing container
functions will be just for containers, so they are being moved to
container.c. At this point layout.c doesn't contain much else, so I've
relocated everything and removed the file.
* container_swap and its static functions have been moved to the swap
command and made static.
* container_recursive_resize has been moved to the resize command and
made static.
* The following have been moved to container.c:
* container_handle_fullscreen_reparent
* container_insert_child
* container_add_sibling
* container_add_child
* container_remove_child
* container_replace_child
* container_split
* enum movement_direction and sway_dir_to_wlr have been moved to util.c.
Side note: Several commands included layout.h which then included
root.h. With layout.h gone, root.h has to be included by those commands.
77 lines
2.1 KiB
C
77 lines
2.1 KiB
C
#include "sway/commands.h"
|
|
#include "sway/config.h"
|
|
#include "sway/output.h"
|
|
#include "list.h"
|
|
#include "log.h"
|
|
|
|
// must be in order for the bsearch
|
|
static struct cmd_handler output_handlers[] = {
|
|
{ "background", output_cmd_background },
|
|
{ "bg", output_cmd_background },
|
|
{ "disable", output_cmd_disable },
|
|
{ "dpms", output_cmd_dpms },
|
|
{ "enable", output_cmd_enable },
|
|
{ "mode", output_cmd_mode },
|
|
{ "pos", output_cmd_position },
|
|
{ "position", output_cmd_position },
|
|
{ "res", output_cmd_mode },
|
|
{ "resolution", output_cmd_mode },
|
|
{ "scale", output_cmd_scale },
|
|
{ "transform", output_cmd_transform },
|
|
};
|
|
|
|
struct cmd_results *cmd_output(int argc, char **argv) {
|
|
struct cmd_results *error = checkarg(argc, "output", EXPECTED_AT_LEAST, 1);
|
|
if (error != NULL) {
|
|
return error;
|
|
}
|
|
|
|
struct output_config *output = new_output_config(argv[0]);
|
|
if (!output) {
|
|
wlr_log(WLR_ERROR, "Failed to allocate output config");
|
|
return NULL;
|
|
}
|
|
argc--; argv++;
|
|
|
|
config->handler_context.output_config = output;
|
|
|
|
while (argc > 0) {
|
|
config->handler_context.leftovers.argc = 0;
|
|
config->handler_context.leftovers.argv = NULL;
|
|
|
|
if (find_handler(*argv, output_handlers, sizeof(output_handlers))) {
|
|
error = config_subcommand(argv, argc, output_handlers,
|
|
sizeof(output_handlers));
|
|
} else {
|
|
error = cmd_results_new(CMD_INVALID, "output",
|
|
"Invalid output subcommand: %s.", *argv);
|
|
}
|
|
|
|
if (error != NULL) {
|
|
goto fail;
|
|
}
|
|
|
|
argc = config->handler_context.leftovers.argc;
|
|
argv = config->handler_context.leftovers.argv;
|
|
}
|
|
|
|
config->handler_context.output_config = NULL;
|
|
config->handler_context.leftovers.argc = 0;
|
|
config->handler_context.leftovers.argv = NULL;
|
|
|
|
output = store_output_config(output);
|
|
|
|
// If reloading, the output configs will be applied after reading the
|
|
// entire config and before the deferred commands so that an auto generated
|
|
// workspace name is not given to re-enabled outputs.
|
|
if (!config->reloading) {
|
|
apply_output_config_to_outputs(output);
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
|
|
fail:
|
|
config->handler_context.output_config = NULL;
|
|
free_output_config(output);
|
|
return error;
|
|
}
|