Add invisible extents to any view with SSDs

Author: serebit

src/decorations/ssd.cpp

@@ -7,9 +7,28 @@ 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 uint32_t BORDER_ACTIVE_COLOR = 0x505050;
 constexpr uint32_t BORDER_INACTIVE_COLOR = 0x404040;
 
+static wlr_box border_dimensions(wlr_box& view_dimensions) {
+	return {
+		.x = EXTENTS_WIDTH,
+		.y = EXTENTS_WIDTH,
+		.width = view_dimensions.width + (BORDER_WIDTH * 2),
+		.height = view_dimensions.height + TITLEBAR_HEIGHT + (BORDER_WIDTH * 2),
+	};
+}
+
+static wlr_box extents_dimensions(wlr_box& view_dimensions) {
+	return {
+		.x = 0,
+		.y = 0,
+		.width = view_dimensions.width + (EXTENTS_WIDTH * 2) + (BORDER_WIDTH * 2),
+		.height = view_dimensions.height + TITLEBAR_HEIGHT + (EXTENTS_WIDTH * 2) + (BORDER_WIDTH * 2),
+	};
+}
+
 static constexpr std::array<float, 4> rrggbb_to_floats(uint32_t rrggbb) {
 	return std::array<float, 4>(
 		{(float) (rrggbb >> 16 & 0xff) / 255.0f, (float) (rrggbb >> 8 & 0xff) / 255.0f, (float) (rrggbb & 0xff) / 255.0f, 1.0});
@@ -25,29 +44,43 @@ Ssd::Ssd(View& parent) noexcept : view(parent) {
 	auto view_geo = view.get_surface_geometry();
 	titlebar_rect = wlr_scene_rect_create(scene_tree, view_geo.width, TITLEBAR_HEIGHT, titlebar_color.data());
 	titlebar_rect->node.data = new SceneRectData{.type = SceneRectType::TITLEBAR, .parent = &parent};
-	wlr_scene_node_set_position(&titlebar_rect->node, BORDER_WIDTH, BORDER_WIDTH);
+	wlr_scene_node_set_position(&titlebar_rect->node, BORDER_WIDTH + EXTENTS_WIDTH, BORDER_WIDTH + EXTENTS_WIDTH);
 	wlr_scene_node_lower_to_bottom(&titlebar_rect->node);
 	wlr_scene_node_set_enabled(&titlebar_rect->node, true);
 
+	auto extents_color = std::array<float, 4>({0.0f, 0.0f, 0.0f, 0.0f});
+	auto extents_box = extents_dimensions(view_geo);
+	extents_rect = wlr_scene_rect_create(scene_tree, extents_box.width, extents_box.height, extents_color.data());
+	extents_rect->node.data = new SceneRectData{.type = SceneRectType::EXTENTS, .parent = &parent};
+	wlr_scene_node_set_position(&extents_rect->node, extents_box.x, extents_box.y);
+	wlr_scene_node_lower_to_bottom(&extents_rect->node);
+	wlr_scene_node_set_enabled(&extents_rect->node, true);
+
 	auto border_color = rrggbb_to_floats(BORDER_INACTIVE_COLOR);
-	border_rect = wlr_scene_rect_create(
-		scene_tree, view_geo.width + get_extra_width(), view_geo.height + get_extra_height(), border_color.data());
+	auto border_box = border_dimensions(view_geo);
+	border_rect = wlr_scene_rect_create(scene_tree, border_box.width, border_box.height, border_color.data());
 	border_rect->node.data = new SceneRectData{.type = SceneRectType::BORDER, .parent = &parent};
-	wlr_scene_node_set_position(&border_rect->node, 0, 0);
+	wlr_scene_node_set_position(&border_rect->node, border_box.x, border_box.y);
 	wlr_scene_node_lower_to_bottom(&border_rect->node);
 	wlr_scene_node_set_enabled(&border_rect->node, true);
 }
 
 Ssd::~Ssd() {
 	delete static_cast<SceneRectData*>(titlebar_rect->node.data);
 	delete static_cast<SceneRectData*>(border_rect->node.data);
+	delete static_cast<SceneRectData*>(extents_rect->node.data);
 	wlr_scene_node_destroy(&scene_tree->node);
 }
 
 void Ssd::update() const {
 	auto view_geo = view.get_surface_geometry();
 	wlr_scene_rect_set_size(titlebar_rect, view_geo.width, TITLEBAR_HEIGHT);
-	wlr_scene_rect_set_size(border_rect, view_geo.width + get_extra_width(), view_geo.height + get_extra_height());
+
+	auto border_box = border_dimensions(view_geo);
+	wlr_scene_rect_set_size(border_rect, border_box.width, border_box.height);
+
+	auto extents_box = extents_dimensions(view_geo);
+	wlr_scene_rect_set_size(extents_rect, extents_box.width, extents_box.height);
 }
 
 void Ssd::set_activated(const bool activated) const {
@@ -67,17 +100,21 @@ wlr_box Ssd::get_geometry() const {
 }
 
 uint8_t Ssd::get_vertical_offset() const {
+	return TITLEBAR_HEIGHT + BORDER_WIDTH + EXTENTS_WIDTH;
+}
+
+uint8_t Ssd::get_visual_vertical_offset() const {
 	return TITLEBAR_HEIGHT + BORDER_WIDTH;
 }
 
 uint8_t Ssd::get_horizontal_offset() const {
-	return BORDER_WIDTH;
+	return BORDER_WIDTH + EXTENTS_WIDTH;
 }
 
 int32_t Ssd::get_extra_width() const {
-	return BORDER_WIDTH * 2;
+	return (BORDER_WIDTH * 2) + (EXTENTS_WIDTH * 2);
 }
 
 int32_t Ssd::get_extra_height() const {
-	return TITLEBAR_HEIGHT + BORDER_WIDTH * 2;
+	return TITLEBAR_HEIGHT + (BORDER_WIDTH * 2) + (EXTENTS_WIDTH * 2);
 }

src/decorations/ssd.hpp

@@ -15,6 +15,7 @@ class Ssd final : public std::enable_shared_from_this<Ssd> {
 	wlr_scene_tree* scene_tree = nullptr;
 	wlr_scene_rect* titlebar_rect = nullptr;
 	wlr_scene_rect* border_rect = nullptr;
+	wlr_scene_rect* extents_rect = nullptr;
 
 	explicit Ssd(View& parent) noexcept;
 	~Ssd();
@@ -24,6 +25,7 @@ class Ssd final : public std::enable_shared_from_this<Ssd> {
 
 	wlr_box get_geometry() const;
 	uint8_t get_vertical_offset() const;
+	uint8_t get_visual_vertical_offset() const;
 	uint8_t get_horizontal_offset() const;
 	int32_t get_extra_width() const;
 	int32_t get_extra_height() const;

src/input/cursor.cpp

@@ -199,7 +199,6 @@ static void cursor_button_notify(wl_listener* listener, void* data) {
 		/* Focus that client if the button was _pressed_ */
 		server.focus_view(std::dynamic_pointer_cast<View>(magpie_surface));
 
-
 		if (server.ssd_at(cursor.wlr.x, cursor.wlr.y) == SceneRectType::TITLEBAR) {
 			view->begin_interactive(MAGPIE_CURSOR_MOVE, 0);
 		}
@@ -443,15 +442,17 @@ void Cursor::process_motion(const uint32_t time) {
 	double sy;
 	wlr_surface* surface = nullptr;
 	auto magpie_surface = seat.server.surface_at(wlr.x, wlr.y, &surface, &sx, &sy).lock();
-	bool ssd_at_cursor = seat.server.ssd_at(wlr.x, wlr.y) != SceneRectType::NONE;
-	if (ssd_at_cursor || magpie_surface == nullptr) {
+	SceneRectType ssd_at_cursor = seat.server.ssd_at(wlr.x, wlr.y);
+	if (ssd_at_cursor == SceneRectType::TITLEBAR || ssd_at_cursor == SceneRectType::NONE || magpie_surface == nullptr) {
 		/* If there's no view under the cursor, set the cursor image to a
 		 * default. This is what makes the cursor image appear when you move it
 		 * 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");
 	}
 
-	if (!ssd_at_cursor && surface != nullptr) {
+	if (ssd_at_cursor == SceneRectType::NONE && surface != nullptr) {
 		/*
 		 * Send pointer enter and motion events.
 		 *

src/surface/view.cpp

@@ -98,7 +98,7 @@ int32_t View::find_surface_min_y() const {
 
 	min_y = min_y == INT32_MAX ? 0 : min_y;
 	if (ssd.has_value()) {
-		return min_y + ssd->get_vertical_offset();
+		return min_y + ssd->get_visual_vertical_offset();
 	} else {
 		return min_y;
 	}