Merge branch 'master' into get-tree-command

2 files changed, 12 insertions, 2 deletions

diff --git a/include/focus.h b/include/focus.h
index 10d5182b..4abd6080 100644
--- a/include/focus.h
+++ b/include/focus.h
@@ -21,6 +21,10 @@ swayc_t *get_focused_container(swayc_t *parent);
 swayc_t *get_focused_view(swayc_t *parent);
 swayc_t *get_focused_float(swayc_t *ws);
 
+// a special-case function to get the focused view, regardless
+// of whether it's tiled or floating
+swayc_t *get_focused_view_include_floating(swayc_t *parent);
+
 bool set_focused_container(swayc_t *container);
 bool set_focused_container_for(swayc_t *ancestor, swayc_t *container);
 
diff --git a/include/resize.h b/include/resize.h
index d49cc74a..0d382994 100644
--- a/include/resize.h
+++ b/include/resize.h
@@ -2,7 +2,13 @@
 #define _SWAY_RESIZE_H
 #include <stdbool.h>
 
-bool set_size_tiled(int amount, bool use_width);
-bool resize_tiled(int amount, bool use_width);
+enum resize_dim_types {
+        RESIZE_DIM_PX,
+        RESIZE_DIM_PPT,
+        RESIZE_DIM_DEFAULT,
+};
+
+bool set_size(int dimension, bool use_width);
+bool resize(int dimension, bool use_width, enum resize_dim_types dim_type);
 
 #endif