mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't allow noop output to be configured

Browse source
This commit is contained in:
Ryan Dwyer 2019-01-20 19:05:28 +10:00 committed by emersion
parent e815e48cee
commit 7f8ea60e71
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/commands/output.c
View file

@ -1,3 +1,4 @@
#include <strings.h>
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/config.h" #include "sway/config.h"
#include "sway/output.h" #include "sway/output.h"
@ -26,6 +27,13 @@ struct cmd_results *cmd_output(int argc, char **argv) {
return error; 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], "NOOP-1") == 0) {
return cmd_results_new(CMD_FAILURE,
"Refusing to configure the no op output");
}
struct output_config *output = new_output_config(argv[0]); struct output_config *output = new_output_config(argv[0]);
if (!output) { if (!output) {
sway_log(SWAY_ERROR, "Failed to allocate output config"); sway_log(SWAY_ERROR, "Failed to allocate output config");

9
sway/commands/output/enable.c
View file

@ -1,4 +1,3 @@
#include <strings.h>
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/config.h" #include "sway/config.h"
@ -7,14 +6,6 @@ struct cmd_results *output_cmd_enable(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "Missing output config"); return cmd_results_new(CMD_FAILURE, "Missing output config");
} }
// The NOOP-1 output is a dummy output used when there's no outputs
// connected. It should never be enabled.
char *output_name = config->handler_context.output_config->name;
if (strcasecmp(output_name, "NOOP-1") == 0) {
return cmd_results_new(CMD_FAILURE,
"Refusing to enable the no op output");
}
config->handler_context.output_config->enabled = 1; config->handler_context.output_config->enabled = 1;
config->handler_context.leftovers.argc = argc; config->handler_context.leftovers.argc = argc;

4
sway/config/output.c
View file

@ -176,6 +176,10 @@ void terminate_swaybg(pid_t pid) {
} }
bool apply_output_config(struct output_config *oc, struct sway_output *output) { bool apply_output_config(struct output_config *oc, struct sway_output *output) {
if (output == root->noop_output) {
return false;
}
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
if (oc && !oc->enabled) { if (oc && !oc->enabled) {