Merge pull request #1755 from emersion/view-child-hidpi

Send surface enter/leave events to view children

4 files changed, 49 insertions, 2 deletions

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 6b2d279e..611c4f0b 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -28,6 +28,8 @@ struct sway_view_impl {
 	void (*configure)(struct sway_view *view, double ox, double oy, int width,
 		int height);
 	void (*set_activated)(struct sway_view *view, bool activated);
+	void (*for_each_surface)(struct sway_view *view,
+		wlr_surface_iterator_func_t iterator, void *user_data);
 	void (*close)(struct sway_view *view);
 	void (*destroy)(struct sway_view *view);
 };
@@ -159,6 +161,9 @@ void view_damage_whole(struct sway_view *view);
 
 void view_damage_from(struct sway_view *view);
 
+void view_for_each_surface(struct sway_view *view,
+	wlr_surface_iterator_func_t iterator, void *user_data);
+
 // view implementation
 
 void view_init(struct sway_view *view, enum sway_view_type type,
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index c66cc39a..8361aab3 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -118,6 +118,15 @@ static void set_activated(struct sway_view *view, bool activated) {
 	}
 }
 
+static void for_each_surface(struct sway_view *view,
+		wlr_surface_iterator_func_t iterator, void *user_data) {
+	if (xdg_shell_v6_view_from_view(view) == NULL) {
+		return;
+	}
+	wlr_xdg_surface_v6_for_each_surface(view->wlr_xdg_surface_v6, iterator,
+		user_data);
+}
+
 static void _close(struct sway_view *view) {
 	if (xdg_shell_v6_view_from_view(view) == NULL) {
 		return;
@@ -146,6 +155,7 @@ static const struct sway_view_impl view_impl = {
 	.get_prop = get_prop,
 	.configure = configure,
 	.set_activated = set_activated,
+	.for_each_surface = for_each_surface,
 	.close = _close,
 	.destroy = destroy,
 };
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index e3da1da7..10bfcc89 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -58,6 +58,9 @@ static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
 	surface->lx = xsurface->x;
 	surface->ly = xsurface->y;
 	desktop_damage_whole_surface(xsurface->surface, surface->lx, surface->ly);
+
+	// TODO: we don't send surface enter/leave events to xwayland unmanaged
+	// surfaces, but xwayland doesn't support HiDPI anyway
 }
 
 static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 16d48cc9..9855c5e1 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -102,6 +102,15 @@ static void view_get_layout_box(struct sway_view *view, struct wlr_box *box) {
 	box->height = view->height;
 }
 
+void view_for_each_surface(struct sway_view *view,
+		wlr_surface_iterator_func_t iterator, void *user_data) {
+	if (view->impl->for_each_surface) {
+		view->impl->for_each_surface(view, iterator, user_data);
+	} else {
+		wlr_surface_for_each_surface(view->surface, iterator, user_data);
+	}
+}
+
 static void view_subsurface_create(struct sway_view *view,
 	struct wlr_subsurface *subsurface);
 
@@ -116,6 +125,18 @@ static void view_handle_surface_new_subsurface(struct wl_listener *listener,
 	view_subsurface_create(view, subsurface);
 }
 
+static void surface_send_enter_iterator(struct wlr_surface *surface,
+		int x, int y, void *data) {
+	struct wlr_output *wlr_output = data;
+	wlr_surface_send_enter(surface, wlr_output);
+}
+
+static void surface_send_leave_iterator(struct wlr_surface *surface,
+		int x, int y, void *data) {
+	struct wlr_output *wlr_output = data;
+	wlr_surface_send_leave(surface, wlr_output);
+}
+
 static void view_handle_container_reparent(struct wl_listener *listener,
 		void *data) {
 	struct sway_view *view =
@@ -137,11 +158,11 @@ static void view_handle_container_reparent(struct wl_listener *listener,
 	}
 
 	if (old_output != NULL) {
-		wlr_surface_send_leave(view->surface,
+		view_for_each_surface(view, surface_send_leave_iterator,
 			old_output->sway_output->wlr_output);
 	}
 	if (new_output != NULL) {
-		wlr_surface_send_enter(view->surface,
+		view_for_each_surface(view, surface_send_enter_iterator,
 			new_output->sway_output->wlr_output);
 	}
 }
@@ -283,6 +304,14 @@ void view_child_init(struct sway_view_child *child,
 	wl_signal_add(&view->events.unmap, &child->view_unmap);
 	child->view_unmap.notify = view_child_handle_view_unmap;
 
+	struct sway_container *output = child->view->swayc->parent;
+	if (output != NULL) {
+		if (output->type != C_OUTPUT) {
+			output = container_parent(output, C_OUTPUT);
+		}
+		wlr_surface_send_enter(child->surface, output->sway_output->wlr_output);
+	}
+
 	view_init_subsurfaces(child->view, surface);
 
 	// TODO: only damage the whole child