3 files changed, 85 insertions, 2 deletions

diff --git a/rootston/desktop.c b/rootston/desktop.c
index 8d1d34d6..2c4611a8 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -40,6 +40,15 @@ void view_get_input_bounds(struct roots_view *view, struct wlr_box *box) {
 		view->get_input_bounds(view, box);
 		return;
 	}
+
+	if (view->type == ROOTS_XDG_SHELL_V6_VIEW) {
+		box->x = view->xdg_surface_v6->geometry->x;
+		box->y = view->xdg_surface_v6->geometry->y;
+		box->width = view->xdg_surface_v6->geometry->width;
+		box->height = view->xdg_surface_v6->geometry->height;
+		return;
+	}
+
 	box->x = box->y = 0;
 	box->width = view->wlr_surface->current->width;
 	box->height = view->wlr_surface->current->height;
@@ -84,6 +93,36 @@ static struct wlr_subsurface *subsurface_at(struct wlr_surface *surface,
 	return NULL;
 }
 
+static struct wlr_xdg_surface_v6 *xdg_v6_popup_at(
+		struct wlr_xdg_surface_v6 *surface, double sx, double sy,
+		double *popup_sx, double *popup_sy) {
+	struct wlr_xdg_surface_v6 *popup;
+	wl_list_for_each(popup, &surface->popups, popup_link) {
+		double _popup_sx = surface->geometry->x + popup->popup_state->geometry.x;
+		double _popup_sy =  surface->geometry->y + popup->popup_state->geometry.y;
+		int popup_width =  popup->popup_state->geometry.width;
+		int popup_height =  popup->popup_state->geometry.height;
+
+		struct wlr_xdg_surface_v6 *_popup =
+			xdg_v6_popup_at(popup, sx - _popup_sx + popup->geometry->x,
+				sy - _popup_sy + popup->geometry->y, popup_sx, popup_sy);
+		if (_popup) {
+			*popup_sx = *popup_sx + _popup_sx - popup->geometry->x;
+			*popup_sy = *popup_sy + _popup_sy - popup->geometry->y;
+			return _popup;
+		}
+
+		if ((sx > _popup_sx && sx < _popup_sx + popup_width) &&
+				(sy > _popup_sy && sy < _popup_sy + popup_height)) {
+			*popup_sx = _popup_sx - popup->geometry->x;
+			*popup_sy = _popup_sy - popup->geometry->y;
+			return popup;
+		}
+	}
+
+	return NULL;
+}
+
 struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy) {
 	for (int i = desktop->views->length - 1; i >= 0; --i) {
@@ -92,6 +131,20 @@ struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
 		double view_sx = lx - view->x;
 		double view_sy = ly - view->y;
 
+		if (view->type == ROOTS_XDG_SHELL_V6_VIEW) {
+			double popup_sx, popup_sy;
+			struct wlr_xdg_surface_v6 *popup =
+				xdg_v6_popup_at(view->xdg_surface_v6, view_sx, view_sy,
+					&popup_sx, &popup_sy);
+
+			if (popup) {
+				*sx = view_sx - popup_sx;
+				*sy = view_sy - popup_sy;
+				*surface = popup->surface;
+				return view;
+			}
+		}
+
 		double sub_x, sub_y;
 		struct wlr_subsurface *subsurface =
 			subsurface_at(view->wlr_surface, view_sx, view_sy, &sub_x, &sub_y);
diff --git a/rootston/output.c b/rootston/output.c
index 14d1783e..06786395 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -53,10 +53,33 @@ static void render_surface(struct wlr_surface *surface,
 	}
 }
 
+static void render_xdg_v6_popups(struct wlr_xdg_surface_v6 *surface,
+		struct roots_desktop *desktop, struct wlr_output *wlr_output,
+		struct timespec *when, double base_x, double base_y) {
+	struct wlr_xdg_surface_v6 *popup;
+	wl_list_for_each(popup, &surface->popups, popup_link) {
+		if (!popup->configured) {
+			continue;
+		}
+
+		double popup_x = base_x + surface->geometry->x +
+			popup->popup_state->geometry.x - popup->geometry->x;
+		double popup_y = base_y + surface->geometry->y +
+			popup->popup_state->geometry.y - popup->geometry->y;
+		render_surface(popup->surface, desktop, wlr_output, when, popup_x,
+			popup_y);
+		render_xdg_v6_popups(popup, desktop, wlr_output, when, popup_x, popup_y);
+	}
+}
+
 static void render_view(struct roots_view *view, struct roots_desktop *desktop,
 		struct wlr_output *wlr_output, struct timespec *when) {
 	render_surface(view->wlr_surface, desktop, wlr_output, when,
 		view->x, view->y);
+	if (view->type == ROOTS_XDG_SHELL_V6_VIEW) {
+		render_xdg_v6_popups(view->xdg_surface_v6, desktop, wlr_output,
+			when, view->x, view->y);
+	}
 }
 
 static void output_frame_notify(struct wl_listener *listener, void *data) {
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index ab34f52a..ff0dd090 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -73,11 +73,18 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 }
 
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
+	struct wlr_xdg_surface_v6 *surface = data;
+	assert(surface->role != WLR_XDG_SURFACE_V6_ROLE_NONE);
+
+	if (surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
+		wlr_log(L_DEBUG, "new xdg popup");
+		return;
+	}
+
 	struct roots_desktop *desktop =
 		wl_container_of(listener, desktop, xdg_shell_v6_surface);
 
-	struct wlr_xdg_surface_v6 *surface = data;
-	wlr_log(L_DEBUG, "new xdg surface: title=%s, app_id=%s",
+	wlr_log(L_DEBUG, "new xdg toplevel: title=%s, app_id=%s",
 		surface->title, surface->app_id);
 	wlr_xdg_surface_v6_ping(surface);