From 0a95a8ae625accaf0ef5e2372ef7f65a52658d9d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 23 Oct 2018 15:07:48 -0400 Subject: [PATCH] xwayland: Move command line fd initialization to InitOutput Again, as this is DDX state not screen state, run it from DDX setup not screen setup. Signed-off-by: Adam Jackson --- hw/xwayland/xwayland.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index 4b7e2b0d3..2b2274d09 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -984,15 +984,6 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv) else xwl_screen->root_clip_mode = ROOT_CLIP_FULL; - if (listen_fd_count > 0) { - if (wm_fd >= 0) { - TimerSet(NULL, 0, 1, add_client_fd, NULL); - AddCallback(&SelectionCallback, wm_selection_callback, NULL); - } else { - listen_on_fds(); - } - } - xorg_list_init(&xwl_screen->output_list); xorg_list_init(&xwl_screen->seat_list); xorg_list_init(&xwl_screen->damage_window_list); @@ -1161,4 +1152,13 @@ InitOutput(ScreenInfo * screen_info, int argc, char **argv) xorgGlxCreateVendor(); LocalAccessScopeUser(); + + if (listen_fd_count > 0) { + if (wm_fd >= 0) { + TimerSet(NULL, 0, 1, add_client_fd, NULL); + AddCallback(&SelectionCallback, wm_selection_callback, NULL); + } else { + listen_on_fds(); + } + } }