8 files changed, 27 insertions, 13 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 27058587..0a9fdc70 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -283,6 +283,7 @@ sway_cmd input_cmd_xkb_variant;
 
 sway_cmd output_cmd_adaptive_sync;
 sway_cmd output_cmd_background;
+sway_cmd output_cmd_color_profile;
 sway_cmd output_cmd_disable;
 sway_cmd output_cmd_dpms;
 sway_cmd output_cmd_enable;
diff --git a/include/sway/config.h b/include/sway/config.h
index 5ccc3e77..3e3a104e 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -7,6 +7,7 @@
 #include <wlr/interfaces/wlr_switch.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/util/box.h>
+#include <wlr/render/color.h>
 #include <xkbcommon/xkbcommon.h>
 #include <xf86drmMode.h>
 #include "../include/config.h"
@@ -285,6 +286,8 @@ struct output_config {
         int max_render_time; // In milliseconds
         int adaptive_sync;
         enum render_bit_depth render_bit_depth;
+        bool set_color_transform;
+        struct wlr_color_transform *color_transform;
 
         char *background;
         char *background_option;
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index 8da345ea..ae546821 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -7,6 +7,10 @@
 #include "list.h"
 #include "tree/view.h"
 
+#if WLR_HAS_XWAYLAND
+#include "sway/xwayland.h"
+#endif
+
 enum criteria_type {
         CT_COMMAND                 = 1 << 0,
         CT_ASSIGN_OUTPUT           = 1 << 1,
@@ -36,7 +40,7 @@ struct criteria {
         struct pattern *app_id;
         struct pattern *con_mark;
         uint32_t con_id; // internal ID
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         struct pattern *class;
         uint32_t id; // X11 window ID
         struct pattern *instance;
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index 45c75199..b014e18f 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -5,10 +5,11 @@
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_virtual_pointer_v1.h>
 #include <wlr/types/wlr_transient_seat_v1.h>
-#include "sway/server.h"
 #include "sway/config.h"
 #include "list.h"
 
+struct sway_server;
+
 struct sway_input_device {
         char *identifier;
         struct wlr_input_device *wlr_device;
diff --git a/include/sway/output.h b/include/sway/output.h
index d546d488..2189c6e8 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -66,6 +66,8 @@ struct sway_output {
                 struct wl_signal disable;
         } events;
 
+        struct wlr_color_transform *color_transform;
+
         struct timespec last_presentation;
         uint32_t refresh_nsec;
         int max_render_time; // In milliseconds
diff --git a/include/sway/server.h b/include/sway/server.h
index c71851f6..3a63df34 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -5,7 +5,7 @@
 #include "config.h"
 #include "list.h"
 #include "sway/desktop/idle_inhibit_v1.h"
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 #include "sway/xwayland.h"
 #endif
 
@@ -59,7 +59,7 @@ struct sway_server {
 
         struct wlr_tablet_manager_v2 *tablet_v2;
 
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         struct sway_xwayland xwayland;
         struct wl_listener xwayland_surface;
         struct wl_listener xwayland_ready;
@@ -81,6 +81,8 @@ struct sway_server {
         struct wlr_pointer_constraints_v1 *pointer_constraints;
         struct wl_listener pointer_constraint;
 
+        struct wlr_xdg_output_manager_v1 *xdg_output_manager_v1;
+
         struct wlr_output_manager_v1 *output_manager_v1;
         struct wl_listener output_manager_apply;
         struct wl_listener output_manager_test;
@@ -165,7 +167,7 @@ void sway_session_lock_add_output(struct sway_session_lock *lock,
 bool sway_session_lock_has_surface(struct sway_session_lock *lock,
         struct wlr_surface *surface);
 void handle_xdg_shell_toplevel(struct wl_listener *listener, void *data);
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
 #endif
 void handle_server_decoration(struct wl_listener *listener, void *data);
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h
index 15df0f55..7de0abcd 100644
--- a/include/sway/tree/root.h
+++ b/include/sway/tree/root.h
@@ -2,12 +2,12 @@
 #define _SWAY_ROOT_H
 #include <wayland-server-core.h>
 #include <wayland-util.h>
+#include <wlr/config.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/render/wlr_texture.h>
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
-#include "config.h"
 #include "list.h"
 
 extern struct sway_root *root;
@@ -47,7 +47,7 @@ struct sway_root {
                 struct wlr_scene_tree *shell_top;
                 struct wlr_scene_tree *fullscreen;
                 struct wlr_scene_tree *fullscreen_global;
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                 struct wlr_scene_tree *unmanaged;
 #endif
                 struct wlr_scene_tree *shell_overlay;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 7faacdcc..3ae8cf22 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,10 +1,11 @@
 #ifndef _SWAY_VIEW_H
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
+#include <wlr/config.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_scene.h>
 #include "sway/config.h"
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
 #include "sway/input/input-manager.h"
@@ -15,7 +16,7 @@ struct sway_xdg_decoration;
 
 enum sway_view_type {
         SWAY_VIEW_XDG_SHELL,
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         SWAY_VIEW_XWAYLAND,
 #endif
 };
@@ -27,7 +28,7 @@ enum sway_view_prop {
         VIEW_PROP_INSTANCE,
         VIEW_PROP_WINDOW_TYPE,
         VIEW_PROP_WINDOW_ROLE,
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         VIEW_PROP_X11_WINDOW_ID,
         VIEW_PROP_X11_PARENT_ID,
 #endif
@@ -98,7 +99,7 @@ struct sway_view {
 
         union {
                 struct wlr_xdg_toplevel *wlr_xdg_toplevel;
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                 struct wlr_xwayland_surface *wlr_xwayland_surface;
 #endif
         };
@@ -127,7 +128,7 @@ struct sway_xdg_shell_view {
         struct wl_listener unmap;
         struct wl_listener destroy;
 };
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 struct sway_xwayland_view {
         struct sway_view view;
 
@@ -293,7 +294,7 @@ void view_center_and_clip_surface(struct sway_view *view);
 
 struct sway_view *view_from_wlr_xdg_surface(
         struct wlr_xdg_surface *xdg_surface);
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 struct sway_view *view_from_wlr_xwayland_surface(
         struct wlr_xwayland_surface *xsurface);
 #endif