mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-30 00:15:58 +01:00
Merge branch 'bug/xwayland-ready-listener' into refactor/wlr-drag-icon
This commit is contained in:
commit
390b526450
2 changed files with 4 additions and 2 deletions
|
@ -50,6 +50,7 @@ struct roots_desktop {
|
||||||
#ifdef HAS_XWAYLAND
|
#ifdef HAS_XWAYLAND
|
||||||
struct wlr_xwayland *xwayland;
|
struct wlr_xwayland *xwayland;
|
||||||
struct wl_listener xwayland_surface;
|
struct wl_listener xwayland_surface;
|
||||||
|
struct wl_listener xwayland_ready;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -59,8 +59,9 @@ int main(int argc, char **argv) {
|
||||||
ready(NULL, NULL);
|
ready(NULL, NULL);
|
||||||
#else
|
#else
|
||||||
if (server.desktop->xwayland != NULL) {
|
if (server.desktop->xwayland != NULL) {
|
||||||
struct wl_listener xwayland_ready = { .notify = ready };
|
wl_signal_add(&server.desktop->xwayland->events.ready,
|
||||||
wl_signal_add(&server.desktop->xwayland->events.ready, &xwayland_ready);
|
&server.desktop->xwayland_ready);
|
||||||
|
server.desktop->xwayland_ready.notify = ready;
|
||||||
} else {
|
} else {
|
||||||
ready(NULL, NULL);
|
ready(NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue