From 226d471794caf57245cb44d2fe501b431e46d290 Mon Sep 17 00:00:00 2001
From: project-repo <cagebreak_signing_key_10@project-repo.co>
Date: Fri, 6 Jan 2023 15:13:24 +0100
Subject: [PATCH] Update xwayland seat on focus

---
 cagebreak.c | 21 +++++++++------------
 seat.c      |  3 +++
 server.h    |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/cagebreak.c b/cagebreak.c
index eafdb08..5372ee2 100644
--- a/cagebreak.c
+++ b/cagebreak.c
@@ -273,9 +273,6 @@ main(int argc, char *argv[]) {
 	struct wlr_xdg_output_manager_v1 *output_manager = NULL;
 	struct wlr_gamma_control_manager_v1 *gamma_control_manager = NULL;
 	struct wlr_xdg_shell *xdg_shell = NULL;
-#if CG_HAS_XWAYLAND
-	struct wlr_xwayland *xwayland = NULL;
-#endif
 	wl_list_init(&server.input_config);
 	wl_list_init(&server.output_config);
 	wl_list_init(&server.output_priorities);
@@ -571,21 +568,21 @@ main(int argc, char *argv[]) {
 	}
 
 #if CG_HAS_XWAYLAND
-	xwayland = wlr_xwayland_create(server.wl_display, compositor, true);
-	if(!xwayland) {
+	server.xwayland = wlr_xwayland_create(server.wl_display, compositor, true);
+	if(!server.xwayland) {
 		wlr_log(WLR_ERROR, "Cannot create XWayland server");
 		ret = 1;
 		goto end;
 	}
 	server.new_xwayland_surface.notify = handle_xwayland_surface_new;
-	wl_signal_add(&xwayland->events.new_surface, &server.new_xwayland_surface);
+	wl_signal_add(&server.xwayland->events.new_surface, &server.new_xwayland_surface);
 
-	if(setenv("DISPLAY", xwayland->display_name, true) < 0) {
+	if(setenv("DISPLAY", server.xwayland->display_name, true) < 0) {
 		wlr_log_errno(WLR_ERROR, "Unable to set DISPLAY for XWayland.",
 		              "Clients may not be able to connect");
 	} else {
 		wlr_log(WLR_DEBUG, "XWayland is running on display %s",
-		        xwayland->display_name);
+		        server.xwayland->display_name);
 	}
 
 	struct wlr_xcursor *xcursor =
@@ -593,7 +590,7 @@ main(int argc, char *argv[]) {
 
 	if(xcursor) {
 		struct wlr_xcursor_image *image = xcursor->images[0];
-		wlr_xwayland_set_cursor(xwayland, image->buffer, image->width * 4,
+		wlr_xwayland_set_cursor(server.xwayland, image->buffer, image->width * 4,
 		                        image->width, image->height, image->hotspot_x,
 		                        image->hotspot_y);
 	}
@@ -620,7 +617,7 @@ main(int argc, char *argv[]) {
 	}
 
 #if CG_HAS_XWAYLAND
-	wlr_xwayland_set_seat(xwayland, server.seat->seat);
+	wlr_xwayland_set_seat(server.xwayland, server.seat->seat);
 #endif
 
 	if(show_info) {
@@ -724,8 +721,8 @@ end:
 	if(server.running == true) {
 		server.running=false;
 #if CG_HAS_XWAYLAND
-		if(xwayland!=NULL) {
-			wlr_xwayland_destroy(xwayland);
+		if(server.xwayland!=NULL) {
+			wlr_xwayland_destroy(server.xwayland);
 		}
 #endif
 
diff --git a/seat.c b/seat.c
index a446314..e3d0067 100644
--- a/seat.c
+++ b/seat.c
@@ -1041,6 +1041,9 @@ seat_set_focus(struct cg_seat *seat, struct cg_view *view) {
 	}
 
 #if CG_HAS_XWAYLAND
+	if(view->type == CG_XWAYLAND_VIEW) {
+		wlr_xwayland_set_seat(server->xwayland, seat->seat);
+	}
 	if(view->type == CG_XWAYLAND_VIEW && !xwayland_view_should_manage(view)) {
 		const struct cg_xwayland_view *xwayland_view =
 		    xwayland_view_from_view(view);
diff --git a/server.h b/server.h
index a15048c..39d26f4 100644
--- a/server.h
+++ b/server.h
@@ -43,6 +43,7 @@ struct cg_server {
 	struct wl_listener new_xdg_shell_surface;
 #if CG_HAS_XWAYLAND
 	struct wl_listener new_xwayland_surface;
+	struct wlr_xwayland *xwayland;
 #endif
 
 	struct keybinding_list *keybindings;