12 files changed, 116 insertions, 3 deletions

diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 08d99bf0..3cea026e 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -5,6 +5,7 @@
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
+#include "sway/server.h"
 #include "log.h"
 
 #if WLR_HAS_LIBINPUT_BACKEND
diff --git a/sway/commands/input/xkb_switch_layout.c b/sway/commands/input/xkb_switch_layout.c
index ecac8e6c..8d600fca 100644
--- a/sway/commands/input/xkb_switch_layout.c
+++ b/sway/commands/input/xkb_switch_layout.c
@@ -3,6 +3,7 @@
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
+#include "sway/server.h"
 #include "log.h"
 
 struct xkb_switch_layout_action {
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 8addf26e..ff656cfb 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -11,6 +11,7 @@
 #include "sway/input/seat.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
diff --git a/sway/commands/output.c b/sway/commands/output.c
index 5e5d31b3..b822e770 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -10,6 +10,7 @@ static const struct cmd_handler output_handlers[] = {
         { "adaptive_sync", output_cmd_adaptive_sync },
         { "background", output_cmd_background },
         { "bg", output_cmd_background },
+        { "color_profile", output_cmd_color_profile },
         { "disable", output_cmd_disable },
         { "dpms", output_cmd_dpms },
         { "enable", output_cmd_enable },
diff --git a/sway/commands/output/color_profile.c b/sway/commands/output/color_profile.c
new file mode 100644
index 00000000..792bd55f
--- /dev/null
+++ b/sway/commands/output/color_profile.c
@@ -0,0 +1,101 @@
+#include <fcntl.h>
+#include <strings.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <wlr/render/color.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+
+static bool read_file_into_buf(const char *path, void **buf, size_t *size) {
+        /* Why not use fopen/fread directly? glibc will succesfully open directories,
+         * not just files, and supports seeking on them. Instead, we directly
+         * work with file descriptors and use the more consistent open/fstat/read. */
+        int fd = open(path, O_RDONLY | O_NOCTTY | O_CLOEXEC);
+        if (fd == -1) {
+                return false;
+        }
+        char *b = NULL;
+        struct stat info;
+        if (fstat(fd, &info) == -1) {
+                goto fail;
+        }
+        // only regular files, to avoid issues with e.g. opening pipes
+        if (!S_ISREG(info.st_mode)) {
+                goto fail;
+        }
+        off_t s = info.st_size;
+        if (s <= 0) {
+                goto fail;
+        }
+        b = calloc(1, s);
+        if (!b) {
+                goto fail;
+        }
+        size_t nread = 0;
+        while (nread < (size_t)s) {
+                size_t to_read = (size_t)s - nread;
+                ssize_t r = read(fd, b + nread, to_read);
+                if ((r == -1 && errno != EINTR) || r == 0) {
+                        goto fail;
+                }
+                nread += (size_t)r;
+        }
+        close(fd);
+        *buf = b;
+        *size = (size_t)s;
+        return true; // success
+fail:
+        free(b);
+        close(fd);
+        return false;
+}
+
+struct cmd_results *output_cmd_color_profile(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 color_profile first argument.");
+        }
+
+        if (strcmp(*argv, "srgb") == 0) {
+                wlr_color_transform_unref(config->handler_context.output_config->color_transform);
+                config->handler_context.output_config->color_transform = NULL;
+                config->handler_context.output_config->set_color_transform = true;
+
+                config->handler_context.leftovers.argc = argc - 1;
+                config->handler_context.leftovers.argv = argv + 1;
+        } else if (strcmp(*argv, "icc") == 0) {
+                if (argc < 2) {
+                        return cmd_results_new(CMD_INVALID,
+                                "Invalid color profile specification: icc type requires a file");
+                }
+                void *data = NULL;
+                size_t size = 0;
+                if (!read_file_into_buf(argv[1], &data, &size)) {
+                        return cmd_results_new(CMD_FAILURE,
+                                "Failed to load color profile: could not read ICC file");
+                }
+
+                struct wlr_color_transform *tmp =
+                        wlr_color_transform_init_linear_to_icc(data, size);
+                if (!tmp) {
+                        free(data);
+                        return cmd_results_new(CMD_FAILURE,
+                                "Failed to load color profile: failed to initialize transform from ICC");
+                }
+                free(data);
+
+                wlr_color_transform_unref(config->handler_context.output_config->color_transform);
+                config->handler_context.output_config->color_transform = tmp;
+                config->handler_context.output_config->set_color_transform = true;
+
+                config->handler_context.leftovers.argc = argc - 2;
+                config->handler_context.leftovers.argv = argv + 2;
+        } else {
+                return cmd_results_new(CMD_INVALID,
+                        "Invalid color profile specification: first argument should be icc|srgb");
+        }
+
+        return NULL;
+}
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index df7c379d..434e6bbb 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -5,6 +5,7 @@
 #include <wlr/types/wlr_pointer.h>
 #include "sway/commands.h"
 #include "sway/input/cursor.h"
+#include "sway/server.h"
 
 static struct cmd_results *press_or_release(struct sway_cursor *cursor,
                 char *action, char *button_str);
diff --git a/sway/commands/seat/pointer_constraint.c b/sway/commands/seat/pointer_constraint.c
index 3890ebde..38f85bcd 100644
--- a/sway/commands/seat/pointer_constraint.c
+++ b/sway/commands/seat/pointer_constraint.c
@@ -4,6 +4,7 @@
 #include "sway/config.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
+#include "sway/server.h"
 
 enum operation {
         OP_ENABLE,
diff --git a/sway/commands/seat/shortcuts_inhibitor.c b/sway/commands/seat/shortcuts_inhibitor.c
index 7c7f99cf..df68618d 100644
--- a/sway/commands/seat/shortcuts_inhibitor.c
+++ b/sway/commands/seat/shortcuts_inhibitor.c
@@ -2,6 +2,7 @@
 #include "sway/commands.h"
 #include "sway/input/seat.h"
 #include "sway/input/input-manager.h"
+#include "sway/server.h"
 #include "util.h"
 
 static struct cmd_results *handle_action(struct seat_config *sc,
diff --git a/sway/commands/shortcuts_inhibitor.c b/sway/commands/shortcuts_inhibitor.c
index ffa1a5c9..2dfd1b9f 100644
--- a/sway/commands/shortcuts_inhibitor.c
+++ b/sway/commands/shortcuts_inhibitor.c
@@ -3,6 +3,7 @@
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/input/seat.h"
+#include "sway/server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
 
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index e142eede..c0b0d0b9 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -18,7 +18,7 @@ static bool test_con_id(struct sway_container *container, void *data) {
         return container->node.id == *con_id;
 }
 
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 static bool test_id(struct sway_container *container, void *data) {
         xcb_window_t *wid = data;
         return (container->view && container->view->type == SWAY_VIEW_XWAYLAND
@@ -53,7 +53,7 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
 
         char *value = join_args(argv + 3, argc - 3);
         if (strcasecmp(argv[2], "id") == 0) {
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                 xcb_window_t id = strtol(value, NULL, 0);
                 other = root_find_container(test_id, &id);
 #endif
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index a14ebb20..37a201b4 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -157,6 +157,10 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Unable to allocate workspace output");
                 }
+                if (output_location + 1 < argc) {
+                        list_free_items_and_destroy(wsc->outputs);
+                        wsc->outputs = create_list();
+                }
                 for (int i = output_location + 1; i < argc; ++i) {
                         list_add(wsc->outputs, strdup(argv[i]));
                 }
diff --git a/sway/commands/xwayland.c b/sway/commands/xwayland.c
index 584a8e3a..c0b175fc 100644
--- a/sway/commands/xwayland.c
+++ b/sway/commands/xwayland.c
@@ -10,7 +10,7 @@ struct cmd_results *cmd_xwayland(int argc, char **argv) {
                 return error;
         }
 
-#ifdef HAVE_XWAYLAND
+#ifdef WLR_HAS_XWAYLAND
         enum xwayland_mode xwayland;
         if (strcmp(argv[0], "force") == 0) {
                 xwayland = XWAYLAND_MODE_IMMEDIATE;