6 files changed, 50 insertions, 1 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index e51b12fd..226cf932 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -103,6 +103,7 @@ sway_cmd cmd_client_urgent;
 sway_cmd cmd_client_placeholder;
 sway_cmd cmd_client_background;
 sway_cmd cmd_commands;
+sway_cmd cmd_create_output;
 sway_cmd cmd_debuglog;
 sway_cmd cmd_default_border;
 sway_cmd cmd_default_floating_border;
diff --git a/sway/commands.c b/sway/commands.c
index 41e1c653..27a88319 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -143,6 +143,7 @@ static struct cmd_handler config_handlers[] = {
 /* Runtime-only commands. Keep alphabetized */
 static struct cmd_handler command_handlers[] = {
         { "border", cmd_border },
+        { "create_output", cmd_create_output },
         { "exit", cmd_exit },
         { "floating", cmd_floating },
         { "fullscreen", cmd_fullscreen },
diff --git a/sway/commands/create_output.c b/sway/commands/create_output.c
new file mode 100644
index 00000000..a852c2a0
--- /dev/null
+++ b/sway/commands/create_output.c
@@ -0,0 +1,39 @@
+#include <wlr/backend/multi.h>
+#include <wlr/backend/wayland.h>
+#include <wlr/backend/x11.h>
+#include "sway/commands.h"
+#include "sway/server.h"
+#include "log.h"
+
+static void create_output(struct wlr_backend *backend, void *data) {
+        bool *done = data;
+        if (*done) {
+                return;
+        }
+
+        if (wlr_backend_is_wl(backend)) {
+                wlr_wl_output_create(backend);
+                *done = true;
+        } else if (wlr_backend_is_x11(backend)) {
+                wlr_x11_output_create(backend);
+                *done = true;
+        }
+}
+
+/**
+ * This command is intended for developer use only.
+ */
+struct cmd_results *cmd_create_output(int argc, char **argv) {
+        sway_assert(wlr_backend_is_multi(server.backend),
+                        "Expected a multi backend");
+
+        bool done = false;
+        wlr_multi_for_each_backend(server.backend, create_output, &done);
+
+        if (!done) {
+                return cmd_results_new(CMD_INVALID, "create_output",
+                                "Can only create outputs for Wayland or X11 backends");
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/config/input.c b/sway/config/input.c
index 9885e85c..ad5b96c8 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -140,6 +140,13 @@ void free_input_config(struct input_config *ic) {
                 return;
         }
         free(ic->identifier);
+        free(ic->xkb_layout);
+        free(ic->xkb_model);
+        free(ic->xkb_options);
+        free(ic->xkb_rules);
+        free(ic->xkb_variant);
+        free(ic->mapped_from_region);
+        free(ic->mapped_to_output);
         free(ic);
 }
 
diff --git a/sway/meson.build b/sway/meson.build
index 01c83a33..d67a4c64 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -35,6 +35,7 @@ sway_sources = files(
         'commands/bind.c',
         'commands/border.c',
         'commands/client.c',
+        'commands/create_output.c',
         'commands/default_border.c',
         'commands/default_floating_border.c',
         'commands/default_orientation.c',
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index 01ed70d9..401bf6f6 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -147,8 +147,8 @@ void status_line_free(struct status_line *status) {
                         wl_list_remove(&block->link);
                         i3bar_block_unref(block);
                 }
+                json_tokener_free(status->tokener);
         }
-        json_tokener_free(status->tokener);
         free(status->buffer);
         free(status);
 }