From 346f5a9d14e260405598fc530fb260c894db397f Mon Sep 17 00:00:00 2001 From: Ivan Fedotov <17356208+ivanfed0t0v@users.noreply.github.com> Date: Mon, 15 Mar 2021 19:06:46 +0300 Subject: [PATCH] Add toggle logic inside DPMS handler Logic that obtains current DPMS state is put inside the handler. sway_output from which the current DPMS state will be obtained is selected by the following logic: * For '-' and '--' the focused output is used; * For '*' error "Cannot apply toggle to all outputs" is reported; * For everything else all_output_by_name_or_id() is used. Fixes #5929. --- sway/commands/output/dpms.c | 25 ++++++++++++++++++++++++- sway/sway-output.5.scd | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/sway/commands/output/dpms.c b/sway/commands/output/dpms.c index 9d75a80e..638c0ade 100644 --- a/sway/commands/output/dpms.c +++ b/sway/commands/output/dpms.c @@ -1,6 +1,8 @@ #include "sway/commands.h" #include "sway/config.h" +#include "sway/output.h" #include "util.h" +#include struct cmd_results *output_cmd_dpms(int argc, char **argv) { if (!config->handler_context.output_config) { @@ -10,7 +12,28 @@ struct cmd_results *output_cmd_dpms(int argc, char **argv) { return cmd_results_new(CMD_INVALID, "Missing dpms argument."); } - if (parse_boolean(argv[0], true)) { + enum config_dpms current_dpms = DPMS_ON; + + if (strcasecmp(argv[0], "toggle") == 0) { + + const char *oc_name = config->handler_context.output_config->name; + if (strcmp(oc_name, "*") == 0) { + return cmd_results_new(CMD_INVALID, + "Cannot apply toggle to all outputs."); + } + + struct sway_output *sway_output = all_output_by_name_or_id(oc_name); + if (!sway_output || !sway_output->wlr_output) { + return cmd_results_new(CMD_FAILURE, + "Cannot apply toggle to unknown output %s", oc_name); + } + + if (sway_output->enabled && !sway_output->wlr_output->enabled) { + current_dpms = DPMS_OFF; + } + } + + if (parse_boolean(argv[0], current_dpms == DPMS_ON)) { config->handler_context.output_config->dpms_state = DPMS_ON; } else { config->handler_context.output_config->dpms_state = DPMS_OFF; diff --git a/sway/sway-output.5.scd b/sway/sway-output.5.scd index 69f529fe..7927a609 100644 --- a/sway/sway-output.5.scd +++ b/sway/sway-output.5.scd @@ -112,7 +112,7 @@ must be separated by one space. For example: *output* toggle Toggle the specified output. -*output* dpms on|off +*output* dpms on|off|toggle Enables or disables the specified output via DPMS. To turn an output off (ie. blank the screen but keep workspaces as-is), one can set DPMS to off.