Fix crash disabling monitor with locked surface

(cherry picked from commit d1880b4422)

.mailmap

@@ -1,3 +1 @@
 Lennart Jablonka <humm@ljabl.com> <hummsmith42@gmail.com>
-Leonardo Hernández Hernández <leohdz172@proton.me> <leohdz172@outlook.com>
-Leonardo Hernández Hernández <leohdz172@proton.me> <leohdz172@protonmail.com>

CHANGELOG.md

@@ -8,15 +8,6 @@
 
 ## Unreleased
 ### Added
-
-* Support for the linux-drm-syncobj-v1 protocol ([wlroots!4715][wlroots!4715], [#685][685])
-* Allow the use of non-system wlroots library ([#646][646])
-
-[wlroots!4715]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4715
-[685]: https://codeberg.org/dwl/dwl/pulls/685
-[646]: https://codeberg.org/dwl/dwl/pulls/646
-
-
 ### Changed
 ### Deprecated
 ### Removed
@@ -30,7 +21,7 @@
 
 ## 0.7
 
-This version is just 0.6 with wlroots 0.18 compatibility.
+See also [0.6](#0.6) release notes. 0.7 builds against wlroots 0.18.x.
 
 ### Added
 
@@ -41,9 +32,15 @@ This version is just 0.6 with wlroots 0.18 compatibility.
 [601]: https://codeberg.org/dwl/dwl/issues/601
 
 
+### Fixed
+
+* Crash when re-mapping unmapped clients.
+
+
 ### Contributors
 
 Guido Cella
+Lennart Jablonka
 
 
 ## 0.6

Makefile

@@ -6,21 +6,20 @@ include config.mk
 # flags for compiling
 DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L \
 	-DVERSION=\"$(VERSION)\" $(XWAYLAND)
-DWLDEVCFLAGS = -g -Wpedantic -Wall -Wextra -Wdeclaration-after-statement \
+DWLDEVCFLAGS = -g -pedantic -Wall -Wextra -Wdeclaration-after-statement \
 	-Wno-unused-parameter -Wshadow -Wunused-macros -Werror=strict-prototypes \
 	-Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types \
 	-Wfloat-conversion
 
 # CFLAGS / LDFLAGS
-PKGS      = wayland-server xkbcommon libinput $(XLIBS)
+PKGS      = wlroots-0.18 wayland-server xkbcommon libinput $(XLIBS)
-DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
+DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
-LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS)
+LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` -lm $(LIBS)
 
 all: dwl
 dwl: dwl.o util.o
 	$(CC) dwl.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
 dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \
-	ext-image-copy-capture-v1-protocol.h \
 	pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h \
 	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
 util.o: util.c util.h
@@ -34,9 +33,6 @@ WAYLAND_PROTOCOLS = `$(PKG_CONFIG) --variable=pkgdatadir wayland-protocols`
 cursor-shape-v1-protocol.h:
 	$(WAYLAND_SCANNER) enum-header \
 		$(WAYLAND_PROTOCOLS)/staging/cursor-shape/cursor-shape-v1.xml $@
-ext-image-copy-capture-v1-protocol.h:
-	$(WAYLAND_SCANNER) enum-header \
-		$(WAYLAND_PROTOCOLS)/staging/ext-image-copy-capture/ext-image-copy-capture-v1.xml $@
 pointer-constraints-unstable-v1-protocol.h:
 	$(WAYLAND_SCANNER) enum-header \
 		$(WAYLAND_PROTOCOLS)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml $@

README.md

@@ -1,7 +1,7 @@
 # dwl - dwm for Wayland
 
 Join us on our IRC channel: [#dwl on Libera Chat]  
-Or on the community-maintained [Discord server].
+Or on our [Discord server].
 
 dwl is a compact, hackable compositor for [Wayland] based on [wlroots]. It is
 intended to fill the same space in the Wayland world that dwm does in X11,
@@ -14,12 +14,13 @@ philosophy. Like dwm, dwl is:
 
 ## Getting Started:
 
+### **dwl branch 0.7 and releases based upon 0.7 build against [wlroots] 0.18**
+
 ### Latest semi-stable [release]
-This is probably where you want to start. This builds against the [wlroots]
+This is probably where you want to start. This builds against the dependent
-versions currently shipping in major distributions. If your
+packages' versions currently shipping in major distributions. If your
-distribution's `wlroots` version is older, use an earlier dwl [release].
+distribution's wlroots version is older, use an earlier dwl [release] or [0.x
-The `wlroots` version against which a given `dwl` release builds is specified
+branch].
-with each release on the [release] page
 
 ### Development branch [main]
 Active development progresses on the `main` branch. The `main` branch is built
@@ -75,7 +76,7 @@ seatd daemon.
 When dwl is run with no arguments, it will launch the server and begin handling
 any shortcuts configured in `config.h`. There is no status bar or other
 decoration initially; these are instead clients that can be run within the
-Wayland session. Do note that the default background color is grey. This can be
+Wayland session. Do note that the default background color is black. This can be
 modified in `config.h`.
 
 If you would like to run a script or command automatically at startup, you can
@@ -103,7 +104,7 @@ automatically, you will need to configure it prior to launching `dwl`, e.g.:
 
 Information about selected layouts, current window title, app-id, and
 selected/occupied/urgent tags is written to the stdin of the `-s` command (see
-the `STATUS INFORMATION` section in `_dwl_(1)`).  This information can be used to
+the `printstatus()` function for details).  This information can be used to
 populate an external status bar with a script that parses the
 information. Failing to read this information will cause dwl to block, so if you
 do want to run a startup command that does not consume the status information,
@@ -182,7 +183,6 @@ inspiration, and to the various contributors to the project, including:
 - Stivvo for output management and fullscreen support, and patch maintenance
 
 
-[wlroots]: https://gitlab.freedesktop.org/wlroots
 [`systemd --user`]: https://wiki.archlinux.org/title/Systemd/User
 [#dwl on Libera Chat]: https://web.libera.chat/?channels=#dwl
 [0.7-rc1]: https://codeberg.org/dwl/dwl/releases/tag/v0.7-rc1

client.h

@@ -126,14 +126,15 @@ client_get_appid(Client *c)
 {
 #ifdef XWAYLAND
 	if (client_is_x11(c))
-		return c->surface.xwayland->class ? c->surface.xwayland->class : "broken";
+		return c->surface.xwayland->class;
 #endif
-	return c->surface.xdg->toplevel->app_id ? c->surface.xdg->toplevel->app_id : "broken";
+	return c->surface.xdg->toplevel->app_id;
 }
 
 static inline void
 client_get_clip(Client *c, struct wlr_box *clip)
 {
+	struct wlr_box xdg_geom = {0};
 	*clip = (struct wlr_box){
 		.x = 0,
 		.y = 0,
@@ -146,8 +147,9 @@ client_get_clip(Client *c, struct wlr_box *clip)
 		return;
 #endif
 
-	clip->x = c->surface.xdg->geometry.x;
+	wlr_xdg_surface_get_geometry(c->surface.xdg, &xdg_geom);
-	clip->y = c->surface.xdg->geometry.y;
+	clip->x = xdg_geom.x;
+	clip->y = xdg_geom.y;
 }
 
 static inline void
@@ -162,7 +164,7 @@ client_get_geometry(Client *c, struct wlr_box *geom)
 		return;
 	}
 #endif
-	*geom = c->surface.xdg->geometry;
+	wlr_xdg_surface_get_geometry(c->surface.xdg, geom);
 }
 
 static inline Client *
@@ -198,9 +200,9 @@ client_get_title(Client *c)
 {
 #ifdef XWAYLAND
 	if (client_is_x11(c))
-		return c->surface.xwayland->title ? c->surface.xwayland->title : "broken";
+		return c->surface.xwayland->title;
 #endif
-	return c->surface.xdg->toplevel->title ? c->surface.xdg->toplevel->title : "broken";
+	return c->surface.xdg->toplevel->title;
 }
 
 static inline int
@@ -213,15 +215,16 @@ client_is_float_type(Client *c)
 	if (client_is_x11(c)) {
 		struct wlr_xwayland_surface *surface = c->surface.xwayland;
 		xcb_size_hints_t *size_hints = surface->size_hints;
+		size_t i;
 		if (surface->modal)
 			return 1;
 
-		if (wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_DIALOG)
+		for (i = 0; i < surface->window_type_len; i++)
-				|| wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_SPLASH)
+			if (surface->window_type[i] == netatom[NetWMWindowTypeDialog]
-				|| wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_TOOLBAR)
+					|| surface->window_type[i] == netatom[NetWMWindowTypeSplash]
-				|| wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_UTILITY)) {
+					|| surface->window_type[i] == netatom[NetWMWindowTypeToolbar]
+					|| surface->window_type[i] == netatom[NetWMWindowTypeUtility])
 				return 1;
-		}
 
 		return size_hints && size_hints->min_width > 0 && size_hints->min_height > 0
 			&& (size_hints->max_width == size_hints->min_width
@@ -264,8 +267,8 @@ client_is_stopped(Client *c)
 
 	wl_client_get_credentials(c->surface.xdg->client->client, &pid, NULL, NULL);
 	if (waitid(P_PID, pid, &in, WNOHANG|WCONTINUED|WSTOPPED|WNOWAIT) < 0) {
-		/* This process is not our child process, while is very unlikely that
+		/* This process is not our child process, while is very unluckely that
-		 * it is stopped, in order to do not skip frames, assume that it is. */
+		 * it is stopped, in order to do not skip frames assume that it is. */
 		if (errno == ECHILD)
 			return 1;
 	} else if (in.si_pid) {
@@ -298,6 +301,17 @@ client_notify_enter(struct wlr_surface *s, struct wlr_keyboard *kb)
 		wlr_seat_keyboard_notify_enter(seat, s, NULL, 0, NULL);
 }
 
+static inline void
+client_restack_surface(Client *c)
+{
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		wlr_xwayland_surface_restack(c->surface.xwayland, NULL,
+				XCB_STACK_MODE_ABOVE);
+#endif
+	return;
+}
+
 static inline void
 client_send_close(Client *c)
 {
@@ -330,13 +344,6 @@ client_set_fullscreen(Client *c, int fullscreen)
 	wlr_xdg_toplevel_set_fullscreen(c->surface.xdg->toplevel, fullscreen);
 }
 
-static inline void
-client_set_scale(struct wlr_surface *s, float scale)
-{
-	wlr_fractional_scale_v1_notify_scale(s, scale);
-	wlr_surface_set_preferred_buffer_scale(s, (int32_t)ceilf(scale));
-}
-
 static inline uint32_t
 client_set_size(Client *c, uint32_t width, uint32_t height)
 {
@@ -357,11 +364,8 @@ static inline void
 client_set_tiled(Client *c, uint32_t edges)
 {
 #ifdef XWAYLAND
-	if (client_is_x11(c)) {
+	if (client_is_x11(c))
-		wlr_xwayland_surface_set_maximized(c->surface.xwayland,
-				edges != WLR_EDGE_NONE, edges != WLR_EDGE_NONE);
 		return;
-  }
 #endif
 	if (wl_resource_get_version(c->surface.xdg->toplevel->resource)
 			>= XDG_TOPLEVEL_STATE_TILED_RIGHT_SINCE_VERSION) {
@@ -387,8 +391,8 @@ client_wants_focus(Client *c)
 {
 #ifdef XWAYLAND
 	return client_is_unmanaged(c)
-		&& wlr_xwayland_surface_override_redirect_wants_focus(c->surface.xwayland)
+		&& wlr_xwayland_or_surface_wants_focus(c->surface.xwayland)
-		&& wlr_xwayland_surface_icccm_input_model(c->surface.xwayland) != WLR_ICCCM_INPUT_MODEL_NONE;
+		&& wlr_xwayland_icccm_input_model(c->surface.xwayland) != WLR_ICCCM_INPUT_MODEL_NONE;
 #endif
 	return 0;
 }

config.def.h

@@ -12,7 +12,7 @@ static const float bordercolor[]           = COLOR(0x444444ff);
 static const float focuscolor[]            = COLOR(0x005577ff);
 static const float urgentcolor[]           = COLOR(0xff0000ff);
 /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
-static const float fullscreen_bg[]         = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */
+static const float fullscreen_bg[]         = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
 
 /* tagging - TAGCOUNT must be no greater than 31 */
 #define TAGCOUNT (9)

config.mk

@@ -1,4 +1,4 @@
-_VERSION = 0.8-dev
+_VERSION = 0.7
 VERSION  = `git describe --tags --dirty 2>/dev/null || echo $(_VERSION)`
 
 PKG_CONFIG = pkg-config
@@ -8,29 +8,10 @@ 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`
-
-# 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
-# Set -rpath to avoid using the wrong library.
-#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/build -L$(PWD)/wlroots/build -lwlroots-0.19
-
-# Assuming you ran "meson setup --prefix ${PWD}/0.19 build && ninja -C build install"
-#WLR_INCS = -I/usr/include/pixman-1 -I/usr/include/elogind -I/usr/include/libdrm \
-#	-I$(PWD)/wlroots/0.19/include/wlroots-0.19
-#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.19/lib64 -L$(PWD)/wlroots/0.19/lib64 -lwlroots-0.19
-
 XWAYLAND =
 XLIBS =
 # Uncomment to build XWayland support
 #XWAYLAND = -DXWAYLAND
 #XLIBS = xcb xcb-icccm
 
-# dwl itself only uses C99 features, but wlroots' headers use anonymous unions (C11).
+CC = gcc
-# To avoid warnings about them, we do not use -std=c99 and instead of using the
-# gmake default 'CC=c99', we use cc.
-CC = cc

dwl.1

@@ -37,7 +37,7 @@ starts a shell process running
 when starting.
 When stopping, it sends
 .Dv SIGTERM
-to the child process group and waits for it to exit.
+to the child process and waits for it to exit.
 .Pp
 Users are encouraged to customize
 .Nm
@@ -55,10 +55,10 @@ Move window to a single tag.
 Toggle tag for window.
 .It Mod-p
 Spawn
-.Xr wmenu-run 1 .
+.Nm wmenu-run .
 .It Mod-Shift-Return
 Spawn
-.Xr foot 1 .
+.Nm foot .
 .It Mod-[jk]
 Move focus down/up the stack.
 .It Mod-[id]
@@ -100,114 +100,6 @@ Quit
 .Nm .
 .El
 These might differ depending on your keyboard layout.
-.Ss Mouse commands
-.Bl -tag -width 20n -offset indent -compact
-.It Mod-Button1
-Move focused window while dragging.
-Tiled windows will be toggled to the floating state.
-.It Mod-Button2
-Toggle focused window between floating and tiled state.
-.It Mod-Button3
-Resize focused window while dragging.
-Tiled windows will be toggled to the floating state.
-.El
-.Sh STATUS INFORMATION
-.Nm
-writes its status information to standard output.
-If the
-.Fl s
-option is given, the status information is written to the standard input of the
-child process instead.
-.Pp
-Said information has the following format:
-.Bd -ragged -offset indent
-.Ar <monitor>
-.Ar <component>
-.Ar <data>
-.Ed
-.Pp
-.Bl -tag -width 11n -offset 0 -compact
-.It Ar <monitor>
-is the name given to the output.
-.It Ar <component>
-is one of (in order)
-.Em title ,
-.Em appid ,
-.Em fullscreen ,
-.Em floating ,
-.Em selmon ,
-.Em tags ,
-.Em layout .
-.It Ar <data>
-changes depending on
-.Ar <component> .
-.Bl -tag -width 10n -compact
-.It Em title
-The title of the focused window on
-.Ar <monitor>
-or nothing if there is no focused window.
-.It Em appid
-The app_id of the focused window on
-.Ar <monitor>
-or nothing if there is no focused window.
-.It Em fullscreen
-Prints 1 if the focused window on
-.Ar <monitor>
-is in fullscreen state, otherwise prints 0. If there is no focused
-window it prints nothing.
-.It Em floating
-Prints 1 if the focused window on
-.Ar <monitor>
-is in floating state, otherwise prints 0. If there is no focused
-window it prints nothing.
-.It Em selmon
-Prints 1 if
-.Ar <monitor>
-is the selected monitor, otherwise prints 0.
-.It Em tags
-Prints four bitmasks in the following order:
-.Bl -bullet -width 2n -compact
-.It
-Occupied tags of
-.Ar <monitor> .
-.It
-Selected tags of
-.Ar <monitor> .
-.It
-Tags of the focused window on
-.Ar <monitor> .
-.It
-Tags where a window on
-.Ar <monitor>
-requested activation or has urgency hints.
-.El
-The bitmasks are 32-bit unsigned decimal integers.
-.It Em layout
-Prints the symbol of the current layout.
-.El
-.El
-.Ss Examples
-When there is a selected window:
-.Bd -literal -offset indent
-HDMI\-A\-1 title \(ti/source/repos/dwl > man \-l dwl.1
-HDMI\-A\-1 appid footclient
-HDMI\-A\-1 fullscreen 0
-HDMI\-A\-1 floating 0
-HDMI\-A\-1 selmon 1
-HDMI\-A\-1 tags 271 4 4 0
-HDMI\-A\-1 layout [T]
-.Ed
-.Pp
-When there is no selected window:
-.Bd -literal -offset indent
-HDMI\-A\-1 title
-HDMI\-A\-1 appid
-HDMI\-A\-1 fullscreen
-HDMI\-A\-1 floating
-HDMI\-A\-1 selmon 1
-HDMI\-A\-1 tags 271 512 0 0
-HDMI\-A\-1 layout [T]
-.Ed
 .Sh ENVIRONMENT
 These environment variables are used by
 .Nm :
@@ -250,9 +142,17 @@ Start
 with s6 in the background:
 .Dl dwl \-s \(aqs6\-svscan <&\-\(aq
 .Sh SEE ALSO
-.Xr dwm 1 ,
 .Xr foot 1 ,
 .Xr wmenu 1 ,
+.Xr dwm 1 ,
 .Xr xkeyboard-config 7
+.Sh CAVEATS
+The child process's standard input is connected with a pipe to
+.Nm .
+If the child process neither reads from the pipe nor closes its
+standard input,
+.Nm
+will freeze after a while due to it blocking when writing to the full
+pipe buffer.
 .Sh BUGS
 All of them.