1 files changed, 84 insertions, 19 deletions

diff --git a/sway/server.c b/sway/server.c
index f51fcfe2..627d80d6 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -7,24 +7,32 @@
 #include <wlr/backend.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
-#include <wlr/backend/noop.h>
 #include <wlr/backend/session.h>
+#include <wlr/config.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_control_v1.h>
+#include <wlr/types/wlr_drm_lease_v1.h>
+#include <wlr/types/wlr_drm.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
 #include <wlr/types/wlr_screencopy_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_viewporter.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include <wlr/types/wlr_xdg_activation_v1.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
+#include <wlr/types/wlr_xdg_foreign_registry.h>
+#include <wlr/types/wlr_xdg_foreign_v1.h>
+#include <wlr/types/wlr_xdg_foreign_v2.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
 #include "config.h"
 #include "list.h"
@@ -52,19 +60,52 @@ bool server_privileged_prepare(struct sway_server *server) {
         return true;
 }
 
+static void handle_drm_lease_request(struct wl_listener *listener, void *data) {
+        /* We only offer non-desktop outputs, but in the future we might want to do
+         * more logic here. */
+
+        struct wlr_drm_lease_request_v1 *req = data;
+        struct wlr_drm_lease_v1 *lease = wlr_drm_lease_request_v1_grant(req);
+        if (!lease) {
+                sway_log(SWAY_ERROR, "Failed to grant lease request");
+                wlr_drm_lease_request_v1_reject(req);
+        }
+}
+
+#define SWAY_XDG_SHELL_VERSION  2
+
 bool server_init(struct sway_server *server) {
         sway_log(SWAY_DEBUG, "Initializing Wayland server");
 
-        struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend);
-        assert(renderer);
+        server->renderer = wlr_renderer_autocreate(server->backend);
+        if (!server->renderer) {
+                sway_log(SWAY_ERROR, "Failed to create renderer");
+                return false;
+        }
 
-        wlr_renderer_init_wl_display(renderer, server->wl_display);
+        wlr_renderer_init_wl_shm(server->renderer, server->wl_display);
 
-        server->compositor = wlr_compositor_create(server->wl_display, renderer);
+        if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL) {
+                wlr_drm_create(server->wl_display, server->renderer);
+                server->linux_dmabuf_v1 =
+                        wlr_linux_dmabuf_v1_create(server->wl_display, server->renderer);
+        }
+
+        server->allocator = wlr_allocator_autocreate(server->backend,
+                server->renderer);
+        if (!server->allocator) {
+                sway_log(SWAY_ERROR, "Failed to create allocator");
+                return false;
+        }
+
+        server->compositor = wlr_compositor_create(server->wl_display,
+                server->renderer);
         server->compositor_new_surface.notify = handle_compositor_new_surface;
         wl_signal_add(&server->compositor->events.new_surface,
                 &server->compositor_new_surface);
 
+        wlr_subcompositor_create(server->wl_display);
+
         server->data_device_manager =
                 wlr_data_device_manager_create(server->wl_display);
 
@@ -87,7 +128,8 @@ bool server_init(struct sway_server *server) {
                 &server->layer_shell_surface);
         server->layer_shell_surface.notify = handle_layer_shell_surface;
 
-        server->xdg_shell = wlr_xdg_shell_create(server->wl_display);
+        server->xdg_shell = wlr_xdg_shell_create(server->wl_display,
+                SWAY_XDG_SHELL_VERSION);
         wl_signal_add(&server->xdg_shell->events.new_surface,
                 &server->xdg_shell_surface);
         server->xdg_shell_surface.notify = handle_xdg_shell_surface;
@@ -144,16 +186,40 @@ bool server_init(struct sway_server *server) {
         server->foreign_toplevel_manager =
                 wlr_foreign_toplevel_manager_v1_create(server->wl_display);
 
+        sway_session_lock_init();
+
+        server->drm_lease_manager=
+                wlr_drm_lease_v1_manager_create(server->wl_display, server->backend);
+        if (server->drm_lease_manager) {
+                server->drm_lease_request.notify = handle_drm_lease_request;
+                wl_signal_add(&server->drm_lease_manager->events.request,
+                                &server->drm_lease_request);
+        } else {
+                sway_log(SWAY_DEBUG, "Failed to create wlr_drm_lease_device_v1");
+                sway_log(SWAY_INFO, "VR will not be available");
+        }
+
         wlr_export_dmabuf_manager_v1_create(server->wl_display);
         wlr_screencopy_manager_v1_create(server->wl_display);
         wlr_data_control_manager_v1_create(server->wl_display);
         wlr_primary_selection_v1_device_manager_create(server->wl_display);
         wlr_viewporter_create(server->wl_display);
 
+        struct wlr_xdg_foreign_registry *foreign_registry =
+                wlr_xdg_foreign_registry_create(server->wl_display);
+        wlr_xdg_foreign_v1_create(server->wl_display, foreign_registry);
+        wlr_xdg_foreign_v2_create(server->wl_display, foreign_registry);
+
+        server->xdg_activation_v1 = wlr_xdg_activation_v1_create(server->wl_display);
+        server->xdg_activation_v1_request_activate.notify =
+                xdg_activation_v1_handle_request_activate;
+        wl_signal_add(&server->xdg_activation_v1->events.request_activate,
+                &server->xdg_activation_v1_request_activate);
+
         // Avoid using "wayland-0" as display socket
         char name_candidate[16];
-        for (int i = 1; i <= 32; ++i) {
-                sprintf(name_candidate, "wayland-%d", i);
+        for (unsigned int i = 1; i <= 32; ++i) {
+                snprintf(name_candidate, sizeof(name_candidate), "wayland-%u", i);
                 if (wl_display_add_socket(server->wl_display, name_candidate) >= 0) {
                         server->socket = strdup(name_candidate);
                         break;
@@ -166,27 +232,26 @@ bool server_init(struct sway_server *server) {
                 return false;
         }
 
-        server->noop_backend = wlr_noop_backend_create(server->wl_display);
-
-        struct wlr_output *wlr_output = wlr_noop_add_output(server->noop_backend);
-        root->noop_output = output_create(wlr_output);
-
-        server->headless_backend =
-                wlr_headless_backend_create_with_renderer(server->wl_display, renderer);
+        server->headless_backend = wlr_headless_backend_create(server->wl_display);
         if (!server->headless_backend) {
-                sway_log(SWAY_INFO, "Failed to create secondary headless backend, "
-                        "starting without it");
+                sway_log(SWAY_ERROR, "Failed to create secondary headless backend");
+                wlr_backend_destroy(server->backend);
+                return false;
         } else {
                 wlr_multi_backend_add(server->backend, server->headless_backend);
         }
 
+        struct wlr_output *wlr_output =
+                        wlr_headless_add_output(server->headless_backend, 800, 600);
+        wlr_output_set_name(wlr_output, "FALLBACK");
+        root->fallback_output = output_create(wlr_output);
+
         // This may have been set already via -Dtxn-timeout
         if (!server->txn_timeout_ms) {
                 server->txn_timeout_ms = 200;
         }
 
         server->dirty_nodes = create_list();
-        server->transactions = create_list();
 
         server->input = input_manager_create(server);
         input_manager_get_default_seat(); // create seat0
@@ -202,7 +267,6 @@ void server_fini(struct sway_server *server) {
         wl_display_destroy_clients(server->wl_display);
         wl_display_destroy(server->wl_display);
         list_free(server->dirty_nodes);
-        list_free(server->transactions);
 }
 
 bool server_start(struct sway_server *server) {
@@ -238,6 +302,7 @@ bool server_start(struct sway_server *server) {
                 wlr_backend_destroy(server->backend);
                 return false;
         }
+
         return true;
 }