diff options
| author | Brian Ashworth <[email protected]> | 2018-05-14 00:28:21 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-14 00:28:21 -0400 |
| commit | 34b864fb1752fde2528db6aa86d53c23412a8f43 (patch) | |
| tree | b387f1e1eb8f8fc16faeb4bf24a0ab6e8ba5787c /sway/server.c | |
| parent | 6ff7c5273659061ec4ff2f6c79c69af2d4d165a5 (diff) | |
| parent | 270c1ee7e507f1d2960920a7f4f0cc70f4e13d26 (diff) | |
Merge branch 'master' into fix-1975
Diffstat (limited to 'sway/server.c')
| -rw-r--r-- | sway/server.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sway/server.c b/sway/server.c index 8c41ee87..6147a39d 100644 --- a/sway/server.c +++ b/sway/server.c @@ -16,6 +16,7 @@ #include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xdg_output.h> #include <wlr/types/wlr_wl_shell.h> +#include <wlr/types/wlr_idle.h> #include <wlr/util/log.h> // TODO WLR: make Xwayland optional #include <wlr/xwayland.h> @@ -61,6 +62,7 @@ bool server_init(struct sway_server *server) { server->data_device_manager = wlr_data_device_manager_create(server->wl_display); + server->idle = wlr_idle_create(server->wl_display); wlr_screenshooter_create(server->wl_display); wlr_gamma_control_manager_create(server->wl_display); wlr_primary_selection_device_manager_create(server->wl_display); @@ -81,6 +83,11 @@ bool server_init(struct sway_server *server) { &server->xdg_shell_v6_surface); server->xdg_shell_v6_surface.notify = handle_xdg_shell_v6_surface; + server->xdg_shell = wlr_xdg_shell_create(server->wl_display); + wl_signal_add(&server->xdg_shell->events.new_surface, + &server->xdg_shell_surface); + server->xdg_shell_surface.notify = handle_xdg_shell_surface; + server->wl_shell = wlr_wl_shell_create(server->wl_display); wl_signal_add(&server->wl_shell->events.new_surface, &server->wl_shell_surface); @@ -88,7 +95,7 @@ bool server_init(struct sway_server *server) { // TODO make xwayland optional server->xwayland = - wlr_xwayland_create(server->wl_display, server->compositor, false); + wlr_xwayland_create(server->wl_display, server->compositor, true); wl_signal_add(&server->xwayland->events.new_surface, &server->xwayland_surface); server->xwayland_surface.notify = handle_xwayland_surface; |