Merge pull request #2360 from RyanDwyer/floating-containers

Allow containers to float

3 files changed, 14 insertions, 5 deletions

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index ab25788f..07febe2c 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -124,6 +124,9 @@ struct sway_container *seat_get_focus(struct sway_seat *seat);
 struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
                 struct sway_container *container);
 
+struct sway_container *seat_get_focus_inactive_tiling(struct sway_seat *seat,
+                struct sway_container *container);
+
 /**
  * Descend into the focus stack to find the focus-inactive view. Useful for
  * container placement when they change position in the tree.
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index c584cd92..d91b3bf1 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -297,6 +297,11 @@ void container_notify_subtree_changed(struct sway_container *container);
  */
 size_t container_titlebar_height(void);
 
+/**
+ * Resize and center the container in its workspace.
+ */
+void container_init_floating(struct sway_container *container);
+
 void container_set_floating(struct sway_container *container, bool enable);
 
 void container_set_geometry_from_floating_view(struct sway_container *con);
@@ -341,6 +346,12 @@ void container_end_mouse_operation(struct sway_container *container);
 void container_set_fullscreen(struct sway_container *container, bool enable);
 
 /**
+ * Return true if the container is floating, or a child of a floating split
+ * container.
+ */
+bool container_is_floating_or_child(struct sway_container *container);
+
+/**
  * Return true if the container is fullscreen, or a child of a fullscreen split
  * container.
  */
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 7086314f..0152ed55 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -235,11 +235,6 @@ uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
         int height);
 
 /**
- * Center the view in its workspace and build the swayc decorations around it.
- */
-void view_init_floating(struct sway_view *view);
-
-/**
  * Configure the view's position and size based on the swayc's position and
  * size, taking borders into consideration.
  */