aboutsummaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2023-05-05 16:34:35 +0200
committerLibravatar Simon Ser <contact@emersion.fr>2023-07-24 11:28:31 +0200
commit6bd11ad0dfb11f8cf7e0ab5330cd2488851c5614 (patch)
treee19fefe24bfd0df60064702f7251e4d5175e2352 /sway/server.c
parentfix crash when resizing tiled scratchpad windows (diff)
downloadsway-6bd11ad0dfb11f8cf7e0ab5330cd2488851c5614.tar.gz
sway-6bd11ad0dfb11f8cf7e0ab5330cd2488851c5614.tar.zst
sway-6bd11ad0dfb11f8cf7e0ab5330cd2488851c5614.zip
Add support for cursor-shape-v1
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4106
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sway/server.c b/sway/server.c
index 3a11088a..50f0a702 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -11,6 +11,7 @@
11#include <wlr/render/wlr_renderer.h> 11#include <wlr/render/wlr_renderer.h>
12#include <wlr/types/wlr_compositor.h> 12#include <wlr/types/wlr_compositor.h>
13#include <wlr/types/wlr_content_type_v1.h> 13#include <wlr/types/wlr_content_type_v1.h>
14#include <wlr/types/wlr_cursor_shape_v1.h>
14#include <wlr/types/wlr_data_control_v1.h> 15#include <wlr/types/wlr_data_control_v1.h>
15#include <wlr/types/wlr_drm.h> 16#include <wlr/types/wlr_drm.h>
16#include <wlr/types/wlr_export_dmabuf_v1.h> 17#include <wlr/types/wlr_export_dmabuf_v1.h>
@@ -44,6 +45,7 @@
44#include "sway/input/input-manager.h" 45#include "sway/input/input-manager.h"
45#include "sway/output.h" 46#include "sway/output.h"
46#include "sway/server.h" 47#include "sway/server.h"
48#include "sway/input/cursor.h"
47#include "sway/tree/root.h" 49#include "sway/tree/root.h"
48 50
49#if HAVE_XWAYLAND 51#if HAVE_XWAYLAND
@@ -235,6 +237,11 @@ bool server_init(struct sway_server *server) {
235 wl_signal_add(&server->xdg_activation_v1->events.new_token, 237 wl_signal_add(&server->xdg_activation_v1->events.new_token,
236 &server->xdg_activation_v1_new_token); 238 &server->xdg_activation_v1_new_token);
237 239
240 struct wlr_cursor_shape_manager_v1 *cursor_shape_manager =
241 wlr_cursor_shape_manager_v1_create(server->wl_display, 1);
242 server->request_set_cursor_shape.notify = handle_request_set_cursor_shape;
243 wl_signal_add(&cursor_shape_manager->events.request_set_shape, &server->request_set_cursor_shape);
244
238 wl_list_init(&server->pending_launcher_ctxs); 245 wl_list_init(&server->pending_launcher_ctxs);
239 246
240 // Avoid using "wayland-0" as display socket 247 // Avoid using "wayland-0" as display socket