16 files changed, 82 insertions, 53 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/pango.h b/include/pango.h
index 6ab83c16..75dbba27 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>
 
 /**
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..29a6bec3 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.
  */
diff --git a/include/sway/config.h b/include/sway/config.h
index 59f22ae2..254fbad0 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -292,6 +292,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 +329,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;
@@ -559,7 +565,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;
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/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/text_input.h b/include/sway/input/text_input.h
index 6cf9bdb3..37744266 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.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/output.h b/include/sway/output.h
index 96986700..0ebcc77d 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -72,8 +72,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..3a5670d9 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -23,6 +23,8 @@
 #include "sway/xwayland.h"
 #endif
 
+struct sway_transaction;
+
 struct sway_server {
         struct wl_display *wl_display;
         struct wl_event_loop *wl_event_loop;
@@ -85,8 +87,25 @@ struct sway_server {
         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;
 };
 
@@ -125,5 +144,7 @@ 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);
 
 #endif
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 7e9df59f..ddb2d683 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -46,9 +46,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 +60,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 +69,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 +85,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 +101,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
 
@@ -185,6 +164,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,
@@ -231,10 +215,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 +290,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);
 
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e071e6c9..86bd981c 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -316,7 +316,8 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 
 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..65ba247f 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -60,8 +60,10 @@ 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);
 
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;