~ruther/dwl

49ca43451486c23776ada284023a2e8b7501913f — Thanatos 10 months ago babccfe
Bumped to 0.9 for wlroots-0.20.0. Updated cursor image buffer handling for xwayland
2 files changed, 5 insertions(+), 6 deletions(-)

M config.mk
M dwl.c
M config.mk => config.mk +3 -3
@@ 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:

M dwl.c => dwl.c +2 -3
@@ 69,6 69,7 @@
#include <xcb/xcb_icccm.h>
#endif

#include "xdg-shell-protocol.h"
#include "util.h"

/* macros */


@@ 3187,9 3188,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