implement flip_x

3 files changed, 106 insertions, 88 deletions

diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index e192d36a..e085c493 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -296,13 +296,19 @@ struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_popup_at(
 		struct wlr_xdg_surface_v6 *surface, double sx, double sy,
 		double *popup_sx, double *popup_sy);
 
+struct wlr_box wlr_xdg_positioner_v6_get_geometry(
+		struct wlr_xdg_positioner_v6_attributes *positioner);
+
 /**
  * Get the anchor point for this popup in the root parent's coordinate system.
  */
 void wlr_xdg_popup_v6_get_anchor_point(struct wlr_xdg_popup_v6 *popup,
 		int *root_sx, int *root_sy);
 
-void wlr_positioner_v6_invert(
+void wlr_positioner_v6_invert_x(
+		struct wlr_xdg_positioner_v6_attributes *positioner);
+
+void wlr_positioner_v6_invert_y(
 		struct wlr_xdg_positioner_v6_attributes *positioner);
 
 #endif
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 36ecc897..0a698e50 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -38,62 +38,84 @@ static void popup_handle_new_popup(struct wl_listener *listener, void *data) {
 	popup_create(popup->view_child.view, wlr_popup);
 }
 
-static struct roots_xdg_popup_v6 *popup_create(struct roots_view *view,
-		struct wlr_xdg_popup_v6 *wlr_popup) {
-	struct roots_xdg_popup_v6 *popup =
-		calloc(1, sizeof(struct roots_xdg_popup_v6));
-	if (popup == NULL) {
-		return NULL;
-	}
-
-	struct wlr_xdg_surface_v6 *parent = wlr_popup->parent;
-	double popup_lx = wlr_popup->geometry.x;
-	double popup_ly = wlr_popup->geometry.y;
+static void popup_get_coords(struct wlr_xdg_popup_v6 *popup,
+		double *sx, double *sy) {
+	struct wlr_xdg_surface_v6 *parent = popup->parent;
+	double popup_sx = popup->geometry.x;
+	double popup_sy = popup->geometry.y;
 	while (parent->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
-		popup_lx += parent->popup->geometry.x;
-		popup_ly += parent->popup->geometry.y;
+		popup_sx += parent->popup->geometry.x;
+		popup_sy += parent->popup->geometry.y;
 		parent = parent->popup->parent;
 	}
 
-	popup_lx += view->x + parent->geometry.x;
-	popup_ly += view->y + parent->geometry.y;
+	*sx = popup_sx + parent->geometry.x;
+	*sy = popup_sy + parent->geometry.y;
+}
+
+static void popup_is_constrained(struct roots_xdg_popup_v6 *popup,
+		bool *x_constrained, bool *y_constrained) {
+	struct roots_view *view = popup->view_child.view;
+	struct wlr_output_layout *layout = view->desktop->layout;
+	struct wlr_xdg_popup_v6 *wlr_popup = popup->wlr_popup;
 	int popup_width = wlr_popup->geometry.width;
 	int popup_height = wlr_popup->geometry.height;
 
-	int anchor_x, anchor_y;
-	wlr_xdg_popup_v6_get_anchor_point(wlr_popup, &anchor_x, &anchor_y);
-	anchor_x += popup_lx;
-	anchor_y += popup_ly;
+	int anchor_lx, anchor_ly;
+	wlr_xdg_popup_v6_get_anchor_point(wlr_popup, &anchor_lx, &anchor_ly);
 
-	struct wlr_output_layout *layout = view->desktop->layout;
+	double popup_lx, popup_ly;
+	popup_get_coords(wlr_popup, &popup_lx, &popup_ly);
+	popup_lx += view->x;
+	popup_ly += view->y;
+
+	anchor_lx += popup_lx;
+	anchor_ly += popup_ly;
+
+	double dest_x = 0, dest_y = 0;
+	wlr_output_layout_closest_point(layout, NULL, anchor_lx, anchor_ly,
+		&dest_x, &dest_y);
 
-	// get the output that contains (or closest to) the anchor point
 	struct wlr_output *output =
-		wlr_output_layout_output_at(layout, anchor_x, anchor_y);
-	if (output == NULL) {
-		// TODO find the closest output to the anchor
-		assert(false);
-	}
+		wlr_output_layout_output_at(layout, dest_x, dest_y);
+	// XXX: handle empty output layout
+	assert(output);
 
-	// does the output completely contain the popup?
 	struct wlr_box *output_box = wlr_output_layout_get_box(layout, output);
-	bool output_contains_popup_x = popup_lx >= output_box->x &&
-			popup_lx + popup_width <= output_box->x + output_box->width;
-	bool output_contains_popup_y = popup_ly >= output_box->y &&
-			popup_ly + popup_height <= output_box->y + output_box->height;
-
-	if (!output_contains_popup_x) {
-		// TODO flip_x
-		// TODO slide_x
-		// TODO resize_x
-	}
+	*x_constrained = popup_lx <= output_box->x ||
+			popup_lx + popup_width >= output_box->x + output_box->width;
+	*y_constrained = popup_ly <= output_box->y ||
+			popup_ly + popup_height >= output_box->y + output_box->height;
+}
+
+static void popup_unconstrain_flip(struct roots_xdg_popup_v6 *popup) {
+	bool x_constrained, y_constrained;
+	popup_is_constrained(popup, &x_constrained, &y_constrained);
 
-	if (!output_contains_popup_y) {
-		// TODO flip_y
-		// TODO slide_y
-		// TODO resize_y
+	if (x_constrained) {
+		wlr_positioner_v6_invert_x(&popup->wlr_popup->positioner);
 	}
+	if (y_constrained) {
+		wlr_positioner_v6_invert_y(&popup->wlr_popup->positioner);
+	}
+
+	popup->wlr_popup->geometry =
+		wlr_xdg_positioner_v6_get_geometry(&popup->wlr_popup->positioner);
+}
+
+static void popup_unconstrain(struct roots_xdg_popup_v6 *popup) {
+	popup_unconstrain_flip(popup);
+	// TODO popup_unconstrain_slide(popup);
+	// TODO popup_unconstrain_resize(popup);
+}
 
+static struct roots_xdg_popup_v6 *popup_create(struct roots_view *view,
+		struct wlr_xdg_popup_v6 *wlr_popup) {
+	struct roots_xdg_popup_v6 *popup =
+		calloc(1, sizeof(struct roots_xdg_popup_v6));
+	if (popup == NULL) {
+		return NULL;
+	}
 	popup->wlr_popup = wlr_popup;
 	popup->view_child.destroy = popup_destroy;
 	view_child_init(&popup->view_child, view, wlr_popup->base->surface);
@@ -101,6 +123,9 @@ static struct roots_xdg_popup_v6 *popup_create(struct roots_view *view,
 	wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
 	popup->new_popup.notify = popup_handle_new_popup;
 	wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
+
+	popup_unconstrain(popup);
+
 	return popup;
 }
 
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index fc3a38d4..76340a3c 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -399,9 +399,7 @@ static void xdg_shell_handle_create_positioner(struct wl_client *wl_client,
 		positioner, xdg_positioner_destroy);
 }
 
-static struct wlr_box xdg_positioner_get_geometry(
-		struct wlr_xdg_positioner_v6_attributes *positioner,
-		struct wlr_xdg_surface_v6 *surface, struct wlr_xdg_surface_v6 *parent) {
+struct wlr_box wlr_xdg_positioner_v6_get_geometry(struct wlr_xdg_positioner_v6_attributes *positioner) {
 	struct wlr_box geometry = {
 		.x = positioner->offset.x,
 		.y = positioner->offset.y,
@@ -589,7 +587,7 @@ static void xdg_surface_handle_get_popup(struct wl_client *client,
 	surface->popup->base = surface;
 	surface->popup->parent = parent;
 	surface->popup->geometry =
-		xdg_positioner_get_geometry(positioner->attrs, surface, parent);
+		wlr_xdg_positioner_v6_get_geometry(positioner->attrs);
 
 	// positioner properties
 	memcpy(&surface->popup->positioner, positioner->attrs,
@@ -1675,50 +1673,39 @@ void wlr_xdg_popup_v6_get_anchor_point(struct wlr_xdg_popup_v6 *popup,
 	*/
 }
 
-void wlr_positioner_v6_invert(
-		struct wlr_xdg_positioner_v6_attributes *positioner) {
-	enum wlr_positioner_v6_anchor anchor = positioner->anchor;
+void wlr_positioner_v6_invert_x(struct wlr_xdg_positioner_v6_attributes *positioner) {
+	if (positioner->anchor & WLR_POSITIONER_V6_ANCHOR_LEFT) {
+		positioner->anchor &= ~WLR_POSITIONER_V6_ANCHOR_LEFT;
+		positioner->anchor |= WLR_POSITIONER_V6_ANCHOR_RIGHT;
+	} else if (positioner->anchor & WLR_POSITIONER_V6_ANCHOR_RIGHT) {
+		positioner->anchor &= ~WLR_POSITIONER_V6_ANCHOR_RIGHT;
+		positioner->anchor |= WLR_POSITIONER_V6_ANCHOR_LEFT;
+	}
 
-	if (anchor == WLR_POSITIONER_V6_ANCHOR_NONE) {
-		// already inverted
-	} else if (anchor == WLR_POSITIONER_V6_ANCHOR_TOP) {
-		positioner->anchor = WLR_POSITIONER_V6_ANCHOR_BOTTOM;
-	} else if (anchor == WLR_POSITIONER_V6_ANCHOR_BOTTOM) {
-		positioner->anchor = WLR_POSITIONER_V6_ANCHOR_TOP;
-	} else if (anchor == WLR_POSITIONER_V6_ANCHOR_LEFT) {
-		positioner->anchor = WLR_POSITIONER_V6_ANCHOR_RIGHT;
-	} else if (anchor == WLR_POSITIONER_V6_ANCHOR_RIGHT) {
-		positioner->anchor = WLR_POSITIONER_V6_ANCHOR_LEFT;
-	} else if (anchor == (WLR_POSITIONER_V6_ANCHOR_TOP |
-				WLR_POSITIONER_V6_ANCHOR_LEFT)) {
-		positioner->anchor = WLR_POSITIONER_V6_ANCHOR_BOTTOM | WLR_POSITIONER_V6_ANCHOR_RIGHT;
-	} else if (anchor == (WLR_POSITIONER_V6_ANCHOR_TOP |
-				WLR_POSITIONER_V6_ANCHOR_RIGHT)) {
-		positioner->anchor = WLR_POSITIONER_V6_ANCHOR_BOTTOM | WLR_POSITIONER_V6_ANCHOR_LEFT;
-	} else if (anchor == (WLR_POSITIONER_V6_ANCHOR_BOTTOM |
-				WLR_POSITIONER_V6_ANCHOR_LEFT)) {
-		positioner->anchor = WLR_POSITIONER_V6_ANCHOR_TOP | WLR_POSITIONER_V6_ANCHOR_RIGHT;
-	} else if (anchor == (WLR_POSITIONER_V6_ANCHOR_BOTTOM |
-				WLR_POSITIONER_V6_ANCHOR_RIGHT)) {
-		positioner->anchor = WLR_POSITIONER_V6_ANCHOR_TOP | WLR_POSITIONER_V6_ANCHOR_LEFT;
+	if (positioner->gravity & WLR_POSITIONER_V6_GRAVITY_RIGHT) {
+		positioner->gravity &= ~WLR_POSITIONER_V6_GRAVITY_RIGHT;
+		positioner->gravity |= WLR_POSITIONER_V6_GRAVITY_LEFT;
+	} else if (positioner->gravity & WLR_POSITIONER_V6_GRAVITY_LEFT) {
+		positioner->gravity &= ~WLR_POSITIONER_V6_GRAVITY_LEFT;
+		positioner->gravity |= WLR_POSITIONER_V6_GRAVITY_RIGHT;
 	}
+}
 
-	enum wlr_positioner_v6_gravity gravity = positioner->gravity;
-	switch (gravity) {
-	case WLR_POSITIONER_V6_GRAVITY_NONE:
-		// already inverted
-		break;
-	case WLR_POSITIONER_V6_GRAVITY_TOP:
-		positioner->gravity = WLR_POSITIONER_V6_GRAVITY_BOTTOM;
-		break;
-	case WLR_POSITIONER_V6_GRAVITY_BOTTOM:
-		positioner->gravity = WLR_POSITIONER_V6_GRAVITY_TOP;
-		break;
-	case WLR_POSITIONER_V6_GRAVITY_LEFT:
-		positioner->gravity = WLR_POSITIONER_V6_GRAVITY_RIGHT;
-		break;
-	case WLR_POSITIONER_V6_GRAVITY_RIGHT:
-		positioner->gravity = WLR_POSITIONER_V6_GRAVITY_LEFT;
-		break;
+void wlr_positioner_v6_invert_y(
+		struct wlr_xdg_positioner_v6_attributes *positioner) {
+	if (positioner->anchor & WLR_POSITIONER_V6_ANCHOR_TOP) {
+		positioner->anchor &= ~WLR_POSITIONER_V6_ANCHOR_TOP;
+		positioner->anchor |= WLR_POSITIONER_V6_ANCHOR_BOTTOM;
+	} else if (positioner->anchor & WLR_POSITIONER_V6_ANCHOR_BOTTOM) {
+		positioner->anchor &= ~WLR_POSITIONER_V6_ANCHOR_BOTTOM;
+		positioner->anchor |= WLR_POSITIONER_V6_ANCHOR_TOP;
+	}
+
+	if (positioner->gravity & WLR_POSITIONER_V6_GRAVITY_TOP) {
+		positioner->gravity &= ~WLR_POSITIONER_V6_GRAVITY_TOP;
+		positioner->gravity |= WLR_POSITIONER_V6_GRAVITY_BOTTOM;
+	} else if (positioner->gravity & WLR_POSITIONER_V6_GRAVITY_BOTTOM) {
+		positioner->gravity &= ~WLR_POSITIONER_V6_GRAVITY_BOTTOM;
+		positioner->gravity |= WLR_POSITIONER_V6_GRAVITY_TOP;
 	}
 }