diff options
| author | emersion <contact@emersion.fr> | 2018-01-28 21:22:50 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-01-28 21:22:50 +0100 |
| commit | 1ee61dbd0f6ab8cf9dfafb085707bd67cca50e70 (patch) | |
| tree | 502ff5ebd47df13e8bb432d379cab44532c54deb /rootston/desktop.c | |
| parent | 692d33bf8b752cc3b8a0b7f2b29c2b49dd4f718b (diff) | |
| parent | f0b3a71fbc72eeccf44bc6a6f6c39a80af918463 (diff) | |
Merge remote-tracking branch 'upstream/master' into output-damage
Diffstat (limited to 'rootston/desktop.c')
| -rw-r--r-- | rootston/desktop.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 9abcfa33..5fd4a5cc 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -628,6 +628,24 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->server = server; desktop->config = config; + desktop->layout = wlr_output_layout_create(); + desktop->layout_change.notify = handle_layout_change; + wl_signal_add(&desktop->layout->events.change, &desktop->layout_change); + + desktop->compositor = wlr_compositor_create(server->wl_display, + server->renderer); + + desktop->xdg_shell_v6 = wlr_xdg_shell_v6_create(server->wl_display); + wl_signal_add(&desktop->xdg_shell_v6->events.new_surface, + &desktop->xdg_shell_v6_surface); + desktop->xdg_shell_v6_surface.notify = handle_xdg_shell_v6_surface; + + desktop->wl_shell = wlr_wl_shell_create(server->wl_display); + wl_signal_add(&desktop->wl_shell->events.new_surface, + &desktop->wl_shell_surface); + desktop->wl_shell_surface.notify = handle_wl_shell_surface; + +#ifdef WLR_HAS_XWAYLAND const char *cursor_theme = NULL; const char *cursor_default = ROOTS_XCURSOR_DEFAULT; struct roots_cursor_config *cc = @@ -648,24 +666,6 @@ struct roots_desktop *desktop_create(struct roots_server *server, return NULL; } - desktop->layout = wlr_output_layout_create(); - desktop->layout_change.notify = handle_layout_change; - wl_signal_add(&desktop->layout->events.change, &desktop->layout_change); - - desktop->compositor = wlr_compositor_create(server->wl_display, - server->renderer); - - desktop->xdg_shell_v6 = wlr_xdg_shell_v6_create(server->wl_display); - wl_signal_add(&desktop->xdg_shell_v6->events.new_surface, - &desktop->xdg_shell_v6_surface); - desktop->xdg_shell_v6_surface.notify = handle_xdg_shell_v6_surface; - - desktop->wl_shell = wlr_wl_shell_create(server->wl_display); - wl_signal_add(&desktop->wl_shell->events.new_surface, - &desktop->wl_shell_surface); - desktop->wl_shell_surface.notify = handle_wl_shell_surface; - -#ifdef WLR_HAS_XWAYLAND if (config->xwayland) { desktop->xwayland = wlr_xwayland_create(server->wl_display, desktop->compositor); |