2 files changed, 10 insertions, 24 deletions

diff --git a/rootston/desktop.c b/rootston/desktop.c
index 7be1c64a..178a975a 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -641,30 +641,17 @@ static struct wlr_surface *layer_surface_at(struct roots_output *output,
 		struct wl_list *layer, double ox, double oy, double *sx, double *sy) {
 	struct roots_layer_surface *roots_surface;
 	wl_list_for_each_reverse(roots_surface, layer, link) {
-		struct wlr_surface *wlr_surface;
-		double _sx, _sy;
-		struct wlr_xdg_popup *popup;
-		wl_list_for_each(popup, &roots_surface->layer_surface->popups, link) {
-			wlr_surface = popup->base->surface;
-			 _sx = ox - roots_surface->geo.x - popup->geometry.x;
-			 _sy = oy - roots_surface->geo.y - popup->geometry.y;
-			if (wlr_surface_point_accepts_input(wlr_surface, _sx, _sy)) {
-				*sx = _sx;
-				*sy = _sy;
-				return wlr_surface;
-			}
-			// TODO: popups can have popups
-		}
-		// TODO: Test subsurfaces
-		wlr_surface = roots_surface->layer_surface->surface;
-		 _sx = ox - roots_surface->geo.x;
-		 _sy = oy - roots_surface->geo.y;
-		if (wlr_surface_point_accepts_input(wlr_surface, _sx, _sy)) {
-			*sx = _sx;
-			*sy = _sy;
-			return wlr_surface;
+		double _sx = ox - roots_surface->geo.x;
+		double _sy = oy - roots_surface->geo.y;
+
+		struct wlr_surface *sub = wlr_layer_surface_surface_at(
+			roots_surface->layer_surface, _sx, _sy, sx, sy);
+
+		if (sub) {
+			return sub;
 		}
 	}
+
 	return NULL;
 }
 
diff --git a/rootston/output.c b/rootston/output.c
index d4c6d5a2..e07cd935 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -174,9 +174,8 @@ static void scissor_output(struct roots_output *output, pixman_box32_t *rect) {
 	};
 
 	int ow, oh;
-	wlr_output_transformed_resolution(output->wlr_output, &ow, &oh);
+	wlr_output_transformed_resolution(wlr_output, &ow, &oh);
 
-	// Scissor is in renderer coordinates, ie. upside down
 	enum wl_output_transform transform =
 		wlr_output_transform_invert(wlr_output->transform);
 	wlr_box_transform(&box, transform, ow, oh, &box);