Update cursor for resizing SSDs

Author: serebit

src/decorations/ssd.cpp

@@ -7,7 +7,7 @@ constexpr uint8_t TITLEBAR_HEIGHT = 24;
 constexpr uint32_t TITLEBAR_ACTIVE_COLOR = 0x303030;
 constexpr uint32_t TITLEBAR_INACTIVE_COLOR = 0x202020;
 constexpr uint8_t BORDER_WIDTH = 1;
-constexpr uint8_t EXTENTS_WIDTH = 8;
+constexpr uint8_t EXTENTS_WIDTH = 12;
 constexpr uint32_t BORDER_ACTIVE_COLOR = 0x505050;
 constexpr uint32_t BORDER_INACTIVE_COLOR = 0x404040;
 
@@ -73,7 +73,7 @@ Ssd::~Ssd() {
 }
 
 void Ssd::update() const {
-	auto view_geo = view.get_surface_geometry();
+	auto view_geo = view.surface_current;
 	wlr_scene_rect_set_size(titlebar_rect, view_geo.width, TITLEBAR_HEIGHT);
 
 	auto border_box = border_dimensions(view_geo);
@@ -92,13 +92,21 @@ void Ssd::set_activated(const bool activated) const {
 }
 
 wlr_box Ssd::get_geometry() const {
-	auto view_geo = view.get_surface_geometry();
+	auto view_geo = view.surface_current;
 	return {.x = view_geo.x - get_horizontal_offset(),
 		.y = view_geo.y - get_vertical_offset(),
 		.width = view_geo.width + get_extra_width(),
 		.height = view_geo.height + get_extra_height()};
 }
 
+wlr_box Ssd::get_extentless_geometry() const {
+	auto view_geo = view.surface_current;
+	return {.x = view_geo.x,
+		.y = view_geo.y - TITLEBAR_HEIGHT,
+		.width = view_geo.width,
+		.height = view_geo.height + TITLEBAR_HEIGHT};
+}
+
 uint8_t Ssd::get_vertical_offset() const {
 	return TITLEBAR_HEIGHT + BORDER_WIDTH + EXTENTS_WIDTH;
 }

src/decorations/ssd.hpp

@@ -24,6 +24,7 @@ class Ssd final : public std::enable_shared_from_this<Ssd> {
 	void set_activated(bool activated) const;
 
 	wlr_box get_geometry() const;
+	wlr_box get_extentless_geometry() const;
 	uint8_t get_vertical_offset() const;
 	uint8_t get_visual_vertical_offset() const;
 	uint8_t get_horizontal_offset() const;

src/input/cursor.cpp

@@ -4,7 +4,6 @@
 #include "output.hpp"
 #include "seat.hpp"
 #include "server.hpp"
-#include "surface/surface.hpp"
 #include "surface/view.hpp"
 
 #include <algorithm>
@@ -468,7 +467,51 @@ void Cursor::process_motion(const uint32_t time) {
 		 * around the screen, not over any views. */
 		set_image("left_ptr");
 	} else if (ssd_at_cursor == SceneRectType::BORDER || ssd_at_cursor == SceneRectType::EXTENTS) {
-		set_image("fleur");
+		auto view = std::dynamic_pointer_cast<View>(magpie_surface);
+		auto surface_geo = view->ssd.has_value() ? view->ssd->get_extentless_geometry() : view->surface_current;
+
+		uint8_t edges = WLR_EDGE_NONE;
+		if (wlr.x < surface_geo.x) {
+			edges |= WLR_EDGE_LEFT;
+		}
+		if (wlr.y < surface_geo.y) {
+			edges |= WLR_EDGE_TOP;
+		}
+		if (wlr.x > surface_geo.x + surface_geo.width) {
+			edges |= WLR_EDGE_RIGHT;
+		}
+		if (wlr.y > surface_geo.y + surface_geo.height) {
+			edges |= WLR_EDGE_BOTTOM;
+		}
+
+		switch (edges) {
+			case WLR_EDGE_LEFT:
+				set_image("left_side");
+				break;
+			case WLR_EDGE_LEFT | WLR_EDGE_TOP:
+				set_image("top_left_corner");
+				break;
+			case WLR_EDGE_TOP:
+				set_image("top_side");
+				break;
+			case WLR_EDGE_TOP | WLR_EDGE_RIGHT:
+				set_image("top_right_corner");
+				break;
+			case WLR_EDGE_RIGHT:
+				set_image("right_side");
+				break;
+			case WLR_EDGE_RIGHT | WLR_EDGE_BOTTOM:
+				set_image("bottom_right_corner");
+				break;
+			case WLR_EDGE_BOTTOM:
+				set_image("bottom_side");
+				break;
+			case WLR_EDGE_BOTTOM | WLR_EDGE_LEFT:
+				set_image("bottom_left_corner");
+				break;
+			default:
+				break;
+		}
 	}
 
 	if (ssd_at_cursor == SceneRectType::NONE && surface != nullptr) {