From 2c9cb2af1bd67e5d656b4b1b6924ddd65dd3e830 Mon Sep 17 00:00:00 2001 From: Thanatos Date: Thu, 15 Jan 2026 18:05:18 -0700 Subject: [PATCH] Bumped to 0.9 for wlroots-0.20.0. Updated cursor image buffer handling for xwayland --- config.mk | 6 +++--- dwl.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config.mk b/config.mk index eb08a05..b1d782a 100644 --- a/config.mk +++ b/config.mk @@ -1,4 +1,4 @@ -_VERSION = 0.8-dev +_VERSION = 0.9-dev VERSION = `git describe --tags --dirty 2>/dev/null || echo $(_VERSION)` PKG_CONFIG = pkg-config @@ -8,8 +8,8 @@ PREFIX = /usr/local MANDIR = $(PREFIX)/share/man DATADIR = $(PREFIX)/share -WLR_INCS = `$(PKG_CONFIG) --cflags wlroots-0.19` -WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.19` +WLR_INCS = `$(PKG_CONFIG) --cflags wlroots-0.20` +WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.20` # Allow using an alternative wlroots installation # This has to have all the includes required by wlroots, e.g: diff --git a/dwl.c b/dwl.c index 320910d..8a9715d 100644 --- a/dwl.c +++ b/dwl.c @@ -69,6 +69,7 @@ #include #endif +#include "xdg-shell-protocol.h" #include "util.h" /* macros */ @@ -3178,9 +3179,7 @@ xwaylandready(struct wl_listener *listener, void *data) /* Set the default XWayland cursor to match the rest of dwl. */ if ((xcursor = wlr_xcursor_manager_get_xcursor(cursor_mgr, "default", 1))) - wlr_xwayland_set_cursor(xwayland, - xcursor->images[0]->buffer, xcursor->images[0]->width * 4, - xcursor->images[0]->width, xcursor->images[0]->height, + wlr_xwayland_set_cursor(xwayland, wlr_xcursor_image_get_buffer(xcursor->images[0]), xcursor->images[0]->hotspot_x, xcursor->images[0]->hotspot_y); } #endif