Merge pull request #2087 from RedSoxFan/output-subcommand

Refactor cmd_output to use config_subcommand

2 files changed, 14 insertions, 0 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 593ae0f1..7ca0bda8 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -216,6 +216,15 @@ sway_cmd input_cmd_xkb_options;
 sway_cmd input_cmd_xkb_rules;
 sway_cmd input_cmd_xkb_variant;
 
+sway_cmd output_cmd_background;
+sway_cmd output_cmd_disable;
+sway_cmd output_cmd_dpms;
+sway_cmd output_cmd_enable;
+sway_cmd output_cmd_mode;
+sway_cmd output_cmd_position;
+sway_cmd output_cmd_scale;
+sway_cmd output_cmd_transform;
+
 sway_cmd seat_cmd_attach;
 sway_cmd seat_cmd_fallback;
 sway_cmd seat_cmd_cursor;
diff --git a/include/sway/config.h b/include/sway/config.h
index b597da75..81e9c382 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -372,10 +372,15 @@ struct sway_config {
         // Context for command handlers
         struct {
                 struct input_config *input_config;
+                struct output_config *output_config;
                 struct seat_config *seat_config;
                 struct sway_seat *seat;
                 struct sway_container *current_container;
                 bool using_criteria;
+                struct {
+                        int argc;
+                        char **argv;
+                } leftovers;
         } handler_context;
 };