4 files changed, 16 insertions, 9 deletions

diff --git a/include/container.h b/include/container.h
index 79e023fe..4e21461c 100644
--- a/include/container.h
+++ b/include/container.h
@@ -34,12 +34,12 @@ struct sway_container {
         enum swayc_layouts layout;
 
         // Not including borders or margins
-        int width, height;
+        double width, height;
 
         // Used for setting floating geometry
         int desired_width, desired_height;
 
-        int x, y;
+        double x, y;
 
         bool visible;
         bool is_floating;
diff --git a/include/input_state.h b/include/input_state.h
index 782b4b19..27dd6cff 100644
--- a/include/input_state.h
+++ b/include/input_state.h
@@ -34,6 +34,10 @@ extern struct pointer_state {
                 bool drag;
                 bool resize;
         } floating;
+        struct pointer_tiling {
+                bool resize;
+                swayc_t *init_view;
+        } tiling;
         struct pointer_lock {
                 bool left;
                 bool right;
@@ -44,6 +48,7 @@ extern struct pointer_state {
 
 void start_floating(swayc_t *view);
 void reset_floating(swayc_t *view);
+void input_init(void);
 
 #endif
 
diff --git a/include/ipc.h b/include/ipc.h
index 0b6441f6..2d71c666 100644
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -2,14 +2,14 @@
 #define _SWAY_IPC_H
 
 enum ipc_command_type {
-        IPC_COMMAND        = 0,
+        IPC_COMMAND = 0,
         IPC_GET_WORKSPACES = 1,
-        IPC_SUBSCRIBE      = 2,
-        IPC_GET_OUTPUTS    = 3,
-        IPC_GET_TREE       = 4,
-        IPC_GET_MARKS      = 5,
+        IPC_SUBSCRIBE = 2,
+        IPC_GET_OUTPUTS = 3,
+        IPC_GET_TREE = 4,
+        IPC_GET_MARKS = 5,
         IPC_GET_BAR_CONFIG = 6,
-        IPC_GET_VERSION    = 7,
+        IPC_GET_VERSION = 7,
 };
 
 void ipc_init(void);
diff --git a/include/layout.h b/include/layout.h
index 5c73af99..55bb6709 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -21,7 +21,7 @@ void move_container(swayc_t* container,swayc_t* root,enum movement_direction dir
 
 
 // Layout
-void arrange_windows(swayc_t *container, int width, int height);
+void arrange_windows(swayc_t *container, double width, double height);
 
 // Focus
 void unfocus_all(swayc_t *container);
@@ -32,4 +32,6 @@ swayc_t *get_focused_container(swayc_t *parent);
 swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent);
 swayc_t *get_swayc_in_direction(swayc_t *container, enum movement_direction dir);
 
+void recursive_resize(swayc_t *container, double amount, enum wlc_resize_edge edge);
+
 #endif