3 files changed, 70 insertions, 31 deletions

diff --git a/rootston/cursor.c b/rootston/cursor.c
index 8a34cd13..87f568a8 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -30,25 +30,27 @@ void roots_cursor_destroy(struct roots_cursor *cursor) {
 	// TODO
 }
 
-static void seat_view_deco_motion(struct roots_seat_view *view, double deco_vx, double deco_vy) {
+static void seat_view_deco_motion(struct roots_seat_view *view, double deco_sx, double deco_sy) {
 	struct roots_cursor *cursor = view->seat->cursor;
 
-	double vx = deco_vx;
-	double vy = deco_vy;
+	double sx = deco_sx;
+	double sy = deco_sy;
 	if (view->has_button_grab) {
-		vx = view->grab_vx;
-		vy = view->grab_vy;
+		sx = view->grab_sx;
+		sy = view->grab_sy;
 	}
 
-	bool is_titlebar = vy < 0 && -vy < view->view->titlebar_height;
+	enum wlr_deco_part parts = view_get_deco_part(view->view, sx, sy);
+
+	bool is_titlebar = (parts & WLR_DECO_PART_TITLEBAR);
 	uint32_t edges = 0;
-	if (vx < 0) {
+	if (parts & WLR_DECO_PART_LEFT_BORDER) {
 		edges |= WLR_EDGE_LEFT;
-	} else if (vx > view->view->wlr_surface->current->width) {
+	} else if (parts & WLR_DECO_PART_RIGHT_BORDER) {
 		edges |= WLR_EDGE_RIGHT;
-	} else if (vy > view->view->wlr_surface->current->height) {
+	} else if (parts & WLR_DECO_PART_BOTTOM_BORDER) {
 		edges |= WLR_EDGE_BOTTOM;
-	} else if (-vy > view->view->titlebar_height) {
+	} else if (parts & WLR_DECO_PART_TOP_BORDER) {
 		edges |= WLR_EDGE_TOP;
 	}
 
@@ -75,12 +77,12 @@ static void seat_view_deco_leave(struct roots_seat_view *view) {
 	view->has_button_grab = false;
 }
 
-static void seat_view_deco_button(struct roots_seat_view *view, double vx,
-		double vy, uint32_t button, uint32_t state) {
+static void seat_view_deco_button(struct roots_seat_view *view, double sx,
+		double sy, uint32_t button, uint32_t state) {
 	if (button == BTN_LEFT && state == WLR_BUTTON_PRESSED) {
 		view->has_button_grab = true;
-		view->grab_vx = vx;
-		view->grab_vy = vy;
+		view->grab_sx = sx;
+		view->grab_sy = sy;
 	} else {
 		view->has_button_grab = false;
 	}
@@ -117,9 +119,7 @@ static void roots_cursor_update_position(struct roots_cursor *cursor,
 		if (view && !surface) {
 			if (seat_view) {
 				cursor->pointer_view = seat_view;
-				seat_view_deco_motion(seat_view,
-					cursor->cursor->x - seat_view->view->x,
-					cursor->cursor->y - seat_view->view->y);
+				seat_view_deco_motion(seat_view, sx, sy);
 			}
 		} if (view && surface) {
 			// motion over a view surface
@@ -239,10 +239,7 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
 
 	if (view && !surface) {
 		if (cursor->pointer_view) {
-			seat_view_deco_button(cursor->pointer_view,
-					cursor->cursor->x - cursor->pointer_view->view->x,
-					cursor->cursor->y - cursor->pointer_view->view->y,
-					button, state);
+			seat_view_deco_button(cursor->pointer_view, sx, sy, button, state);
 		}
 	}
 
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 1ec1d552..2632eebd 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -19,6 +19,7 @@
 #include "rootston/server.h"
 #include "rootston/seat.h"
 #include "rootston/xcursor.h"
+#include "rootston/view.h"
 
 void view_get_box(const struct roots_view *view, struct wlr_box *box) {
 	box->x = view->x;
@@ -43,6 +44,43 @@ void view_get_deco_box(const struct roots_view *view, struct wlr_box *box) {
 	box->height += (view->border_width * 2 + view->titlebar_height);
 }
 
+enum wlr_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy) {
+	if (!view->decorated) {
+		return WLR_DECO_PART_NONE;
+	}
+
+	int sw = view->wlr_surface->current->width;
+	int sh = view->wlr_surface->current->height;
+	int bw = view->border_width;
+	int titlebar_h = view->titlebar_height;
+
+	if (sx > 0 && sx < sw && sy < 0 && sy > -view->titlebar_height) {
+		return WLR_DECO_PART_TITLEBAR;
+	}
+
+	enum wlr_deco_part parts = 0;
+	if (sy >= -(titlebar_h + bw) &&
+			sy <= sh + bw) {
+		if (sx < 0 && sx > -bw) {
+			parts |= WLR_DECO_PART_LEFT_BORDER;
+		} else if (sx > sw && sx < sw + bw) {
+			parts |= WLR_DECO_PART_RIGHT_BORDER;
+		}
+	}
+
+	if (sx >= -bw && sx <= sw + bw) {
+		if (sy > sh && sy <= sh + bw) {
+			parts |= WLR_DECO_PART_BOTTOM_BORDER;
+		} else if (sy >= -(titlebar_h + bw) && sy < 0) {
+			parts |= WLR_DECO_PART_TOP_BORDER;
+		}
+	}
+
+	// TODO corners
+
+	return parts;
+}
+
 static void view_update_output(const struct roots_view *view,
 		const struct wlr_box *before) {
 	struct roots_desktop *desktop = view->desktop;
@@ -359,6 +397,12 @@ static bool view_at(struct roots_view *view, double lx, double ly,
 		return true;
 	}
 
+	if (view_get_deco_part(view, view_sx, view_sy)) {
+		*sx = view_sx;
+		*sy = view_sy;
+		return view;
+	}
+
 	if (wlr_box_contains_point(&box, view_sx, view_sy) &&
 			pixman_region32_contains_point(&view->wlr_surface->current->input,
 				view_sx, view_sy, NULL)) {
@@ -392,14 +436,6 @@ struct roots_view *desktop_view_at(struct roots_desktop *desktop, double lx,
 		if (view_at(view, lx, ly, surface, sx, sy)) {
 			return view;
 		}
-
-		if (view->decorated) {
-			struct wlr_box deco_box;
-			view_get_deco_box(view, &deco_box);
-			if (wlr_box_contains_point(&deco_box, lx, ly)) {
-				return view;
-			}
-		}
 	}
 	return NULL;
 }
diff --git a/rootston/output.c b/rootston/output.c
index 3680beac..0e568a14 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -158,8 +158,14 @@ static void render_decorations(struct roots_view *view,
 	}
 	struct wlr_box deco_box;
 	view_get_deco_box(view, &deco_box);
-	double ox = deco_box.x;
-	double oy = deco_box.y;
+	double sx = deco_box.x - view->x;
+	double sy = deco_box.y - view->y;
+	rotate_child_position(&sx, &sy, deco_box.width, deco_box.height,
+		view->wlr_surface->current->width,
+		view->wlr_surface->current->height, view->rotation);
+	double ox = sx + view->x;
+	double oy = sy + view->y;
+
 	wlr_output_layout_output_coords(desktop->layout, output, &ox, &oy);
 	ox *= output->scale;
 	oy *= output->scale;