diff --git a/config.mk b/config.mk index ab5a3fd..fbeb7a5 100644 --- a/config.mk +++ b/config.mk @@ -8,21 +8,21 @@ PREFIX = /usr/local MANDIR = $(PREFIX)/share/man DATADIR = $(PREFIX)/share -WLR_INCS = `$(PKG_CONFIG) --cflags wlroots-0.20` -WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.20` +WLR_INCS = `$(PKG_CONFIG) --cflags wlroots-0.21` +WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.21` # Allow using an alternative wlroots installation # This has to have all the includes required by wlroots, e.g: # Assuming wlroots git repo is "${PWD}/wlroots" and you only ran "meson setup build && ninja -C build" -#WLR_INCS = -I/usr/include/pixman-1 -I/usr/include/elogind -I/usr/include/libdrm \ -# -I$(PWD)/wlroots/include +# WLR_INCS = -I/usr/include/pixman-1 -I/usr/include/elogind -I/usr/include/libdrm \ +# -I$(PWD)/wlroots/include # Set -rpath to avoid using the wrong library. -#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/build -L$(PWD)/wlroots/build -lwlroots-0.20 +# WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/build -L$(PWD)/wlroots/build -lwlroots-0.21 -# Assuming you ran "meson setup --prefix ${PWD}/0.20 build && ninja -C build install" +# Assuming you ran "meson setup --prefix ${PWD}/0.21 build && ninja -C build install" #WLR_INCS = -I/usr/include/pixman-1 -I/usr/include/elogind -I/usr/include/libdrm \ -# -I$(PWD)/wlroots/0.20/include/wlroots-0.20 -#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.20/lib64 -L$(PWD)/wlroots/0.20/lib64 -lwlroots-0.20 +# -I$(PWD)/wlroots/0.21/include/wlroots-0.21 +#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.21/lib64 -L$(PWD)/wlroots/0.21/lib64 -lwlroots-0.21 XWAYLAND = XLIBS = diff --git a/dwl.c b/dwl.c index ca97c30..e796d05 100644 --- a/dwl.c +++ b/dwl.c @@ -746,7 +746,7 @@ buttonpress(struct wl_listener *listener, void *data) void capturerequest(struct wl_listener *listener, void *data) { - struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request *request = data; + struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_event *request = data; Client *view = request->toplevel_handle->data; if (!view->image_capture_source) { @@ -2756,14 +2756,14 @@ setup(void) foreign_toplevel_list = wlr_ext_foreign_toplevel_list_v1_create(dpy,1); ext_foreign_toplevel_image_capture_source_manager_v1 = wlr_ext_foreign_toplevel_image_capture_source_manager_v1_create(dpy, 1); - wl_signal_add(&ext_foreign_toplevel_image_capture_source_manager_v1->events.new_request, + wl_signal_add(&ext_foreign_toplevel_image_capture_source_manager_v1->events.capture_request, &new_foreign_toplevel_capture_request); /* Use decoration protocols to negotiate server-side decorations */ wlr_server_decoration_manager_set_default_mode( wlr_server_decoration_manager_create(dpy), WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); - xdg_decoration_mgr = wlr_xdg_decoration_manager_v1_create(dpy); + xdg_decoration_mgr = wlr_xdg_decoration_manager_v1_create(dpy, 2); wl_signal_add(&xdg_decoration_mgr->events.new_toplevel_decoration, &new_xdg_decoration); pointer_constraints = wlr_pointer_constraints_v1_create(dpy);