diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-06-27 13:21:00 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-27 13:21:00 +1000 |
commit | bf380813829b11d42ff0703630600e5bee06098b (patch) | |
tree | 0c0951e0ec5c36a6de14535903092b539bdbbf9b /sway/server.c | |
parent | xwayland: accept configure requests from floating views (diff) | |
parent | Merge pull request #2162 from martinetd/float_xdg_shell (diff) | |
download | sway-bf380813829b11d42ff0703630600e5bee06098b.tar.gz sway-bf380813829b11d42ff0703630600e5bee06098b.tar.zst sway-bf380813829b11d42ff0703630600e5bee06098b.zip |
Merge branch 'master' into xwayland-wants-float
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 878b530d..5b052494 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> |
@@ -24,9 +25,8 @@ | |||
24 | #include "sway/tree/layout.h" | 25 | #include "sway/tree/layout.h" |
25 | #include "sway/xwayland.h" | 26 | #include "sway/xwayland.h" |
26 | 27 | ||
27 | bool server_init(struct sway_server *server) { | 28 | bool server_privileged_prepare(struct sway_server *server) { |
28 | wlr_log(L_DEBUG, "Initializing Wayland server"); | 29 | wlr_log(L_DEBUG, "Preparing Wayland server initialization"); |
29 | |||
30 | server->wl_display = wl_display_create(); | 30 | server->wl_display = wl_display_create(); |
31 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); | 31 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); |
32 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); | 32 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); |
@@ -35,6 +35,12 @@ bool server_init(struct sway_server *server) { | |||
35 | wlr_log(L_ERROR, "Unable to create backend"); | 35 | wlr_log(L_ERROR, "Unable to create backend"); |
36 | return false; | 36 | return false; |
37 | } | 37 | } |
38 | return true; | ||
39 | } | ||
40 | |||
41 | bool server_init(struct sway_server *server) { | ||
42 | wlr_log(L_DEBUG, "Initializing Wayland server"); | ||
43 | |||
38 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); | 44 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); |
39 | assert(renderer); | 45 | assert(renderer); |
40 | 46 | ||
@@ -99,6 +105,7 @@ bool server_init(struct sway_server *server) { | |||
99 | deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); | 105 | deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); |
100 | 106 | ||
101 | wlr_linux_dmabuf_create(server->wl_display, renderer); | 107 | wlr_linux_dmabuf_create(server->wl_display, renderer); |
108 | wlr_export_dmabuf_manager_v1_create(server->wl_display); | ||
102 | 109 | ||
103 | server->socket = wl_display_add_socket_auto(server->wl_display); | 110 | server->socket = wl_display_add_socket_auto(server->wl_display); |
104 | if (!server->socket) { | 111 | if (!server->socket) { |