mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-06-13 14:32:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'spawn-func' into 'master'

Browse source 
Draft: xwayland: Introduce xwayland_spawn_func_t

See merge request wlroots/wlroots!5011
This commit is contained in:
Kenny Levinsen 2025-04-21 08:00:33 +00:00
commit 08ff543344
4 changed files with 68 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

3
xwayland/xwayland.c
View file

@ -136,7 +136,7 @@ struct wlr_xwayland *wlr_xwayland_create_with_server(struct wl_display *wl_displ
}
struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display,
struct wlr_compositor *compositor, bool lazy) {
struct wlr_compositor *compositor, bool lazy, xwayland_spawn_func_t spawn_func) {
struct wlr_xwayland_shell_v1 *shell_v1 = wlr_xwayland_shell_v1_create(wl_display, 1);
if (shell_v1 == NULL) {
return NULL;
@ -145,6 +145,7 @@ struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display,
struct wlr_xwayland_server_options options = {
.lazy = lazy,
.enable_wm = true,
.spawn_handler = spawn_func,
#if HAVE_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE
.terminate_delay = lazy ? 10 : 0,
#endif