wayland: Move followup roundtrip out of registry::global

ColinKinloch · ColinKinloch · commit fa5be60e3ec8 · 2025-09-17T00:11:00.000+01:00
diff --git a/gfx/common/wayland_common.c b/gfx/common/wayland_common.c
@@ -755,6 +755,9 @@ bool gfx_ctx_wl_init_common(
 
    wl->registry = wl_display_get_registry(wl->input.dpy);
    wl_registry_add_listener(wl->registry, &registry_listener, wl);
+   /* first roundtrip to bind compositor globals */
+   wl_display_roundtrip(wl->input.dpy);
+   /* second roundtrip for listeners on bound globals (wl_output, wl_seat) */
    wl_display_roundtrip(wl->input.dpy);
 
    if (!wl->compositor)
diff --git a/input/common/wayland_common.c b/input/common/wayland_common.c
@@ -755,7 +755,6 @@ static void wl_registry_handle_global(void *data, struct wl_registry *reg,
             id, &wl_output_interface, MIN(version, 2));
       wl_output_add_listener(oi->output, &output_listener, oi);
       wl_list_insert(&wl->all_outputs, &od->link);
-      wl_display_roundtrip(wl->input.dpy);
    }
    else if (string_is_equal(interface, xdg_wm_base_interface.name) && found++)
       wl->xdg_shell = (struct xdg_wm_base*)

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,6 @@ static void wl_registry_handle_global(void data, struct wl_registry reg,`
`755`	`755`	`id, &wl_output_interface, MIN(version, 2));`
`756`	`756`	`wl_output_add_listener(oi->output, &output_listener, oi);`
`757`	`757`	`wl_list_insert(&wl->all_outputs, &od->link);`
`758`		`- wl_display_roundtrip(wl->input.dpy);`
`759`	`758`	`}`
`760`	`759`	`else if (string_is_equal(interface, xdg_wm_base_interface.name) && found++)`
`761`	`760`	`wl->xdg_shell = (struct xdg_wm_base*)`