8 files changed, 199 insertions, 49 deletions

diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index 68ee9fe1..55bd7671 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
@@ -102,19 +101,19 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                         }
 
                         char *conf_path = dirname(conf);
-                        char *rel_path = src;
-                        src = malloc(strlen(conf_path) + strlen(src) + 2);
-                        if (!src) {
-                                free(rel_path);
+                        char *real_src = malloc(strlen(conf_path) + strlen(src) + 2);
+                        if (!real_src) {
+                                free(src);
                                 free(conf);
                                 sway_log(SWAY_ERROR, "Unable to allocate memory");
                                 return cmd_results_new(CMD_FAILURE,
                                                 "Unable to allocate resources");
                         }
 
-                        sprintf(src, "%s/%s", conf_path, rel_path);
-                        free(rel_path);
+                        snprintf(real_src, strlen(conf_path) + strlen(src) + 2, "%s/%s", conf_path, src);
+                        free(src);
                         free(conf);
+                        src = real_src;
                 }
 
                 bool can_access = access(src, F_OK) != -1;
@@ -123,7 +122,10 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                                         src);
                         config_add_swaynag_warning("Unable to access background file '%s'",
                                         src);
+                        struct cmd_results *result = cmd_results_new(CMD_FAILURE,
+                                        "unable to access background file '%s'", src);
                         free(src);
+                        return result;
                 } else {
                         output->background = src;
                         output->background_option = strdup(mode);
diff --git a/sway/commands/output/dpms.c b/sway/commands/output/dpms.c
index 638c0ade..c7adbd58 100644
--- a/sway/commands/output/dpms.c
+++ b/sway/commands/output/dpms.c
@@ -1,45 +1,8 @@
+#include "log.h"
 #include "sway/commands.h"
-#include "sway/config.h"
-#include "sway/output.h"
-#include "util.h"
-#include <strings.h>
 
 struct cmd_results *output_cmd_dpms(int argc, char **argv) {
-        if (!config->handler_context.output_config) {
-                return cmd_results_new(CMD_FAILURE, "Missing output config");
-        }
-        if (!argc) {
-                return cmd_results_new(CMD_INVALID, "Missing dpms argument.");
-        }
-
-        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;
-        }
-
-        config->handler_context.leftovers.argc = argc - 1;
-        config->handler_context.leftovers.argv = argv + 1;
-        return NULL;
+        sway_log(SWAY_INFO, "The \"output dpms\" command is deprecated, "
+                "use \"output power\" instead");
+        return output_cmd_power(argc, argv);
 }
diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c
index 5b710713..019d625a 100644
--- a/sway/commands/output/mode.c
+++ b/sway/commands/output/mode.c
@@ -20,6 +20,9 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
                 output->custom_mode = 0;
         }
 
+        // Reset custom modeline, if any
+        output->drm_mode.type = 0;
+
         char *end;
         output->width = strtol(*argv, &end, 10);
         if (*end) {
@@ -58,3 +61,58 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
         return NULL;
 }
 
+static bool parse_modeline(char **argv, drmModeModeInfo *mode) {
+        mode->type = DRM_MODE_TYPE_USERDEF;
+        mode->clock = strtof(argv[0], NULL) * 1000;
+        mode->hdisplay = strtol(argv[1], NULL, 10);
+        mode->hsync_start = strtol(argv[2], NULL, 10);
+        mode->hsync_end = strtol(argv[3], NULL, 10);
+        mode->htotal = strtol(argv[4], NULL, 10);
+        mode->vdisplay = strtol(argv[5], NULL, 10);
+        mode->vsync_start = strtol(argv[6], NULL, 10);
+        mode->vsync_end = strtol(argv[7], NULL, 10);
+        mode->vtotal = strtol(argv[8], NULL, 10);
+
+        mode->vrefresh = mode->clock * 1000.0 * 1000.0
+                / mode->htotal / mode->vtotal;
+        if (strcasecmp(argv[9], "+hsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_PHSYNC;
+        } else if (strcasecmp(argv[9], "-hsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_NHSYNC;
+        } else {
+                return false;
+        }
+
+        if (strcasecmp(argv[10], "+vsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_PVSYNC;
+        } else if (strcasecmp(argv[10], "-vsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_NVSYNC;
+        } else {
+                return false;
+        }
+
+        snprintf(mode->name, sizeof(mode->name), "%dx%d@%d",
+                 mode->hdisplay, mode->vdisplay, mode->vrefresh / 1000);
+
+        return true;
+}
+
+struct cmd_results *output_cmd_modeline(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "Missing modeline argument.");
+        }
+
+        struct output_config *output = config->handler_context.output_config;
+
+        if (argc != 11 || !parse_modeline(argv, &output->drm_mode)) {
+                return cmd_results_new(CMD_INVALID, "Invalid modeline");
+        }
+
+        config->handler_context.leftovers.argc = argc - 12;
+        config->handler_context.leftovers.argv = argv + 12;
+        return NULL;
+}
+
diff --git a/sway/commands/output/power.c b/sway/commands/output/power.c
new file mode 100644
index 00000000..e6ae2852
--- /dev/null
+++ b/sway/commands/output/power.c
@@ -0,0 +1,43 @@
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/output.h"
+#include "util.h"
+
+struct cmd_results *output_cmd_power(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (argc == 0) {
+                return cmd_results_new(CMD_INVALID, "Missing power argument");
+        }
+
+        bool current = true;
+        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 = false;
+                }
+        }
+
+        if (parse_boolean(argv[0], current)) {
+                config->handler_context.output_config->power = 1;
+        } else {
+                config->handler_context.output_config->power = 0;
+        }
+
+        config->handler_context.leftovers.argc = argc - 1;
+        config->handler_context.leftovers.argv = argv + 1;
+        return NULL;
+}
diff --git a/sway/commands/output/render_bit_depth.c b/sway/commands/output/render_bit_depth.c
new file mode 100644
index 00000000..c419321e
--- /dev/null
+++ b/sway/commands/output/render_bit_depth.c
@@ -0,0 +1,29 @@
+#include <drm_fourcc.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+
+struct cmd_results *output_cmd_render_bit_depth(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "Missing bit depth argument.");
+        }
+
+        if (strcmp(*argv, "8") == 0) {
+                config->handler_context.output_config->render_bit_depth =
+                        RENDER_BIT_DEPTH_8;
+        } else if (strcmp(*argv, "10") == 0) {
+                config->handler_context.output_config->render_bit_depth =
+                        RENDER_BIT_DEPTH_10;
+        } else {
+                return cmd_results_new(CMD_INVALID,
+                        "Invalid bit depth. Must be a value in (8|10).");
+        }
+
+        config->handler_context.leftovers.argc = argc - 1;
+        config->handler_context.leftovers.argv = argv + 1;
+        return NULL;
+}
+
diff --git a/sway/commands/output/toggle.c b/sway/commands/output/toggle.c
index 6342d526..c6b72845 100644
--- a/sway/commands/output/toggle.c
+++ b/sway/commands/output/toggle.c
@@ -29,7 +29,7 @@ struct cmd_results *output_cmd_toggle(int argc, char **argv) {
                 config->handler_context.output_config->enabled = 1;
         }
 
-        free(oc);
+        free_output_config(oc);
         config->handler_context.leftovers.argc = argc;
         config->handler_context.leftovers.argv = argv;
         return NULL;
diff --git a/sway/commands/output/transform.c b/sway/commands/output/transform.c
index f4fcc8c9..8db71bb3 100644
--- a/sway/commands/output/transform.c
+++ b/sway/commands/output/transform.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <wlr/util/transform.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "log.h"
diff --git a/sway/commands/output/unplug.c b/sway/commands/output/unplug.c
new file mode 100644
index 00000000..dfef626f
--- /dev/null
+++ b/sway/commands/output/unplug.c
@@ -0,0 +1,54 @@
+#include <strings.h>
+#include <wlr/config.h>
+#include <wlr/backend/headless.h>
+#include <wlr/backend/wayland.h>
+#if WLR_HAS_X11_BACKEND
+#include <wlr/backend/x11.h>
+#endif
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/output.h"
+
+static bool is_backend_allowed(struct wlr_backend *backend) {
+        if (wlr_backend_is_headless(backend)) {
+                return true;
+        }
+        if (wlr_backend_is_wl(backend)) {
+                return true;
+        }
+#if WLR_HAS_X11_BACKEND
+        if (wlr_backend_is_x11(backend)) {
+                return true;
+        }
+#endif
+        return false;
+}
+
+/**
+ * This command is intended for developer use only.
+ */
+struct cmd_results *output_cmd_unplug(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+
+        const char *oc_name = config->handler_context.output_config->name;
+        if (strcmp(oc_name, "*") == 0) {
+                return cmd_results_new(CMD_INVALID, "Won't unplug all outputs");
+        }
+
+        struct sway_output *sway_output = all_output_by_name_or_id(oc_name);
+        if (!sway_output) {
+                return cmd_results_new(CMD_INVALID,
+                        "Cannot unplug unknown output %s", oc_name);
+        }
+
+        if (!is_backend_allowed(sway_output->wlr_output->backend)) {
+                return cmd_results_new(CMD_INVALID,
+                        "Can only unplug outputs with headless, wayland or x11 backend");
+        }
+
+        wlr_output_destroy(sway_output->wlr_output);
+
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}