Merge pull request #2296 from RyanDwyer/floating-modifier

Implement floating_modifier and mouse operations for floating views

6 files changed, 57 insertions, 5 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index e71a7228..f53d335a 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -106,7 +106,7 @@ sway_cmd cmd_exit;
 sway_cmd cmd_floating;
 sway_cmd cmd_floating_maximum_size;
 sway_cmd cmd_floating_minimum_size;
-sway_cmd cmd_floating_mod;
+sway_cmd cmd_floating_modifier;
 sway_cmd cmd_floating_scroll;
 sway_cmd cmd_focus;
 sway_cmd cmd_focus_follows_mouse;
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 5dd109ca..b0a3a7c5 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -11,6 +11,7 @@ struct sway_cursor {
         } previous;
         struct wlr_xcursor_manager *xcursor_manager;
 
+        const char *image;
         struct wl_client *image_client;
 
         struct wl_listener motion;
@@ -37,4 +38,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec,
         uint32_t button, enum wlr_button_state state);
 
+void cursor_set_image(struct sway_cursor *cursor, const char *image,
+                struct wl_client *client);
+
 #endif
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index eac1626b..ab25788f 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -3,6 +3,7 @@
 
 #include <wlr/types/wlr_layer_shell.h>
 #include <wlr/types/wlr_seat.h>
+#include <wlr/util/edges.h>
 #include "sway/input/input-manager.h"
 
 struct sway_seat_device {
@@ -52,6 +53,24 @@ struct sway_seat {
         int32_t touch_id;
         double touch_x, touch_y;
 
+        // Operations (drag and resize)
+        enum {
+                OP_NONE,
+                OP_MOVE,
+                OP_RESIZE,
+        } operation;
+
+        struct sway_container *op_container;
+        enum wlr_edges op_resize_edge;
+        uint32_t op_button;
+        bool op_resize_preserve_ratio;
+        double op_ref_lx, op_ref_ly;         // cursor's x/y at start of op
+        double op_ref_width, op_ref_height;  // container's size at start of op
+        double op_ref_con_lx, op_ref_con_ly; // container's x/y at start of op
+
+        uint32_t last_button;
+        uint32_t last_button_serial;
+
         struct wl_listener focus_destroy;
         struct wl_listener new_container;
         struct wl_listener new_drag_icon;
@@ -134,4 +153,15 @@ bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface);
 
 void drag_icon_update_position(struct sway_drag_icon *icon);
 
+void seat_begin_move(struct sway_seat *seat, struct sway_container *con,
+                uint32_t button);
+
+void seat_begin_resize(struct sway_seat *seat, struct sway_container *con,
+                uint32_t button, enum wlr_edges edge);
+
+void seat_end_mouse_operation(struct sway_seat *seat);
+
+void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
+                uint32_t button, enum wlr_button_state state);
+
 #endif
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index ca7a3288..59c5b4c7 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -305,6 +305,12 @@ bool container_is_floating(struct sway_container *container);
 void container_get_box(struct sway_container *container, struct wlr_box *box);
 
 /**
+ * Move a floating container by the specified amount.
+ */
+void container_floating_translate(struct sway_container *con,
+                double x_amount, double y_amount);
+
+/**
  * Move a floating container to a new layout-local position.
  */
 void container_floating_move_to(struct sway_container *con,
@@ -318,4 +324,10 @@ void container_set_dirty(struct sway_container *container);
 
 bool container_has_urgent_child(struct sway_container *container);
 
+/**
+ * If the container is involved in a drag or resize operation via a mouse, this
+ * ends the operation.
+ */
+void container_end_mouse_operation(struct sway_container *container);
+
 #endif
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index ba265623..5a78fd58 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -14,10 +14,11 @@ enum movement_direction {
 };
 
 enum resize_edge {
-        RESIZE_EDGE_LEFT,
-        RESIZE_EDGE_RIGHT,
-        RESIZE_EDGE_TOP,
-        RESIZE_EDGE_BOTTOM,
+        RESIZE_EDGE_NONE   = 0,
+        RESIZE_EDGE_LEFT   = 1,
+        RESIZE_EDGE_RIGHT  = 2,
+        RESIZE_EDGE_TOP    = 4,
+        RESIZE_EDGE_BOTTOM = 8,
 };
 
 struct sway_container;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 068d92c6..1dfb218b 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -26,6 +26,8 @@ enum sway_view_prop {
 };
 
 struct sway_view_impl {
+        void (*get_constraints)(struct sway_view *view, double *min_width,
+                        double *max_width, double *min_height, double *max_height);
         const char *(*get_string_prop)(struct sway_view *view,
                         enum sway_view_prop prop);
         uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop);
@@ -215,6 +217,9 @@ uint32_t view_get_window_type(struct sway_view *view);
 
 const char *view_get_shell(struct sway_view *view);
 
+void view_get_constraints(struct sway_view *view, double *min_width,
+                double *max_width, double *min_height, double *max_height);
+
 uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
         int height);