28 files changed, 204 insertions, 127 deletions

diff --git a/include/background-image.h b/include/background-image.h
index 15935ffd..a97ef375 100644
--- a/include/background-image.h
+++ b/include/background-image.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_BACKGROUND_IMAGE_H
 #define _SWAY_BACKGROUND_IMAGE_H
-#include "cairo.h"
+#include "cairo_util.h"
 
 enum background_mode {
         BACKGROUND_MODE_STRETCH,
diff --git a/include/cairo.h b/include/cairo_util.h
index c1275db2..dc049c6d 100644
--- a/include/cairo.h
+++ b/include/cairo_util.h
@@ -1,8 +1,8 @@
-#ifndef _SWAY_CAIRO_H
-#define _SWAY_CAIRO_H
+#ifndef _SWAY_CAIRO_UTIL_H
+#define _SWAY_CAIRO_UTIL_H
 #include "config.h"
 #include <stdint.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <wayland-client-protocol.h>
 
 void cairo_set_source_u32(cairo_t *cairo, uint32_t color);
diff --git a/include/ipc-client.h b/include/ipc-client.h
index d3895023..9c5712d7 100644
--- a/include/ipc-client.h
+++ b/include/ipc-client.h
@@ -1,6 +1,9 @@
 #ifndef _SWAY_IPC_CLIENT_H
 #define _SWAY_IPC_CLIENT_H
 
+// arbitrary number, it's probably sufficient, higher number = more memory usage
+#define JSON_MAX_DEPTH 512
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/time.h>
diff --git a/include/pango.h b/include/pango.h
index 6ab83c16..93affc23 100644
--- a/include/pango.h
+++ b/include/pango.h
@@ -3,7 +3,7 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
 
 /**
@@ -17,7 +17,8 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
                 const char *text, double scale, bool markup);
 void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
                 int *baseline, double scale, bool markup, const char *fmt, ...);
-void pango_printf(cairo_t *cairo, const char *font,
+void get_text_metrics(const char *font, int *height, int *baseline);
+void render_text(cairo_t *cairo, const char *font,
                 double scale, bool markup, const char *fmt, ...);
 
 #endif
diff --git a/include/pool-buffer.h b/include/pool-buffer.h
index 54f5be06..b7a95afe 100644
--- a/include/pool-buffer.h
+++ b/include/pool-buffer.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_BUFFERS_H
 #define _SWAY_BUFFERS_H
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/include/sway/commands.h b/include/sway/commands.h
index 964b3661..2746ef28 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -46,8 +46,8 @@ enum expected_args {
 struct cmd_results *checkarg(int argc, const char *name,
                 enum expected_args type, int val);
 
-struct cmd_handler *find_handler(char *line, struct cmd_handler *cmd_handlers,
-                size_t handlers_size);
+const struct cmd_handler *find_handler(char *line,
+                const struct cmd_handler *cmd_handlers, size_t handlers_size);
 
 /**
  * Parse and executes a command.
@@ -68,7 +68,7 @@ struct cmd_results *config_command(char *command, char **new_block);
  * Parse and handle a sub command
  */
 struct cmd_results *config_subcommand(char **argv, int argc,
-                struct cmd_handler *handlers, size_t handlers_size);
+                const struct cmd_handler *handlers, size_t handlers_size);
 /*
  * Parses a command policy rule.
  */
@@ -112,6 +112,7 @@ sway_cmd cmd_border;
 sway_cmd cmd_client_noop;
 sway_cmd cmd_client_focused;
 sway_cmd cmd_client_focused_inactive;
+sway_cmd cmd_client_focused_tab_title;
 sway_cmd cmd_client_unfocused;
 sway_cmd cmd_client_urgent;
 sway_cmd cmd_client_placeholder;
@@ -282,7 +283,9 @@ sway_cmd output_cmd_dpms;
 sway_cmd output_cmd_enable;
 sway_cmd output_cmd_max_render_time;
 sway_cmd output_cmd_mode;
+sway_cmd output_cmd_modeline;
 sway_cmd output_cmd_position;
+sway_cmd output_cmd_render_bit_depth;
 sway_cmd output_cmd_scale;
 sway_cmd output_cmd_scale_filter;
 sway_cmd output_cmd_subpixel;
diff --git a/include/sway/config.h b/include/sway/config.h
index 59f22ae2..2e24c3ae 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -5,9 +5,10 @@
 #include <string.h>
 #include <time.h>
 #include <wlr/interfaces/wlr_switch.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_tablet_tool.h>
+#include <wlr/util/box.h>
 #include <xkbcommon/xkbcommon.h>
+#include <xf86drmMode.h>
 #include "../include/config.h"
 #include "list.h"
 #include "swaynag.h"
@@ -47,7 +48,7 @@ enum binding_flags {
 };
 
 /**
- * A key binding and an associated command.
+ * A key (or mouse) binding and an associated command.
  */
 struct sway_binding {
         enum binding_input_type type;
@@ -61,12 +62,10 @@ struct sway_binding {
         char *command;
 };
 
-/**
- * A mouse binding and an associated command.
- */
-struct sway_mouse_binding {
-        uint32_t button;
-        char *command;
+enum sway_switch_trigger {
+        SWAY_SWITCH_TRIGGER_OFF,
+        SWAY_SWITCH_TRIGGER_ON,
+        SWAY_SWITCH_TRIGGER_TOGGLE,
 };
 
 /**
@@ -74,7 +73,7 @@ struct sway_mouse_binding {
  */
 struct sway_switch_binding {
         enum wlr_switch_type type;
-        enum wlr_switch_state state;
+        enum sway_switch_trigger trigger;
         uint32_t flags;
         char *command;
 };
@@ -246,6 +245,12 @@ enum scale_filter_mode {
         SCALE_FILTER_SMART,
 };
 
+enum render_bit_depth {
+        RENDER_BIT_DEPTH_DEFAULT, // the default is currently 8
+        RENDER_BIT_DEPTH_8,
+        RENDER_BIT_DEPTH_10,
+};
+
 /**
  * Size and position configuration for a particular output.
  *
@@ -257,6 +262,7 @@ struct output_config {
         int width, height;
         float refresh_rate;
         int custom_mode;
+        drmModeModeInfo drm_mode;
         int x, y;
         float scale;
         enum scale_filter_mode scale_filter;
@@ -264,6 +270,7 @@ struct output_config {
         enum wl_output_subpixel subpixel;
         int max_render_time; // In milliseconds
         int adaptive_sync;
+        enum render_bit_depth render_bit_depth;
 
         char *background;
         char *background_option;
@@ -281,6 +288,12 @@ struct side_gaps {
         int left;
 };
 
+enum smart_gaps_mode {
+        SMART_GAPS_OFF,
+        SMART_GAPS_ON,
+        SMART_GAPS_INVERSE_OUTER,
+};
+
 /**
  * Stores configuration for a workspace, regardless of whether the workspace
  * exists.
@@ -292,6 +305,12 @@ struct workspace_config {
         struct side_gaps gaps_outer;
 };
 
+enum pango_markup_config {
+        PANGO_MARKUP_DISABLED = false,
+        PANGO_MARKUP_ENABLED = true,
+        PANGO_MARKUP_DEFAULT // The default is font dependent ("pango:" prefix)
+};
+
 struct bar_config {
         char *swaybar_command;
         struct wl_client *client;
@@ -323,7 +342,7 @@ struct bar_config {
         char *position;
         list_t *bindings;
         char *status_command;
-        bool pango_markup;
+        enum pango_markup_config pango_markup;
         char *font;
         int height; // -1 not defined
         bool workspace_buttons;
@@ -410,14 +429,6 @@ enum sway_popup_during_fullscreen {
         POPUP_LEAVE,
 };
 
-enum command_context {
-        CONTEXT_CONFIG = 1 << 0,
-        CONTEXT_BINDING = 1 << 1,
-        CONTEXT_IPC = 1 << 2,
-        CONTEXT_CRITERIA = 1 << 3,
-        CONTEXT_ALL = 0xFFFFFFFF,
-};
-
 enum focus_follows_mouse_mode {
         FOLLOWS_NO,
         FOLLOWS_YES,
@@ -480,8 +491,8 @@ struct sway_config {
         enum sway_container_layout default_orientation;
         enum sway_container_layout default_layout;
         char *font;
-        size_t font_height;
-        size_t font_baseline;
+        int font_height;
+        int font_baseline;
         bool pango_markup;
         int titlebar_border_thickness;
         int titlebar_h_padding;
@@ -512,7 +523,7 @@ struct sway_config {
         bool tiling_drag;
         int tiling_drag_threshold;
 
-        bool smart_gaps;
+        enum smart_gaps_mode smart_gaps;
         int gaps_inner;
         struct side_gaps gaps_outer;
 
@@ -535,12 +546,15 @@ struct sway_config {
         struct {
                 struct border_colors focused;
                 struct border_colors focused_inactive;
+                struct border_colors focused_tab_title;
                 struct border_colors unfocused;
                 struct border_colors urgent;
                 struct border_colors placeholder;
                 float background[4];
         } border_colors;
 
+        bool has_focused_tab_title;
+
         // floating view
         int32_t floating_maximum_width;
         int32_t floating_maximum_height;
@@ -559,7 +573,7 @@ struct sway_config {
                 struct sway_node *node;
                 struct sway_container *container;
                 struct sway_workspace *workspace;
-                bool using_criteria;
+                bool node_overridden; // True if the node is selected by means other than focus
                 struct {
                         int argc;
                         char **argv;
@@ -690,14 +704,13 @@ void free_bar_binding(struct bar_binding *binding);
 void free_workspace_config(struct workspace_config *wsc);
 
 /**
- * Updates the value of config->font_height based on the max title height
- * reported by each container. If recalculate is true, the containers will
- * recalculate their heights before reporting.
- *
+ * Updates the value of config->font_height based on the metrics for title's
+ * font as reported by pango.
+ * 
  * If the height has changed, all containers will be rearranged to take on the
  * new size.
  */
-void config_update_font_height(bool recalculate);
+void config_update_font_height(void);
 
 /**
  * Convert bindsym into bindcode using the first configured layout.
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index ad8610cd..59f57f94 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -1,7 +1,8 @@
 #ifndef _SWAY_CRITERIA_H
 #define _SWAY_CRITERIA_H
 
-#include <pcre.h>
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
 #include "config.h"
 #include "list.h"
 #include "tree/view.h"
@@ -15,13 +16,13 @@ enum criteria_type {
 };
 
 enum pattern_type {
-        PATTERN_PCRE,
+        PATTERN_PCRE2,
         PATTERN_FOCUSED,
 };
 
 struct pattern {
         enum pattern_type match_type;
-        pcre *regex;
+        pcre2_code *regex;
 };
 
 struct criteria {
diff --git a/include/sway/desktop.h b/include/sway/desktop.h
index c969a76b..7f2f5b3e 100644
--- a/include/sway/desktop.h
+++ b/include/sway/desktop.h
@@ -1,4 +1,4 @@
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 
 struct sway_container;
 struct sway_view;
diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h
index 0adafdb9..58d54c68 100644
--- a/include/sway/desktop/idle_inhibit_v1.h
+++ b/include/sway/desktop/idle_inhibit_v1.h
@@ -22,6 +22,7 @@ struct sway_idle_inhibit_manager_v1 {
 
 struct sway_idle_inhibitor_v1 {
         struct sway_idle_inhibit_manager_v1 *manager;
+        struct wlr_idle_inhibitor_v1 *wlr_inhibitor;
         struct sway_view *view;
         enum sway_idle_inhibit_mode mode;
 
diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index 175489c5..7dd58ba8 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -28,6 +28,12 @@ struct sway_view;
  */
 void transaction_commit_dirty(void);
 
+/*
+ * Same as transaction_commit_dirty, but signalling that this is a
+ * client-initiated change has already taken effect.
+ */
+void transaction_commit_dirty_client(void);
+
 /**
  * Notify the transaction system that a view is ready for the new layout.
  *
@@ -45,10 +51,4 @@ void transaction_notify_view_ready_by_serial(struct sway_view *view,
 void transaction_notify_view_ready_by_geometry(struct sway_view *view,
                 double x, double y, int width, int height);
 
-/**
- * Unconditionally notify the transaction system that a view is ready for the
- * new layout.
- */
-void transaction_notify_view_ready_immediately(struct sway_view *view);
-
 #endif
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 6a38190b..3a71a35f 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_pointer_gestures_v1.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "sway/input/seat.h"
 #include "config.h"
 
@@ -42,6 +42,8 @@ struct sway_cursor {
         struct wl_listener swipe_begin;
         struct wl_listener swipe_update;
         struct wl_listener swipe_end;
+        struct wl_listener hold_begin;
+        struct wl_listener hold_end;
 
         struct wl_listener motion;
         struct wl_listener motion_absolute;
@@ -52,7 +54,9 @@ struct sway_cursor {
         struct wl_listener touch_down;
         struct wl_listener touch_up;
         struct wl_listener touch_motion;
+        struct wl_listener touch_frame;
         bool simulating_pointer_from_touch;
+        bool pointer_touch_up;
         int32_t pointer_touch_id;
 
         struct wl_listener tool_axis;
@@ -108,7 +112,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
         enum wlr_button_state state);
 
 void dispatch_cursor_axis(struct sway_cursor *cursor,
-                struct wlr_event_pointer_axis *event);
+                struct wlr_pointer_axis_event *event);
 
 void cursor_set_image(struct sway_cursor *cursor, const char *image,
         struct wl_client *client);
diff --git a/include/sway/input/libinput.h b/include/sway/input/libinput.h
index de019976..890d632e 100644
--- a/include/sway/input/libinput.h
+++ b/include/sway/input/libinput.h
@@ -6,4 +6,6 @@ void sway_input_configure_libinput_device(struct sway_input_device *device);
 
 void sway_input_reset_libinput_device(struct sway_input_device *device);
 
+bool sway_libinput_device_is_builtin(struct sway_input_device *device);
+
 #endif
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 4118df66..47726159 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -18,7 +18,7 @@ struct sway_seatop_impl {
                         enum wlr_button_state state);
         void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec);
         void (*pointer_axis)(struct sway_seat *seat,
-                        struct wlr_event_pointer_axis *event);
+                        struct wlr_pointer_axis_event *event);
         void (*rebase)(struct sway_seat *seat, uint32_t time_msec);
         void (*tablet_tool_motion)(struct sway_seat *seat,
                         struct sway_tablet_tool *tool, uint32_t time_msec);
@@ -185,6 +185,10 @@ struct sway_workspace *seat_get_last_known_workspace(struct sway_seat *seat);
 
 struct sway_container *seat_get_focused_container(struct sway_seat *seat);
 
+// Force focus to a particular surface that is not part of the workspace
+// hierarchy (used for lockscreen)
+void sway_force_focus(struct wlr_surface *surface);
+
 /**
  * Return the last container to be focused for the seat (or the most recently
  * opened if no container has received focused) that is a child of the given
@@ -239,7 +243,10 @@ enum wlr_edges find_resize_edge(struct sway_container *cont,
 void seatop_begin_default(struct sway_seat *seat);
 
 void seatop_begin_down(struct sway_seat *seat, struct sway_container *con,
-                uint32_t time_msec, int sx, int sy);
+                uint32_t time_msec, double sx, double sy);
+
+void seatop_begin_down_on_surface(struct sway_seat *seat,
+                struct wlr_surface *surface, uint32_t time_msec, double sx, double sy);
 
 void seatop_begin_move_floating(struct sway_seat *seat,
                 struct sway_container *con);
@@ -271,7 +278,7 @@ void seatop_button(struct sway_seat *seat, uint32_t time_msec,
 void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec);
 
 void seatop_pointer_axis(struct sway_seat *seat,
-                struct wlr_event_pointer_axis *event);
+                struct wlr_pointer_axis_event *event);
 
 void seatop_tablet_tool_tip(struct sway_seat *seat,
                 struct sway_tablet_tool *tool, uint32_t time_msec,
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
index 6cf9bdb3..c70fd935 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -3,7 +3,7 @@
 
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_input_method_v2.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "sway/input/seat.h"
 
 /**
@@ -28,7 +28,10 @@ struct sway_input_method_relay {
 
         struct wl_listener input_method_new;
         struct wl_listener input_method_commit;
+        struct wl_listener input_method_grab_keyboard;
         struct wl_listener input_method_destroy;
+
+        struct wl_listener input_method_keyboard_grab_destroy;
 };
 
 struct sway_text_input {
diff --git a/include/sway/layers.h b/include/sway/layers.h
index 457634c2..f8508493 100644
--- a/include/sway/layers.h
+++ b/include/sway/layers.h
@@ -1,8 +1,7 @@
 #ifndef _SWAY_LAYERS_H
 #define _SWAY_LAYERS_H
 #include <stdbool.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 
 enum layer_parent {
@@ -23,7 +22,11 @@ struct sway_layer_surface {
         struct wl_listener new_subsurface;
 
         struct wlr_box geo;
+        bool mapped;
+        struct wlr_box extent;
         enum zwlr_layer_shell_v1_layer layer;
+
+        struct wl_list subsurfaces;
 };
 
 struct sway_layer_popup {
@@ -43,6 +46,7 @@ struct sway_layer_popup {
 struct sway_layer_subsurface {
         struct wlr_subsurface *wlr_subsurface;
         struct sway_layer_surface *layer_surface;
+        struct wl_list link;
 
         struct wl_listener map;
         struct wl_listener unmap;
diff --git a/include/sway/output.h b/include/sway/output.h
index 96986700..26b9709f 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -3,7 +3,6 @@
 #include <time.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include "config.h"
 #include "sway/tree/node.h"
@@ -49,7 +48,7 @@ struct sway_output {
         struct wl_listener damage_frame;
 
         struct {
-                struct wl_signal destroy;
+                struct wl_signal disable;
         } events;
 
         struct timespec last_presentation;
@@ -72,8 +71,8 @@ struct sway_output *output_get_in_direction(struct sway_output *reference,
 void output_add_workspace(struct sway_output *output,
                 struct sway_workspace *workspace);
 
-typedef void (*sway_surface_iterator_func_t)(struct sway_output *output, struct sway_view *view,
-        struct wlr_surface *surface, struct wlr_box *box, float rotation,
+typedef void (*sway_surface_iterator_func_t)(struct sway_output *output,
+        struct sway_view *view, struct wlr_surface *surface, struct wlr_box *box,
         void *user_data);
 
 void output_damage_whole(struct sway_output *output);
diff --git a/include/sway/server.h b/include/sway/server.h
index 0f5e3ab2..3d59ca56 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -4,16 +4,19 @@
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
+#include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_foreign_toplevel_management_v1.h>
+#include <wlr/types/wlr_drm_lease_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output_management_v1.h>
 #include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
+#include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_xdg_shell.h>
@@ -23,19 +26,24 @@
 #include "sway/xwayland.h"
 #endif
 
+struct sway_transaction;
+
 struct sway_server {
         struct wl_display *wl_display;
         struct wl_event_loop *wl_event_loop;
         const char *socket;
 
         struct wlr_backend *backend;
-        struct wlr_backend *noop_backend;
         // secondary headless backend used for creating virtual outputs on-the-fly
         struct wlr_backend *headless_backend;
+        struct wlr_renderer *renderer;
+        struct wlr_allocator *allocator;
 
         struct wlr_compositor *compositor;
         struct wl_listener compositor_new_surface;
 
+        struct wlr_linux_dmabuf_v1 *linux_dmabuf_v1;
+
         struct wlr_data_device_manager *data_device_manager;
 
         struct sway_input_manager *input;
@@ -70,6 +78,9 @@ struct sway_server {
         struct wl_listener xdg_decoration;
         struct wl_list xdg_decorations; // sway_xdg_decoration::link
 
+        struct wlr_drm_lease_v1_manager *drm_lease_manager;
+        struct wl_listener drm_lease_request;
+
         struct wlr_presentation *presentation;
 
         struct wlr_pointer_constraints_v1 *pointer_constraints;
@@ -79,14 +90,44 @@ struct sway_server {
         struct wl_listener output_manager_apply;
         struct wl_listener output_manager_test;
 
+        struct {
+                bool locked;
+                struct wlr_session_lock_manager_v1 *manager;
+
+                struct wlr_session_lock_v1 *lock;
+                struct wl_listener lock_new_surface;
+                struct wl_listener lock_unlock;
+                struct wl_listener lock_destroy;
+
+                struct wl_listener new_lock;
+                struct wl_listener manager_destroy;
+        } session_lock;
+
         struct wlr_output_power_manager_v1 *output_power_manager_v1;
         struct wl_listener output_power_manager_set_mode;
         struct wlr_input_method_manager_v2 *input_method;
         struct wlr_text_input_manager_v3 *text_input;
         struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_manager;
 
+        struct wlr_xdg_activation_v1 *xdg_activation_v1;
+        struct wl_listener xdg_activation_v1_request_activate;
+
+        // The timeout for transactions, after which a transaction is applied
+        // regardless of readiness.
         size_t txn_timeout_ms;
-        list_t *transactions;
+
+        // Stores a transaction after it has been committed, but is waiting for
+        // views to ack the new dimensions before being applied. A queued
+        // transaction is frozen and must not have new instructions added to it.
+        struct sway_transaction *queued_transaction;
+
+        // Stores a pending transaction that will be committed once the existing
+        // queued transaction is applied and freed. The pending transaction can be
+        // updated with new instructions as needed.
+        struct sway_transaction *pending_transaction;
+
+        // Stores the nodes that have been marked as "dirty" and will be put into
+        // the pending transaction.
         list_t *dirty_nodes;
 };
 
@@ -96,6 +137,7 @@ struct sway_debug {
         bool noatomic;         // Ignore atomic layout updates
         bool txn_timings;      // Log verbose messages about transactions
         bool txn_wait;         // Always wait for the timeout before applying
+        bool noscanout;        // Disable direct scan-out
 
         enum {
                 DAMAGE_DEFAULT,    // Default behaviour
@@ -113,11 +155,14 @@ void server_fini(struct sway_server *server);
 bool server_start(struct sway_server *server);
 void server_run(struct sway_server *server);
 
+void restore_nofile_limit(void);
+
 void handle_compositor_new_surface(struct wl_listener *listener, void *data);
 void handle_new_output(struct wl_listener *listener, void *data);
 
 void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data);
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
+void sway_session_lock_init(void);
 void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
 #if HAVE_XWAYLAND
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
@@ -125,5 +170,9 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data);
 void handle_server_decoration(struct wl_listener *listener, void *data);
 void handle_xdg_decoration(struct wl_listener *listener, void *data);
 void handle_pointer_constraint(struct wl_listener *listener, void *data);
+void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
+        void *data);
+
+void set_rr_scheduling(void);
 
 #endif
diff --git a/include/sway/surface.h b/include/sway/surface.h
index 4da96c02..fb1cd775 100644
--- a/include/sway/surface.h
+++ b/include/sway/surface.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_SURFACE_H
 #define _SWAY_SURFACE_H
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 
 struct sway_surface {
         struct wlr_surface *wlr_surface;
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 7e9df59f..751612e2 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -2,8 +2,7 @@
 #define _SWAY_CONTAINER_H
 #include <stdint.h>
 #include <sys/types.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "list.h"
 #include "sway/tree/node.h"
 
@@ -46,9 +45,9 @@ struct sway_container_state {
 
         enum sway_fullscreen_mode fullscreen_mode;
 
-        struct sway_workspace *workspace;
-        struct sway_container *parent;
-        list_t *children;
+        struct sway_workspace *workspace; // NULL when hidden in the scratchpad
+        struct sway_container *parent;    // NULL if container in root of workspace
+        list_t *children;                 // struct sway_container
 
         struct sway_container *focused_inactive_child;
         bool focused;
@@ -60,6 +59,7 @@ struct sway_container_state {
         bool border_left;
         bool border_right;
 
+        // These are in layout coordinates.
         double content_x, content_y;
         double content_width, content_height;
 };
@@ -68,14 +68,12 @@ struct sway_container {
         struct sway_node node;
         struct sway_view *view;
 
-        // The pending state is the main container properties, and the current state is in the below struct.
-        // This means most places of the code can refer to the main variables (pending state) and it'll just work.
         struct sway_container_state current;
+        struct sway_container_state pending;
 
         char *title;           // The view's title (unformatted)
         char *formatted_title; // The title displayed in the title bar
 
-        enum sway_container_layout layout;
         enum sway_container_layout prev_split_layout;
 
         // Whether stickiness has been enabled on this container. Use
@@ -86,11 +84,13 @@ struct sway_container {
         // For C_ROOT, this has no meaning
         // For other types, this is the position in layout coordinates
         // Includes borders
-        double x, y;
-        double width, height;
         double saved_x, saved_y;
         double saved_width, saved_height;
 
+        // Used when the view changes to CSD unexpectedly. This will be a non-B_CSD
+        // border which we use to restore when the view returns to SSD.
+        enum sway_container_border saved_border;
+
         // The share of the space of parent container this container occupies
         double width_fraction;
         double height_fraction;
@@ -100,33 +100,11 @@ struct sway_container {
         double child_total_width;
         double child_total_height;
 
-        // These are in layout coordinates.
-        double content_x, content_y;
-        int content_width, content_height;
-
         // In most cases this is the same as the content x and y, but if the view
         // refuses to resize to the content dimensions then it can be smaller.
         // These are in layout coordinates.
         double surface_x, surface_y;
 
-        enum sway_fullscreen_mode fullscreen_mode;
-
-        enum sway_container_border border;
-
-        // Used when the view changes to CSD unexpectedly. This will be a non-B_CSD
-        // border which we use to restore when the view returns to SSD.
-        enum sway_container_border saved_border;
-
-        int border_thickness;
-        bool border_top;
-        bool border_bottom;
-        bool border_left;
-        bool border_right;
-
-        struct sway_workspace *workspace; // NULL when hidden in the scratchpad
-        struct sway_container *parent;    // NULL if container in root of workspace
-        list_t *children;                 // struct sway_container
-
         // Outputs currently being intersected
         list_t *outputs; // struct sway_output
 
@@ -139,14 +117,14 @@ struct sway_container {
 
         struct wlr_texture *title_focused;
         struct wlr_texture *title_focused_inactive;
+        struct wlr_texture *title_focused_tab_title;
         struct wlr_texture *title_unfocused;
         struct wlr_texture *title_urgent;
-        size_t title_height;
-        size_t title_baseline;
 
         list_t *marks; // char *
         struct wlr_texture *marks_focused;
         struct wlr_texture *marks_focused_inactive;
+        struct wlr_texture *marks_focused_tab_title;
         struct wlr_texture *marks_unfocused;
         struct wlr_texture *marks_urgent;
 
@@ -185,6 +163,11 @@ void container_for_each_child(struct sway_container *container,
                 void (*f)(struct sway_container *container, void *data), void *data);
 
 /**
+ * Returns the fullscreen container obstructing this container if it exists.
+ */
+struct sway_container *container_obstructing_fullscreen_container(struct sway_container *container);
+
+/**
  * Returns true if the given container is an ancestor of this container.
  */
 bool container_has_ancestor(struct sway_container *container,
@@ -200,11 +183,6 @@ struct sway_container *container_flatten(struct sway_container *container);
 
 void container_update_title_textures(struct sway_container *container);
 
-/**
- * Calculate the container's title_height property.
- */
-void container_calculate_title_height(struct sway_container *container);
-
 size_t container_build_representation(enum sway_container_layout layout,
                 list_t *children, char *buffer);
 
@@ -231,10 +209,17 @@ void container_set_geometry_from_content(struct sway_container *con);
 /**
  * Determine if the given container is itself floating.
  * This will return false for any descendants of a floating container.
+ *
+ * Uses pending container state.
  */
 bool container_is_floating(struct sway_container *container);
 
 /**
+ * Same as above, but for current container state.
+ */
+bool container_is_current_floating(struct sway_container *container);
+
+/**
  * Get a container's box in layout coordinates.
  */
 void container_get_box(struct sway_container *container, struct wlr_box *box);
@@ -299,6 +284,7 @@ bool container_is_fullscreen_or_child(struct sway_container *container);
 /**
  * Return the output which will be used for scale purposes.
  * This is the most recently entered output.
+ * If the container is not on any output, return NULL.
  */
 struct sway_output *container_get_effective_output(struct sway_container *con);
 
@@ -378,7 +364,7 @@ bool container_is_sticky_or_child(struct sway_container *con);
  * This will destroy pairs of redundant H/V splits
  * e.g. H[V[H[app app]] app] -> H[app app app]
  * The middle "V[H[" are eliminated by a call to container_squash
- * on the V[ con. It's grandchildren are added to it's parent.
+ * on the V[ con. It's grandchildren are added to its parent.
  *
  * This function is roughly equivalent to i3's tree_flatten here:
  * https://github.com/i3/i3/blob/1f0c628cde40cf87371481041b7197344e0417c6/src/tree.c#L651
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h
index e8f4d573..5d4a2f2d 100644
--- a/include/sway/tree/root.h
+++ b/include/sway/tree/root.h
@@ -31,7 +31,7 @@ struct sway_root {
         list_t *scratchpad; // struct sway_container
 
         // For when there's no connected outputs
-        struct sway_output *noop_output;
+        struct sway_output *fallback_output;
 
         struct sway_container *fullscreen_global;
 
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e071e6c9..95708a04 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_VIEW_H
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "config.h"
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
@@ -108,11 +108,10 @@ struct sway_view {
         list_t *executed_criteria; // struct criteria *
 
         union {
-                struct wlr_xdg_surface *wlr_xdg_surface;
+                struct wlr_xdg_toplevel *wlr_xdg_toplevel;
 #if HAVE_XWAYLAND
                 struct wlr_xwayland_surface *wlr_xwayland_surface;
 #endif
-                struct wlr_wl_shell_surface *wlr_wl_shell_surface;
         };
 
         struct {
@@ -132,7 +131,6 @@ struct sway_xdg_shell_view {
         struct wl_listener commit;
         struct wl_listener request_move;
         struct wl_listener request_resize;
-        struct wl_listener request_maximize;
         struct wl_listener request_fullscreen;
         struct wl_listener set_title;
         struct wl_listener set_app_id;
@@ -171,6 +169,7 @@ struct sway_xwayland_unmanaged {
 
         int lx, ly;
 
+        struct wl_listener request_activate;
         struct wl_listener request_configure;
         struct wl_listener request_fullscreen;
         struct wl_listener commit;
@@ -184,7 +183,7 @@ struct sway_xwayland_unmanaged {
 struct sway_view_child;
 
 struct sway_view_child_impl {
-        void (*get_root_coords)(struct sway_view_child *child, int *sx, int *sy);
+        void (*get_view_coords)(struct sway_view_child *child, int *sx, int *sy);
         void (*destroy)(struct sway_view_child *child);
 };
 
@@ -218,7 +217,7 @@ struct sway_subsurface {
 struct sway_xdg_popup {
         struct sway_view_child child;
 
-        struct wlr_xdg_surface *wlr_xdg_surface;
+        struct wlr_xdg_popup *wlr_xdg_popup;
 
         struct wl_listener new_popup;
         struct wl_listener destroy;
@@ -311,12 +310,22 @@ void view_destroy(struct sway_view *view);
 
 void view_begin_destroy(struct sway_view *view);
 
+/**
+ * Map a view, ie. make it visible in the tree.
+ *
+ * `fullscreen` should be set to true (and optionally `fullscreen_output`
+ * should be populated) if the view should be made fullscreen immediately.
+ *
+ * `decoration` should be set to true if the client prefers CSD. The client's
+ * preference may be ignored.
+ */
 void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         bool fullscreen, struct wlr_output *fullscreen_output, bool decoration);
 
 void view_unmap(struct sway_view *view);
 
-void view_update_size(struct sway_view *view, int width, int height);
+void view_update_size(struct sway_view *view);
+void view_center_surface(struct sway_view *view);
 
 void view_child_init(struct sway_view_child *child,
         const struct sway_view_child_impl *impl, struct sway_view *view,
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index fdd92f64..b3d93a81 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -60,20 +60,20 @@ void workspace_consider_destroy(struct sway_workspace *ws);
 
 char *workspace_next_name(const char *output_name);
 
-bool workspace_switch(struct sway_workspace *workspace,
-                bool no_auto_back_and_forth);
+struct sway_workspace *workspace_auto_back_and_forth(
+                struct sway_workspace *workspace);
+
+bool workspace_switch(struct sway_workspace *workspace);
 
 struct sway_workspace *workspace_by_number(const char* name);
 
 struct sway_workspace *workspace_by_name(const char*);
 
-struct sway_workspace *workspace_output_next(
-                struct sway_workspace *current, bool create);
+struct sway_workspace *workspace_output_next(struct sway_workspace *current);
 
 struct sway_workspace *workspace_next(struct sway_workspace *current);
 
-struct sway_workspace *workspace_output_prev(
-                struct sway_workspace *current, bool create);
+struct sway_workspace *workspace_output_prev(struct sway_workspace *current);
 
 struct sway_workspace *workspace_prev(struct sway_workspace *current);
 
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 545a66a8..3ad0bdf3 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -58,7 +58,6 @@ struct swaybar_output {
         struct zxdg_output_v1 *xdg_output;
         struct wl_surface *surface;
         struct zwlr_layer_surface_v1 *layer_surface;
-        struct wl_region *input_region;
         uint32_t wl_name;
 
         struct wl_list workspaces; // swaybar_workspace::link
diff --git a/include/swaybar/i3bar.h b/include/swaybar/i3bar.h
index df8cdd09..1aec6d6c 100644
--- a/include/swaybar/i3bar.h
+++ b/include/swaybar/i3bar.h
@@ -19,6 +19,7 @@ struct i3bar_block {
         // Airblader features
         uint32_t background;
         uint32_t border;
+        bool border_set;
         int border_top;
         int border_bottom;
         int border_left;
diff --git a/include/swaynag/swaynag.h b/include/swaynag/swaynag.h
index 9e39e716..2d68b6c9 100644
--- a/include/swaynag/swaynag.h
+++ b/include/swaynag/swaynag.h
@@ -5,7 +5,6 @@
 #include "list.h"
 #include "pool-buffer.h"
 #include "swaynag/types.h"
-#include "xdg-output-unstable-v1-client-protocol.h"
 
 #define SWAYNAG_MAX_HEIGHT 500
 
@@ -68,20 +67,18 @@ struct swaynag_details {
         int offset;
         int visible_lines;
         int total_lines;
-        struct swaynag_button *button_details;
+        struct swaynag_button button_details;
         struct swaynag_button button_up;
         struct swaynag_button button_down;
 };
 
 struct swaynag {
         bool run_display;
-        int querying_outputs;
 
         struct wl_display *display;
         struct wl_compositor *compositor;
         struct wl_seat *seat;
         struct wl_shm *shm;
-        struct zxdg_output_manager_v1 *xdg_output_manager;
         struct wl_list outputs;  // swaynag_output::link
         struct wl_list seats;  // swaynag_seat::link
         struct swaynag_output *output;
diff --git a/include/swaynag/types.h b/include/swaynag/types.h
index 24da9418..3c3b2754 100644
--- a/include/swaynag/types.h
+++ b/include/swaynag/types.h
@@ -7,6 +7,7 @@ struct swaynag_type {
         char *font;
         char *output;
         uint32_t anchors;
+        int32_t layer; // enum zwlr_layer_shell_v1_layer or -1 if unset
 
         // Colors
         uint32_t button_text;
diff --git a/include/util.h b/include/util.h
index c80da1cb..f887d489 100644
--- a/include/util.h
+++ b/include/util.h
@@ -30,12 +30,6 @@ int parse_movement_amount(int argc, char **argv,
                 struct movement_amount *amount);
 
 /**
- * Get the current time, in milliseconds.
- */
-
-uint32_t get_current_time_msec(void);
-
-/**
  * Wrap i into the range [0, max]
  */
 int wrap(int i, int max);