mirror of
https://github.com/swaywm/sway.git
synced 2024-11-29 11:21:28 +00:00
4ea5a9cee1
We batch modesets and input configuration performed during config reload
but commit for every command during the intial config load. There is no
need to perform commits during the initial config load as outputs have
not yet been created, but swaybg spawn should still be batched.
At the same time, replace direct calls to apply output configuration
with request_modeset to properly handle the modeset timer.
(cherry picked from commit cdff4f7c74
)
129 lines
3.7 KiB
C
129 lines
3.7 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 const struct cmd_handler output_handlers[] = {
|
|
{ "adaptive_sync", output_cmd_adaptive_sync },
|
|
{ "allow_tearing", output_cmd_allow_tearing },
|
|
{ "background", output_cmd_background },
|
|
{ "bg", output_cmd_background },
|
|
{ "color_profile", output_cmd_color_profile },
|
|
{ "disable", output_cmd_disable },
|
|
{ "dpms", output_cmd_dpms },
|
|
{ "enable", output_cmd_enable },
|
|
{ "max_render_time", output_cmd_max_render_time },
|
|
{ "mode", output_cmd_mode },
|
|
{ "modeline", output_cmd_modeline },
|
|
{ "pos", output_cmd_position },
|
|
{ "position", output_cmd_position },
|
|
{ "power", output_cmd_power },
|
|
{ "render_bit_depth", output_cmd_render_bit_depth },
|
|
{ "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 },
|
|
{ "unplug", output_cmd_unplug },
|
|
};
|
|
|
|
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;
|
|
}
|
|
|
|
// The HEADLESS-1 output is a dummy output used when there's no outputs
|
|
// connected. It should never be configured.
|
|
if (strcasecmp(argv[0], root->fallback_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->fallback_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 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,
|
|
"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;
|
|
|
|
bool background = output->background;
|
|
|
|
store_output_config(output);
|
|
|
|
if (config->reading) {
|
|
// When reading the config file, we wait till the end to do a single
|
|
// modeset and swaybg spawn.
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|
|
request_modeset();
|
|
|
|
if (background && !spawn_swaybg()) {
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Failed to apply background configuration");
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
|
|
fail:
|
|
config->handler_context.output_config = NULL;
|
|
free_output_config(output);
|
|
return error;
|
|
}
|