From 3751a1732158546c4fbc203aa34fc4a4a68f1016 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 16 Jan 2018 07:50:40 -0500
Subject: decorate xwayland views

---
 include/rootston/view.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include/rootston')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index 579b148a..a18eda8f 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -61,6 +61,10 @@ struct roots_view {
 	double x, y;
 	float rotation;
 
+	bool decorated;
+	int border_width;
+	int titlebar_height;
+
 	bool maximized;
 	struct roots_output *fullscreen_output;
 	struct {
@@ -113,6 +117,7 @@ struct roots_view {
 };
 
 void view_get_box(const struct roots_view *view, struct wlr_box *box);
+void view_get_deco_box(const struct roots_view *view, struct wlr_box *box);
 void view_activate(struct roots_view *view, bool active);
 void view_move(struct roots_view *view, double x, double y);
 void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
-- 
cgit v1.2.3


From 61bd79200cc3892b143b7321886db77e97c9f69f Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 16 Jan 2018 19:04:26 -0500
Subject: basic decorations

---
 include/rootston/cursor.h |  2 +
 include/rootston/input.h  |  2 +
 include/rootston/seat.h   |  8 ++++
 include/rootston/view.h   |  3 ++
 rootston/cursor.c         | 94 ++++++++++++++++++++++++++++++++++++++++++++---
 rootston/desktop.c        |  8 ++++
 rootston/seat.c           | 44 ++++++++++++++--------
 7 files changed, 141 insertions(+), 20 deletions(-)

(limited to 'include/rootston')

diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h
index 19ac4034..90d54c12 100644
--- a/include/rootston/cursor.h
+++ b/include/rootston/cursor.h
@@ -27,6 +27,8 @@ struct roots_cursor {
 	float view_rotation;
 	uint32_t resize_edges;
 
+	struct roots_seat_view *pointer_view;
+
 	struct wl_listener motion;
 	struct wl_listener motion_absolute;
 	struct wl_listener button;
diff --git a/include/rootston/input.h b/include/rootston/input.h
index 726dda24..2270ea0c 100644
--- a/include/rootston/input.h
+++ b/include/rootston/input.h
@@ -9,6 +9,8 @@
 #include "rootston/view.h"
 #include "rootston/server.h"
 
+struct roots_view;
+
 struct roots_input {
 	struct roots_config *config;
 	struct roots_server *server;
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index cf5dd3b2..6ae7c3fa 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -28,6 +28,11 @@ struct roots_seat {
 struct roots_seat_view {
 	struct roots_seat *seat;
 	struct roots_view *view;
+
+	bool has_button_grab;
+	double grab_vx;
+	double grab_vy;
+
 	struct wl_list link; // roots_seat::views
 
 	struct wl_listener view_destroy;
@@ -84,4 +89,7 @@ void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view,
 
 void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view);
 
+struct roots_seat_view *roots_seat_view_from_view( struct roots_seat *seat,
+		struct roots_view *view);
+
 #endif
diff --git a/include/rootston/view.h b/include/rootston/view.h
index a18eda8f..68ccbef8 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -6,6 +6,9 @@
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
+#include "rootston/seat.h"
+
+struct roots_seat;
 
 struct roots_wl_shell_surface {
 	struct roots_view *view;
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 8bd514cc..8a34cd13 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -30,19 +30,81 @@ 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) {
+	struct roots_cursor *cursor = view->seat->cursor;
+
+	double vx = deco_vx;
+	double vy = deco_vy;
+	if (view->has_button_grab) {
+		vx = view->grab_vx;
+		vy = view->grab_vy;
+	}
+
+	bool is_titlebar = vy < 0 && -vy < view->view->titlebar_height;
+	uint32_t edges = 0;
+	if (vx < 0) {
+		edges |= WLR_EDGE_LEFT;
+	} else if (vx > view->view->wlr_surface->current->width) {
+		edges |= WLR_EDGE_RIGHT;
+	} else if (vy > view->view->wlr_surface->current->height) {
+		edges |= WLR_EDGE_BOTTOM;
+	} else if (-vy > view->view->titlebar_height) {
+		edges |= WLR_EDGE_TOP;
+	}
+
+	if (view->has_button_grab) {
+		if (is_titlebar) {
+			roots_seat_begin_move(view->seat, view->view);
+		} else if (edges) {
+			roots_seat_begin_resize(view->seat, view->view, edges);
+		}
+		view->has_button_grab = false;
+	} else {
+		if (is_titlebar) {
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+				cursor->default_xcursor, cursor->cursor);
+		} else if (edges) {
+			const char *resize_name = wlr_xcursor_get_resize_name(edges);
+			wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+				resize_name, cursor->cursor);
+		}
+	}
+}
+
+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) {
+	if (button == BTN_LEFT && state == WLR_BUTTON_PRESSED) {
+		view->has_button_grab = true;
+		view->grab_vx = vx;
+		view->grab_vy = vy;
+	} else {
+		view->has_button_grab = false;
+	}
+}
+
 static void roots_cursor_update_position(struct roots_cursor *cursor,
 		uint32_t time) {
 	struct roots_desktop *desktop = cursor->seat->input->server->desktop;
 	struct roots_seat *seat = cursor->seat;
 	struct roots_view *view;
-	struct wlr_surface *surface;
+	struct wlr_surface *surface = NULL;
 	double sx, sy;
 	switch (cursor->mode) {
 	case ROOTS_CURSOR_PASSTHROUGH:
 		view = desktop_view_at(desktop, cursor->cursor->x, cursor->cursor->y,
 			&surface, &sx, &sy);
+		struct roots_seat_view *seat_view =
+			roots_seat_view_from_view(seat, view);
+		if (cursor->pointer_view && (surface || seat_view != cursor->pointer_view)) {
+			seat_view_deco_leave(cursor->pointer_view);
+			cursor->pointer_view = NULL;
+		}
 		bool set_compositor_cursor = !view && cursor->cursor_client;
-		if (view) {
+		if (view && surface) {
 			struct wl_client *view_client =
 				wl_resource_get_client(view->wlr_surface->resource);
 			set_compositor_cursor = view_client != cursor->cursor_client;
@@ -52,7 +114,15 @@ static void roots_cursor_update_position(struct roots_cursor *cursor,
 				cursor->default_xcursor, cursor->cursor);
 			cursor->cursor_client = NULL;
 		}
-		if (view) {
+		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);
+			}
+		} if (view && surface) {
+			// motion over a view surface
 			wlr_seat_pointer_notify_enter(seat->seat, surface, sx, sy);
 			wlr_seat_pointer_notify_motion(seat->seat, time, sx, sy);
 		} else {
@@ -166,16 +236,30 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
 		}
 		return;
 	}
+
+	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);
+		}
+	}
+
 	if (state == WLR_BUTTON_RELEASED &&
 			cursor->mode != ROOTS_CURSOR_PASSTHROUGH) {
 		cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
+		wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
+			cursor->default_xcursor, cursor->cursor);
 		if (seat->seat->pointer_state.button_count == 0) {
 			return;
 		}
 	}
 
-	if (!is_touch) {
-		wlr_seat_pointer_notify_button(seat->seat, time, button, state);
+	if (view && surface) {
+		if (!is_touch) {
+			wlr_seat_pointer_notify_button(seat->seat, time, button, state);
+		}
 	}
 
 	switch (state) {
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 3de1f669..1ec1d552 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -392,6 +392,14 @@ 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/seat.c b/rootston/seat.c
index 130c7b27..06c0caa6 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -580,7 +580,7 @@ static struct roots_seat_view *seat_add_view(struct roots_seat *seat,
 	seat_view->seat = seat;
 	seat_view->view = view;
 
-	wl_list_insert(&seat->views, &seat_view->link);
+	wl_list_insert(seat->views.prev, &seat_view->link);
 
 	seat_view->view_destroy.notify = seat_view_handle_destroy;
 	wl_signal_add(&view->events.destroy, &seat_view->view_destroy);
@@ -588,6 +588,31 @@ static struct roots_seat_view *seat_add_view(struct roots_seat *seat,
 	return seat_view;
 }
 
+struct roots_seat_view *roots_seat_view_from_view(
+		struct roots_seat *seat, struct roots_view *view) {
+	if (view == NULL) {
+		return NULL;
+	}
+
+	bool found = false;
+	struct roots_seat_view *seat_view = NULL;
+	wl_list_for_each(seat_view, &seat->views, link) {
+		if (seat_view->view == view) {
+			found = true;
+			break;
+		}
+	}
+	if (!found) {
+		seat_view = seat_add_view(seat, view);
+		if (seat_view == NULL) {
+			wlr_log(L_ERROR, "Allocation failed");
+			return NULL;
+		}
+	}
+
+	return seat_view;
+}
+
 void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
 	// Make sure the view will be rendered on top of others, even if it's
 	// already focused in this seat
@@ -605,22 +630,11 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
 			view->xwayland_surface->override_redirect) {
 		return;
 	}
-
 	struct roots_seat_view *seat_view = NULL;
 	if (view != NULL) {
-		bool found = false;
-		wl_list_for_each(seat_view, &seat->views, link) {
-			if (seat_view->view == view) {
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			seat_view = seat_add_view(seat, view);
-			if (seat_view == NULL) {
-				wlr_log(L_ERROR, "Allocation failed");
-				return;
-			}
+		seat_view = roots_seat_view_from_view(seat, view);
+		if (seat_view == NULL) {
+			return;
 		}
 	}
 
-- 
cgit v1.2.3


From 41832714758c003c557da30193c6b02a2afe54b2 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sun, 21 Jan 2018 18:24:53 -0500
Subject: make it work with rotation

---
 include/rootston/seat.h |  4 ++--
 include/rootston/view.h | 14 ++++++++++++-
 rootston/cursor.c       | 39 +++++++++++++++++--------------------
 rootston/desktop.c      | 52 +++++++++++++++++++++++++++++++++++++++++--------
 rootston/output.c       | 10 ++++++++--
 5 files changed, 85 insertions(+), 34 deletions(-)

(limited to 'include/rootston')

diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index 6ae7c3fa..966d98e5 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -30,8 +30,8 @@ struct roots_seat_view {
 	struct roots_view *view;
 
 	bool has_button_grab;
-	double grab_vx;
-	double grab_vy;
+	double grab_sx;
+	double grab_sy;
 
 	struct wl_list link; // roots_seat::views
 
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 68ccbef8..77b78852 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -120,7 +120,6 @@ struct roots_view {
 };
 
 void view_get_box(const struct roots_view *view, struct wlr_box *box);
-void view_get_deco_box(const struct roots_view *view, struct wlr_box *box);
 void view_activate(struct roots_view *view, bool active);
 void view_move(struct roots_view *view, double x, double y);
 void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
@@ -134,4 +133,17 @@ bool view_center(struct roots_view *view);
 void view_setup(struct roots_view *view);
 void view_teardown(struct roots_view *view);
 
+void view_get_deco_box(const struct roots_view *view, struct wlr_box *box);
+
+enum wlr_deco_part {
+	WLR_DECO_PART_NONE = 0,
+	WLR_DECO_PART_TOP_BORDER = (1 << 0),
+	WLR_DECO_PART_BOTTOM_BORDER = (1 << 1),
+	WLR_DECO_PART_LEFT_BORDER = (1 << 2),
+	WLR_DECO_PART_RIGHT_BORDER = (1 << 3),
+	WLR_DECO_PART_TITLEBAR = (1 << 4),
+};
+
+enum wlr_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy);
+
 #endif
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;
-- 
cgit v1.2.3


From e8c407d00e9acaff27973af8df4eaf19b6571d88 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sun, 21 Jan 2018 18:46:19 -0500
Subject: rename wlr_deco_part to roots_deco_part

---
 include/rootston/view.h | 16 ++++++++--------
 rootston/cursor.c       | 16 ++++++++--------
 rootston/desktop.c      | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'include/rootston')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index 77b78852..108a8267 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -135,15 +135,15 @@ void view_teardown(struct roots_view *view);
 
 void view_get_deco_box(const struct roots_view *view, struct wlr_box *box);
 
-enum wlr_deco_part {
-	WLR_DECO_PART_NONE = 0,
-	WLR_DECO_PART_TOP_BORDER = (1 << 0),
-	WLR_DECO_PART_BOTTOM_BORDER = (1 << 1),
-	WLR_DECO_PART_LEFT_BORDER = (1 << 2),
-	WLR_DECO_PART_RIGHT_BORDER = (1 << 3),
-	WLR_DECO_PART_TITLEBAR = (1 << 4),
+enum roots_deco_part {
+	ROOTS_DECO_PART_NONE = 0,
+	ROOTS_DECO_PART_TOP_BORDER = (1 << 0),
+	ROOTS_DECO_PART_BOTTOM_BORDER = (1 << 1),
+	ROOTS_DECO_PART_LEFT_BORDER = (1 << 2),
+	ROOTS_DECO_PART_RIGHT_BORDER = (1 << 3),
+	ROOTS_DECO_PART_TITLEBAR = (1 << 4),
 };
 
-enum wlr_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy);
+enum roots_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy);
 
 #endif
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 8f6091ee..5430afe5 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -40,17 +40,17 @@ static void seat_view_deco_motion(struct roots_seat_view *view, double deco_sx,
 		sy = view->grab_sy;
 	}
 
-	enum wlr_deco_part parts = view_get_deco_part(view->view, sx, sy);
+	enum roots_deco_part parts = view_get_deco_part(view->view, sx, sy);
 
-	bool is_titlebar = (parts & WLR_DECO_PART_TITLEBAR);
+	bool is_titlebar = (parts & ROOTS_DECO_PART_TITLEBAR);
 	uint32_t edges = 0;
-	if (parts & WLR_DECO_PART_LEFT_BORDER) {
+	if (parts & ROOTS_DECO_PART_LEFT_BORDER) {
 		edges |= WLR_EDGE_LEFT;
-	} else if (parts & WLR_DECO_PART_RIGHT_BORDER) {
+	} else if (parts & ROOTS_DECO_PART_RIGHT_BORDER) {
 		edges |= WLR_EDGE_RIGHT;
-	} else if (parts & WLR_DECO_PART_BOTTOM_BORDER) {
+	} else if (parts & ROOTS_DECO_PART_BOTTOM_BORDER) {
 		edges |= WLR_EDGE_BOTTOM;
-	} else if (parts & WLR_DECO_PART_TOP_BORDER) {
+	} else if (parts & ROOTS_DECO_PART_TOP_BORDER) {
 		edges |= WLR_EDGE_TOP;
 	}
 
@@ -90,8 +90,8 @@ static void seat_view_deco_button(struct roots_seat_view *view, double sx,
 		view->has_button_grab = false;
 	}
 
-	enum wlr_deco_part parts = view_get_deco_part(view->view, sx, sy);
-	if (state == WLR_BUTTON_RELEASED && (parts & WLR_DECO_PART_TITLEBAR)) {
+	enum roots_deco_part parts = view_get_deco_part(view->view, sx, sy);
+	if (state == WLR_BUTTON_RELEASED && (parts & ROOTS_DECO_PART_TITLEBAR)) {
 		struct roots_cursor *cursor = view->seat->cursor;
 		wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
 				cursor->default_xcursor, cursor->cursor);
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 2632eebd..5fa27db2 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -44,9 +44,9 @@ 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) {
+enum roots_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy) {
 	if (!view->decorated) {
-		return WLR_DECO_PART_NONE;
+		return ROOTS_DECO_PART_NONE;
 	}
 
 	int sw = view->wlr_surface->current->width;
@@ -55,24 +55,24 @@ enum wlr_deco_part view_get_deco_part(struct roots_view *view, double sx, double
 	int titlebar_h = view->titlebar_height;
 
 	if (sx > 0 && sx < sw && sy < 0 && sy > -view->titlebar_height) {
-		return WLR_DECO_PART_TITLEBAR;
+		return ROOTS_DECO_PART_TITLEBAR;
 	}
 
-	enum wlr_deco_part parts = 0;
+	enum roots_deco_part parts = 0;
 	if (sy >= -(titlebar_h + bw) &&
 			sy <= sh + bw) {
 		if (sx < 0 && sx > -bw) {
-			parts |= WLR_DECO_PART_LEFT_BORDER;
+			parts |= ROOTS_DECO_PART_LEFT_BORDER;
 		} else if (sx > sw && sx < sw + bw) {
-			parts |= WLR_DECO_PART_RIGHT_BORDER;
+			parts |= ROOTS_DECO_PART_RIGHT_BORDER;
 		}
 	}
 
 	if (sx >= -bw && sx <= sw + bw) {
 		if (sy > sh && sy <= sh + bw) {
-			parts |= WLR_DECO_PART_BOTTOM_BORDER;
+			parts |= ROOTS_DECO_PART_BOTTOM_BORDER;
 		} else if (sy >= -(titlebar_h + bw) && sy < 0) {
-			parts |= WLR_DECO_PART_TOP_BORDER;
+			parts |= ROOTS_DECO_PART_TOP_BORDER;
 		}
 	}
 
-- 
cgit v1.2.3


From 9076ecd91fddf558d11c20365741d7f68e578ef1 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sun, 21 Jan 2018 19:08:40 -0500
Subject: take seat.h out of view.h

---
 include/rootston/view.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'include/rootston')

diff --git a/include/rootston/view.h b/include/rootston/view.h
index 108a8267..e837586a 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -6,9 +6,6 @@
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
-#include "rootston/seat.h"
-
-struct roots_seat;
 
 struct roots_wl_shell_surface {
 	struct roots_view *view;
-- 
cgit v1.2.3


From 9d87d4e33616aba3f57578548fdb8cb150b814e8 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sun, 21 Jan 2018 19:09:35 -0500
Subject: take roots_view out of input.h

---
 include/rootston/input.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include/rootston')

diff --git a/include/rootston/input.h b/include/rootston/input.h
index 2270ea0c..726dda24 100644
--- a/include/rootston/input.h
+++ b/include/rootston/input.h
@@ -9,8 +9,6 @@
 #include "rootston/view.h"
 #include "rootston/server.h"
 
-struct roots_view;
-
 struct roots_input {
 	struct roots_config *config;
 	struct roots_server *server;
-- 
cgit v1.2.3