12 files changed, 83 insertions, 31 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index f9da1967..5ccc3e77 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -292,6 +292,14 @@ struct output_config {
 };
 
 /**
+ * An output config pre-matched to an output
+ */
+struct matched_output_config {
+        struct sway_output *output;
+        struct output_config *config;
+};
+
+/**
  * Stores size of gaps for each side
  */
 struct side_gaps {
@@ -680,20 +688,25 @@ const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filt
 
 struct output_config *new_output_config(const char *name);
 
-void merge_output_config(struct output_config *dst, struct output_config *src);
+bool apply_output_configs(struct matched_output_config *configs,
+                size_t configs_len, bool test_only, bool degrade_to_off);
 
-bool apply_output_config(struct output_config *oc, struct sway_output *output);
+void apply_all_output_configs(void);
 
-bool test_output_config(struct output_config *oc, struct sway_output *output);
+void sort_output_configs_by_priority(struct matched_output_config *configs,
+                size_t configs_len);
 
-struct output_config *store_output_config(struct output_config *oc);
+/**
+ * store_output_config stores a new output config. An output may be matched by
+ * three different config types, in order of precedence: Identifier, name and
+ * wildcard. When storing a config type of lower precedence, assume that the
+ * user wants the config to take immediate effect by superseding (clearing) the
+ * same values from higher presedence configuration.
+ */
+void store_output_config(struct output_config *oc);
 
 struct output_config *find_output_config(struct sway_output *output);
 
-void apply_output_config_to_outputs(struct output_config *oc);
-
-void reset_outputs(void);
-
 void free_output_config(struct output_config *oc);
 
 bool spawn_swaybg(void);
diff --git a/include/sway/desktop/launcher.h b/include/sway/desktop/launcher.h
index b7716e82..412068a9 100644
--- a/include/sway/desktop/launcher.h
+++ b/include/sway/desktop/launcher.h
@@ -3,14 +3,18 @@
 
 #include <stdlib.h>
 #include <wayland-server-core.h>
+#include "sway/input/seat.h"
 
 struct launcher_ctx {
         pid_t pid;
         char *fallback_name;
         struct wlr_xdg_activation_token_v1 *token;
         struct wl_listener token_destroy;
+        struct sway_seat *seat;
+        struct wl_listener seat_destroy;
 
         bool activated;
+        bool had_focused_surface;
 
         struct sway_node *node;
         struct wl_listener node_destroy;
diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index 17d41fa3..dd7edb7a 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -2,6 +2,7 @@
 #define _SWAY_TRANSACTION_H
 #include <stdint.h>
 #include <stdbool.h>
+#include <wlr/types/wlr_scene.h>
 
 /**
  * Transactions enable us to perform atomic layout updates.
@@ -58,4 +59,6 @@ bool transaction_notify_view_ready_by_serial(struct sway_view *view,
 bool transaction_notify_view_ready_by_geometry(struct sway_view *view,
                 double x, double y, int width, int height);
 
+void arrange_popups(struct wlr_scene_tree *popups);
+
 #endif
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 1e21c66f..527d0350 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -114,7 +114,7 @@ void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 
 void dispatch_cursor_button(struct sway_cursor *cursor,
         struct wlr_input_device *device, uint32_t time_msec, uint32_t button,
-        enum wlr_button_state state);
+        enum wl_pointer_button_state state);
 
 void dispatch_cursor_axis(struct sway_cursor *cursor,
                 struct wlr_pointer_axis_event *event);
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index 145edd4b..45c75199 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -4,6 +4,7 @@
 #include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h>
 #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"
@@ -24,6 +25,7 @@ struct sway_input_manager {
         struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard;
         struct wlr_virtual_pointer_manager_v1 *virtual_pointer;
         struct wlr_pointer_gestures_v1 *pointer_gestures;
+        struct wlr_transient_seat_manager_v1 *transient_seat_manager;
 
         struct wl_listener new_input;
         struct wl_listener inhibit_activate;
@@ -31,6 +33,7 @@ struct sway_input_manager {
         struct wl_listener keyboard_shortcuts_inhibit_new_inhibitor;
         struct wl_listener virtual_keyboard_new;
         struct wl_listener virtual_pointer_new;
+        struct wl_listener transient_seat_create;
 };
 
 struct sway_input_manager *input_manager_create(struct sway_server *server);
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index e5aa8478..428f9679 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -17,7 +17,7 @@ struct sway_seat;
 struct sway_seatop_impl {
         void (*button)(struct sway_seat *seat, uint32_t time_msec,
                         struct wlr_input_device *device, uint32_t button,
-                        enum wlr_button_state state);
+                        enum wl_pointer_button_state state);
         void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec);
         void (*pointer_axis)(struct sway_seat *seat,
                         struct wlr_pointer_axis_event *event);
@@ -124,6 +124,7 @@ struct sway_seat {
         struct wl_listener start_drag;
         struct wl_listener request_set_selection;
         struct wl_listener request_set_primary_selection;
+        struct wl_listener destroy;
 
         struct wl_list devices; // sway_seat_device::link
         struct wl_list keyboard_groups; // sway_keyboard_group::link
@@ -286,13 +287,13 @@ struct sway_container *seat_get_focus_inactive_floating(struct sway_seat *seat,
                 struct sway_workspace *workspace);
 
 void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
-                uint32_t button, enum wlr_button_state state);
+                uint32_t button, enum wl_pointer_button_state state);
 
 void seat_consider_warp_to_focus(struct sway_seat *seat);
 
 void seatop_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state);
+                enum wl_pointer_button_state state);
 
 void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec);
 
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
index 214e61d1..1993f928 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -21,18 +21,21 @@ struct sway_input_method_relay {
         struct sway_seat *seat;
 
         struct wl_list text_inputs; // sway_text_input::link
+        struct wl_list input_popups; // sway_input_popup::link
         struct wlr_input_method_v2 *input_method; // doesn't have to be present
 
         struct wl_listener text_input_new;
 
         struct wl_listener input_method_new;
         struct wl_listener input_method_commit;
+        struct wl_listener input_method_new_popup_surface;
         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 {
         struct sway_input_method_relay *relay;
 
diff --git a/include/sway/input/text_input_popup.h b/include/sway/input/text_input_popup.h
new file mode 100644
index 00000000..e5f6ab8b
--- /dev/null
+++ b/include/sway/input/text_input_popup.h
@@ -0,0 +1,20 @@
+#ifndef _SWAY_INPUT_TEXT_INPUT_POPUP_H
+#define _SWAY_INPUT_TEXT_INPUT_POPUP_H
+
+#include "sway/tree/view.h"
+
+struct sway_input_popup {
+        struct sway_input_method_relay *relay;
+
+        struct wlr_scene_tree *scene_tree;
+        struct sway_popup_desc desc;
+        struct wlr_input_popup_surface_v2 *popup_surface;
+
+        struct wl_list link;
+
+        struct wl_listener popup_destroy;
+        struct wl_listener popup_surface_commit;
+
+        struct wl_listener focused_surface_unmap;
+};
+#endif
diff --git a/include/sway/layers.h b/include/sway/layers.h
index a7afb900..fd6384e0 100644
--- a/include/sway/layers.h
+++ b/include/sway/layers.h
@@ -3,6 +3,7 @@
 #include <stdbool.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
+#include "sway/tree/view.h"
 
 struct sway_layer_surface {
         struct wl_listener map;
@@ -14,10 +15,12 @@ struct sway_layer_surface {
 
         bool mapped;
 
+        struct wlr_scene_tree *popups;
+        struct sway_popup_desc desc;
+
         struct sway_output *output;
         struct wlr_scene_layer_surface_v1 *scene;
         struct wlr_scene_tree *tree;
-        struct wlr_scene_tree *popups;
         struct wlr_layer_surface_v1 *layer_surface;
 };
 
diff --git a/include/sway/output.h b/include/sway/output.h
index 30595f54..d546d488 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -50,7 +50,7 @@ struct sway_output {
         enum wl_output_subpixel detected_subpixel;
         enum scale_filter_mode scale_filter;
 
-        bool enabling, enabled;
+        bool enabled;
         list_t *workspaces;
 
         struct sway_output_state current;
diff --git a/include/sway/server.h b/include/sway/server.h
index adb62cda..c71851f6 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -2,23 +2,6 @@
 #define _SWAY_SERVER_H
 #include <stdbool.h>
 #include <wayland-server-core.h>
-#include <wlr/backend.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>
 #include "config.h"
 #include "list.h"
 #include "sway/desktop/idle_inhibit_v1.h"
@@ -63,6 +46,7 @@ struct sway_server {
 
         struct wl_listener new_output;
         struct wl_listener output_layout_change;
+        struct wl_listener renderer_lost;
 
         struct wlr_idle_notifier_v1 *idle_notifier_v1;
         struct sway_idle_inhibit_manager_v1 idle_inhibit_manager_v1;
@@ -116,6 +100,7 @@ struct sway_server {
         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_ext_foreign_toplevel_list_v1 *foreign_toplevel_list;
         struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_manager;
         struct wlr_content_type_manager_v1 *content_type_manager_v1;
         struct wlr_data_control_manager_v1 *data_control_manager_v1;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 3e5a9bfe..7faacdcc 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -84,6 +84,8 @@ struct sway_view {
         // transaction state. Updated on every commit.
         struct wlr_box geometry;
 
+        struct wlr_ext_foreign_toplevel_handle_v1 *ext_foreign_toplevel;
+
         struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
         struct wl_listener foreign_activate_request;
         struct wl_listener foreign_fullscreen_request;
@@ -174,6 +176,11 @@ struct sway_xwayland_unmanaged {
 };
 #endif
 
+struct sway_popup_desc {
+        struct wlr_scene_node *relative;
+        struct sway_view *view;
+};
+
 struct sway_xdg_popup {
         struct sway_view *view;
 
@@ -181,8 +188,11 @@ struct sway_xdg_popup {
         struct wlr_scene_tree *xdg_surface_tree;
         struct wlr_xdg_popup *wlr_xdg_popup;
 
+        struct sway_popup_desc desc;
+
         struct wl_listener surface_commit;
         struct wl_listener new_popup;
+        struct wl_listener reposition;
         struct wl_listener destroy;
 };
 
@@ -233,6 +243,11 @@ void view_set_activated(struct sway_view *view, bool activated);
  */
 void view_request_activate(struct sway_view *view, struct sway_seat *seat);
 
+/*
+ * Called when the view requests urgent state
+ */
+void view_request_urgent(struct sway_view *view);
+
 /**
  * If possible, instructs the client to change their decoration mode.
  */
@@ -284,6 +299,8 @@ struct sway_view *view_from_wlr_xwayland_surface(
 #endif
 struct sway_view *view_from_wlr_surface(struct wlr_surface *surface);
 
+void view_update_app_id(struct sway_view *view);
+
 /**
  * Re-read the view's title property and update any relevant title bars.
  * The force argument makes it recreate the title bars even if the title hasn't