mirror of
https://github.com/swaywm/sway.git
synced 2026-04-26 06:46:26 -04:00
221a8b40de
sway commands are implemented using functions that return an error code and (if the function was not successful) an error string. The two are bundled together by the type `struct cmd_results`. This patch alters the command handler prototype so that the cmd_results objects are returned by value (on the stack), instead of by a pointer to a heap allocated instance of a cmd_results. The latter method had the flaw that, if the heap allocation of the cmd_results object failed, the exact return code would be lost. Furthermore, for some command handlers (such as those in sway/commands/output), returning NULL signified success, so an allocation failure could lead to an ignored error. This change prevents both classes of errors.
119 lines
3.5 KiB
C
119 lines
3.5 KiB
C
#include <strings.h>
|
|
#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 },
|
|
{ "max_render_time", output_cmd_max_render_time },
|
|
{ "mode", output_cmd_mode },
|
|
{ "pos", output_cmd_position },
|
|
{ "position", output_cmd_position },
|
|
{ "res", output_cmd_mode },
|
|
{ "resolution", output_cmd_mode },
|
|
{ "scale", output_cmd_scale },
|
|
{ "scale_filter", output_cmd_scale_filter },
|
|
{ "subpixel", output_cmd_subpixel },
|
|
{ "toggle", output_cmd_toggle },
|
|
{ "transform", output_cmd_transform },
|
|
};
|
|
|
|
struct cmd_results cmd_output(int argc, char **argv) {
|
|
struct cmd_results error;
|
|
if (checkarg(&error, argc, "output", EXPECTED_AT_LEAST, 1)) {
|
|
return error;
|
|
}
|
|
|
|
// The NOOP-1 output is a dummy output used when there's no outputs
|
|
// connected. It should never be configured.
|
|
if (strcasecmp(argv[0], root->noop_output->wlr_output->name) == 0) {
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Refusing to configure the no op output");
|
|
}
|
|
|
|
struct output_config *output = NULL;
|
|
if (strcmp(argv[0], "-") == 0 || strcmp(argv[0], "--") == 0) {
|
|
if (config->reading) {
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Current output alias (%s) cannot be used in the config",
|
|
argv[0]);
|
|
}
|
|
struct sway_output *sway_output = config->handler_context.node ?
|
|
node_get_output(config->handler_context.node) : NULL;
|
|
if (!sway_output) {
|
|
return cmd_results_new(CMD_FAILURE, "Unknown output");
|
|
}
|
|
if (sway_output == root->noop_output) {
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Refusing to configure the no op output");
|
|
}
|
|
if (strcmp(argv[0], "-") == 0) {
|
|
output = new_output_config(sway_output->wlr_output->name);
|
|
} else {
|
|
char identifier[128];
|
|
output_get_identifier(identifier, 128, sway_output);
|
|
output = new_output_config(identifier);
|
|
}
|
|
} else {
|
|
output = new_output_config(argv[0]);
|
|
}
|
|
if (!output) {
|
|
sway_log(SWAY_ERROR, "Failed to allocate output config");
|
|
return cmd_results_new(CMD_FAILURE, "Failed to allocate output config");
|
|
}
|
|
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,
|
|
"Invalid output subcommand: %s.", *argv);
|
|
}
|
|
|
|
if (error.status != CMD_SUCCESS) {
|
|
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;
|
|
|
|
bool background = output->background;
|
|
|
|
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);
|
|
if (background) {
|
|
spawn_swaybg();
|
|
}
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
|
|
fail:
|
|
config->handler_context.output_config = NULL;
|
|
free_output_config(output);
|
|
return error;
|
|
}
|