Merge branch 'wlr_output_group' into 'master'

Draft: output: introduce wlr_output_group

See merge request wlroots/wlroots!4154

include/xwayland/xwm.h

@@ -164,7 +164,6 @@ struct wlr_xwm {
 	struct wl_listener drop_focus_destroy;
 };
 
-// xwm_create takes ownership of wm_fd and will close it under all circumstances.
 struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland, int wm_fd);
 
 void xwm_destroy(struct wlr_xwm *xwm);

xwayland/xwayland.c

@@ -42,9 +42,6 @@ static void handle_server_start(struct wl_listener *listener, void *data) {
 static void xwayland_mark_ready(struct wlr_xwayland *xwayland) {
 	assert(xwayland->server->wm_fd[0] >= 0);
 	xwayland->xwm = xwm_create(xwayland, xwayland->server->wm_fd[0]);
-	// xwm_create takes ownership of wm_fd[0] under all circumstances
-	xwayland->server->wm_fd[0] = -1;
-
 	if (!xwayland->xwm) {
 		return;
 	}

xwayland/xwm.c

@@ -2530,7 +2530,6 @@ void xwm_set_cursor(struct wlr_xwm *xwm, const uint8_t *pixels, uint32_t stride,
 struct wlr_xwm *xwm_create(struct wlr_xwayland *xwayland, int wm_fd) {
 	struct wlr_xwm *xwm = calloc(1, sizeof(*xwm));
 	if (xwm == NULL) {
-		close(wm_fd);
 		return NULL;
 	}
 
@@ -2545,13 +2544,11 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *xwayland, int wm_fd) {
 
 	xwm->ping_timeout = 10000;
 
-	// xcb_connect_to_fd takes ownership of the FD regardless of success/failure
 	xwm->xcb_conn = xcb_connect_to_fd(wm_fd, NULL);
 
 	int rc = xcb_connection_has_error(xwm->xcb_conn);
 	if (rc) {
 		wlr_log(WLR_ERROR, "xcb connect failed: %d", rc);
-		xcb_disconnect(xwm->xcb_conn);
 		free(xwm);
 		return NULL;
 	}