1 files changed, 66 insertions, 12 deletions

diff --git a/sway/server.c b/sway/server.c
index cc20e89d..4b48e8e5 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -8,24 +7,32 @@
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
 #include <wlr/config.h>
+#include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_content_type_v1.h>
 #include <wlr/types/wlr_cursor_shape_v1.h>
 #include <wlr/types/wlr_data_control_v1.h>
+#include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_drm.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
+#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_idle_notify_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_linux_dmabuf_v1.h>
+#include <wlr/types/wlr_output_management_v1.h>
+#include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
+#include <wlr/types/wlr_presentation_time.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_security_context_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_single_pixel_buffer_v1.h>
 #include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_tablet_v2.h>
@@ -49,7 +56,7 @@
 #include "sway/input/cursor.h"
 #include "sway/tree/root.h"
 
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 #include <wlr/xwayland/shell.h>
 #include "sway/xwayland.h"
 #endif
@@ -58,8 +65,9 @@
 #include <wlr/types/wlr_drm_lease_v1.h>
 #endif
 
-#define SWAY_XDG_SHELL_VERSION 2
+#define SWAY_XDG_SHELL_VERSION 5
 #define SWAY_LAYER_SHELL_VERSION 4
+#define SWAY_FOREIGN_TOPLEVEL_LIST_VERSION 1
 
 bool allow_unsupported_gpu = false;
 
@@ -93,6 +101,7 @@ static bool is_privileged(const struct wl_global *global) {
                 global == server.output_manager_v1->global ||
                 global == server.output_power_manager_v1->global ||
                 global == server.input_method->global ||
+                global == server.foreign_toplevel_list->global ||
                 global == server.foreign_toplevel_manager->global ||
                 global == server.data_control_manager_v1->global ||
                 global == server.screencopy_manager_v1->global ||
@@ -103,12 +112,13 @@ static bool is_privileged(const struct wl_global *global) {
                 global == server.session_lock.manager->global ||
                 global == server.input->keyboard_shortcuts_inhibit->global ||
                 global == server.input->virtual_keyboard->global ||
-                global == server.input->virtual_pointer->global;
+                global == server.input->virtual_pointer->global ||
+                global == server.input->transient_seat_manager->global;
 }
 
 static bool filter_global(const struct wl_client *client,
                 const struct wl_global *global, void *data) {
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
         if (xwayland && global == xwayland->shell_v1->global) {
                 return xwayland->server != NULL && client == xwayland->server->client;
@@ -163,6 +173,45 @@ static void detect_proprietary(struct wlr_backend *backend, void *data) {
         drmFreeVersion(version);
 }
 
+static void handle_renderer_lost(struct wl_listener *listener, void *data) {
+        struct sway_server *server = wl_container_of(listener, server, renderer_lost);
+
+        sway_log(SWAY_INFO, "Re-creating renderer after GPU reset");
+
+        struct wlr_renderer *renderer = wlr_renderer_autocreate(server->backend);
+        if (renderer == NULL) {
+                sway_log(SWAY_ERROR, "Unable to create renderer");
+                return;
+        }
+
+        struct wlr_allocator *allocator =
+                wlr_allocator_autocreate(server->backend, renderer);
+        if (allocator == NULL) {
+                sway_log(SWAY_ERROR, "Unable to create allocator");
+                wlr_renderer_destroy(renderer);
+                return;
+        }
+
+        struct wlr_renderer *old_renderer = server->renderer;
+        struct wlr_allocator *old_allocator = server->allocator;
+        server->renderer = renderer;
+        server->allocator = allocator;
+
+        wl_list_remove(&server->renderer_lost.link);
+        wl_signal_add(&server->renderer->events.lost, &server->renderer_lost);
+
+        wlr_compositor_set_renderer(server->compositor, renderer);
+
+        for (int i = 0; i < root->outputs->length; ++i) {
+                struct sway_output *output = root->outputs->items[i];
+                wlr_output_init_render(output->wlr_output,
+                        server->allocator, server->renderer);
+        }
+
+        wlr_allocator_destroy(old_allocator);
+        wlr_renderer_destroy(old_renderer);
+}
+
 bool server_init(struct sway_server *server) {
         sway_log(SWAY_DEBUG, "Initializing Wayland server");
         server->wl_display = wl_display_create();
@@ -186,15 +235,17 @@ bool server_init(struct sway_server *server) {
                 return false;
         }
 
+        server->renderer_lost.notify = handle_renderer_lost;
+        wl_signal_add(&server->renderer->events.lost, &server->renderer_lost);
+
         wlr_renderer_init_wl_shm(server->renderer, server->wl_display);
 
-        if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL) {
+        if (wlr_renderer_get_texture_formats(server->renderer, WLR_BUFFER_CAP_DMABUF) != NULL) {
                 server->linux_dmabuf_v1 = wlr_linux_dmabuf_v1_create_with_renderer(
                         server->wl_display, 4, server->renderer);
-        }
-        if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL &&
-                        debug.legacy_wl_drm) {
-                wlr_drm_create(server->wl_display, server->renderer);
+                if (debug.legacy_wl_drm) {
+                        wlr_drm_create(server->wl_display, server->renderer);
+                }
         }
 
         server->allocator = wlr_allocator_autocreate(server->backend,
@@ -289,6 +340,8 @@ bool server_init(struct sway_server *server) {
                 &server->output_power_manager_set_mode);
         server->input_method = wlr_input_method_manager_v2_create(server->wl_display);
         server->text_input = wlr_text_input_manager_v3_create(server->wl_display);
+        server->foreign_toplevel_list =
+                wlr_ext_foreign_toplevel_list_v1_create(server->wl_display, SWAY_FOREIGN_TOPLEVEL_LIST_VERSION);
         server->foreign_toplevel_manager =
                 wlr_foreign_toplevel_manager_v1_create(server->wl_display);
 
@@ -384,16 +437,17 @@ bool server_init(struct sway_server *server) {
 
 void server_fini(struct sway_server *server) {
         // TODO: free sway-specific resources
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         wlr_xwayland_destroy(server->xwayland.wlr_xwayland);
 #endif
         wl_display_destroy_clients(server->wl_display);
+        wlr_backend_destroy(server->backend);
         wl_display_destroy(server->wl_display);
         list_free(server->dirty_nodes);
 }
 
 bool server_start(struct sway_server *server) {
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         if (config->xwayland != XWAYLAND_MODE_DISABLED) {
                 sway_log(SWAY_DEBUG, "Initializing Xwayland (lazy=%d)",
                                 config->xwayland == XWAYLAND_MODE_LAZY);