Merge pull request #2483 from RyanDwyer/floating-emit-reparent

Send enter/leave events for floating views

2 files changed, 11 insertions, 6 deletions

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 5eccedc1..cd886cd0 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -138,6 +138,9 @@ struct sway_container {
 
         struct sway_container *parent;
 
+        // Outputs currently being intersected
+        list_t *outputs; // struct sway_output
+
         // Indicates that the container is a scratchpad container.
         // Both hidden and visible scratchpad containers have scratchpad=true.
         // Hidden scratchpad containers have a NULL parent.
@@ -166,12 +169,7 @@ struct sway_container {
 
         struct {
                 struct wl_signal destroy;
-                // Raised after the tree updates, but before arrange_windows
-                // Passed the previous parent
-                struct wl_signal reparent;
         } events;
-
-        struct wl_listener reparent;
 };
 
 struct sway_container *container_create(enum sway_container_type type);
@@ -353,4 +351,12 @@ bool container_is_floating_or_child(struct sway_container *container);
  */
 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.
+ */
+struct sway_output *container_get_effective_output(struct sway_container *con);
+
+void container_discover_outputs(struct sway_container *con);
+
 #endif
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 2747e7c4..5fdecc2b 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -120,7 +120,6 @@ struct sway_view {
         } events;
 
         struct wl_listener surface_new_subsurface;
-        struct wl_listener container_reparent;
 };
 
 struct sway_xdg_shell_v6_view {