diff options
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sway/server.c b/sway/server.c index a13f2c3a..86d4a643 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <wlr/types/wlr_idle.h> | 11 | #include <wlr/types/wlr_idle.h> |
12 | #include <wlr/types/wlr_layer_shell.h> | 12 | #include <wlr/types/wlr_layer_shell.h> |
13 | #include <wlr/types/wlr_linux_dmabuf.h> | 13 | #include <wlr/types/wlr_linux_dmabuf.h> |
14 | #include <wlr/types/wlr_export_dmabuf_v1.h> | ||
14 | #include <wlr/types/wlr_primary_selection.h> | 15 | #include <wlr/types/wlr_primary_selection.h> |
15 | #include <wlr/types/wlr_screenshooter.h> | 16 | #include <wlr/types/wlr_screenshooter.h> |
16 | #include <wlr/types/wlr_server_decoration.h> | 17 | #include <wlr/types/wlr_server_decoration.h> |
@@ -26,9 +27,8 @@ | |||
26 | #include "sway/tree/layout.h" | 27 | #include "sway/tree/layout.h" |
27 | 28 | ||
28 | 29 | ||
29 | bool server_init(struct sway_server *server) { | 30 | bool server_privileged_prepare(struct sway_server *server) { |
30 | wlr_log(L_DEBUG, "Initializing Wayland server"); | 31 | wlr_log(L_DEBUG, "Preparing Wayland server initialization"); |
31 | |||
32 | server->wl_display = wl_display_create(); | 32 | server->wl_display = wl_display_create(); |
33 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); | 33 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); |
34 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); | 34 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); |
@@ -37,6 +37,12 @@ bool server_init(struct sway_server *server) { | |||
37 | wlr_log(L_ERROR, "Unable to create backend"); | 37 | wlr_log(L_ERROR, "Unable to create backend"); |
38 | return false; | 38 | return false; |
39 | } | 39 | } |
40 | return true; | ||
41 | } | ||
42 | |||
43 | bool server_init(struct sway_server *server) { | ||
44 | wlr_log(L_DEBUG, "Initializing Wayland server"); | ||
45 | |||
40 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); | 46 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); |
41 | assert(renderer); | 47 | assert(renderer); |
42 | 48 | ||
@@ -98,6 +104,7 @@ bool server_init(struct sway_server *server) { | |||
98 | deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); | 104 | deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); |
99 | 105 | ||
100 | wlr_linux_dmabuf_create(server->wl_display, renderer); | 106 | wlr_linux_dmabuf_create(server->wl_display, renderer); |
107 | wlr_export_dmabuf_manager_v1_create(server->wl_display); | ||
101 | 108 | ||
102 | server->socket = wl_display_add_socket_auto(server->wl_display); | 109 | server->socket = wl_display_add_socket_auto(server->wl_display); |
103 | if (!server->socket) { | 110 | if (!server->socket) { |