20 changed files with 1462 additions and 3623 deletions
--- a/.gitea/issue_template/bug_report.yml
+++ b/.gitea/issue_template/bug_report.yml
@ -1,62 +0,0 @@
-name: Bug Report
-about: Something in dwl isn't working correctly
-title:
-labels:
-    - 'Kind/Bug'
-body:
-    - type: markdown
-      attributes:
-          value: |
-              - Only report bugs that can be reproduced on the main (or wlroots-next) branch without patches.
-              - Proprietary graphics drivers, including nvidia, are not supported. Please use the open source equivalents, such as nouveau, if you would like to use dwl.
-              - Report patch issues to their respective authors.
-
-    - type: input
-      id: dwl_version
-      attributes:
-          label: 'dwl version:'
-          placeholder: '`dwl -v`'
-      validations:
-          required: true
-
-    - type: input
-      id: wlroots_version
-      attributes:
-          label: 'wlroots version:'
-      validations:
-          required: true
-
-    - type: input
-      id: distro
-      attributes:
-          label: What distro (and version) are you using?
-      validations:
-          required: false
-
-    - type: textarea
-      attributes:
-          label: Description
-          value: |
-              The steps you took to reproduce the problem.
-      validations:
-          required: false
-
-    - type: textarea
-      id: debug_log
-      attributes:
-          label: Debug Log
-          value: |
-              Run `dwl -d 2> ~/dwl.log` from a TTY and attach the **full** (do not truncate it) file here, or upload it to a pastebin.
-              Please try to keep the reproduction as brief as possible and exit dwl.
-      validations:
-          required: false
-
-    - type: textarea
-      id: backtrace
-      attributes:
-          label: Stack Trace
-          value: |
-              - Only required if dwl crashes.
-              - If the lines mentioning dwl or wlroots have `??`. Please compile both dwl and wlroots from source (enabling debug symbols) and try to reproduce.
-      validations:
-          required: false
--- a/.gitea/issue_template/enhancement-idea.yml
+++ b/.gitea/issue_template/enhancement-idea.yml
@ -1,9 +0,0 @@
-name: Enhancement idea
-about: Suggest a feature or improvement
-title:
-labels:
-    - 'Kind/Feature'
-body:
-    - type: textarea
-      attributes:
-          label: Description
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Something in dwl isn't working correctly
+title: ''
+labels: 'A: bug'
+assignees: ''
+
+---
+
+## Info
+dwl's commit:
+wlroots version:
+## Description
+<!--
+Only report bugs that can be reproduced on the main line
+Report patch issues to their respective authors
+If the patch author doesn't respond within a reasonable time, email me:
+
+Leonardo Hernández Hernández <leohdz172@protonmail.com>
+
+but note that I'm NOT making any promises
+-->
--- a/.github/ISSUE_TEMPLATE/enhancement-idea.md
+++ b/.github/ISSUE_TEMPLATE/enhancement-idea.md
@ -0,0 +1,10 @@
+---
+name: Enhancement idea
+about: Suggest a feature or improvement
+title: ''
+labels: 'A: enhancement'
+assignees: ''
+
+---
+
+
--- a/.mailmap
+++ b/.mailmap
@ -1,3 +0,0 @@
-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>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,217 +0,0 @@
-# Changelog
-
-* [Unreleased](#unreleased)
-* [0.7](#0.7)
-* [0.6](#0.6)
-* [0.5](#0.5)
-
-
-## 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
-### Fixed
-
-* Crash when a client is created while all outputs are disabled.
-
-### Security
-### Contributors
-
-
-## 0.7
-
-This version is just 0.6 with wlroots 0.18 compatibility.
-
-### Added
-
-* Add support for the alpha-modifier-v1 protocol ([wlroots!4616][wlroots!4616]).
-* dwl now will survive GPU resets ([#601][601]).
-
-[wlroots!4616]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4616
-[601]: https://codeberg.org/dwl/dwl/issues/601
-
-
-### Contributors
-
-Guido Cella
-
-
-## 0.6
-
-### Added
-
-* Add `rootcolor` to change the default background color ([#544][544]).
-* Implement the wlr-virtual-pointer-unstable-v1 protocol ([#574][574]).
-* Implement the pointer-constraints and relative-pointer protocols ([#317][317])
-* Implement the wlr-output-power-management protocol ([#599][599])
-
-[544]: https://codeberg.org/dwl/dwl/pulls/544
-[574]: https://codeberg.org/dwl/dwl/pulls/574
-[317]: https://codeberg.org/dwl/dwl/issues/317
-[599]: https://codeberg.org/dwl/dwl/issues/559
-
-
-### Changed
-
-* Keyboards are now managed through keyboard groups ([#549][549]).
-* Only the first matched keybinding is executed.
-* Allow toggling the layout before selecting a different one ([#570][570]).
-* Fullscreen clients are now rendered above wlr_layer_surfaces in the top layer
-  ([#609][609]).
-* The default menu was changed from `bemenu-run` to `wmenu-run` ([#553][553]).
-* The option `sloppyfocus` now replicates the dwm behavior ([#599][599]).
-* Allow configure position of monitors with negative values. (-1, -1) is
-  used to auto-configure them ([#635][635]).
-* dwl now kills the entire process group of `startup_cmd`
-* The O_NONBLOCK flag is set for stdout.
-
-[549]: https://codeberg.org/dwl/dwl/pulls/549
-[570]: https://codeberg.org/dwl/dwl/pulls/570
-[609]: https://codeberg.org/dwl/dwl/pulls/609
-[553]: https://codeberg.org/dwl/dwl/issues/553
-[599]: https://codeberg.org/dwl/dwl/pulls/599
-[635]: https://codeberg.org/dwl/dwl/pulls/635
-
-
-### Removed
-
-* The SLOC limit is now removed ([#497][497]).
-
-[497]: https://codeberg.org/dwl/dwl/pulls/497
-
-
-### Fixed
-
-* Clients not having the correct border color when mapping.
-* Compliance with the xdg-decoration-unstable-v1 ([#546][546]).
-* dwl no longer sends negative values in xdg_toplevel.configure events.
-* Crashes with disabled monitors ([#472][472]).
-
-[546]: https://codeberg.org/dwl/dwl/pulls/546
-[472]: https://codeberg.org/dwl/dwl/issues/472
-
-
-### Contributors
-
-Ben Jargowsky
-Benjamin Chausse
-David Donahue
-Devin J. Pohly
-Dima Krasner
-Emil Miler
-Forrest Bushstone
-Guido Cella
-Peter Hofmann
-Rutherther
-Squibid
-choc
-fictitiousexistence
-korei999
-sewn
-thanatos
-
-
-## 0.5
-
-### Added
-
-* Allow configure x and y position of outputs ([#301][301])
-* Implement repeatable keybindings ([#368][368])
-* Print app id in printstatus() output ([#381][381])
-* Display client count in monocle symbol ([#387][387])
-* Export XCURSOR_SIZE to fix apps using an older version of Qt ([#425][425])
-* Support for wp-fractional-scale-v1 (through wlr_scene: [wlroots!3511][wlroots!3511])
-* dwl now sends `wl_surface.preferred_buffer_scale` (through wlr_scene: [wlroots!4269][wlroots!4269])
-* Add support for xdg-shell v6 ([#465][465])
-* Add support for wp-cursor-shape-v1 ([#444][444])
-* Add desktop file ([#484][484])
-* Add macro to easily configure colors ([#466][466])
-* Color of urgent clients are now red ([#494][494])
-* New flag `-d` and option `log_level` to change the wlroots debug level
-* Add CHANGELOG.md ([#501][501])
-
-[301]: https://github.com/djpohly/dwl/pull/301
-[368]: https://github.com/djpohly/dwl/pull/368
-[381]: https://github.com/djpohly/dwl/pull/381
-[387]: https://github.com/djpohly/dwl/issues/387
-[425]: https://github.com/djpohly/dwl/pull/425
-[wlroots!4269]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4269
-[wlroots!3511]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3511
-[465]: https://github.com/djpohly/dwl/pull/465
-[444]: https://github.com/djpohly/dwl/pull/444
-[484]: https://github.com/djpohly/dwl/pull/484
-[466]: https://github.com/djpohly/dwl/issues/466
-[494]: https://github.com/djpohly/dwl/pull/494
-[501]: https://github.com/djpohly/dwl/pull/501
-
-
-### Changed
-
-* Replace `tags` with `TAGCOUNT` in config.def.h ([#403][403])
-* Pop ups are now destroyed when focusing another client ([#408][408])
-* dwl does not longer respect size hints, instead clip windows if they are
-  larger than they should be ([#455][455])
-* The version of wlr-layer-shell-unstable-v1 was lowered to 3 (from 4)
-* Use the same border color as dwm ([#494][494])
-
-[403]: https://github.com/djpohly/dwl/pull/403
-[408]: https://github.com/djpohly/dwl/pull/409
-[455]: https://github.com/djpohly/dwl/pull/455
-[494]: https://github.com/djpohly/dwl/pull/494
-
-
-### Removed
-
-* Remove unused `rootcolor` option ([#401][401])
-* Remove support for wlr-input-inhibitor-unstable-v1 ([#430][430])
-* Remove support for KDE idle protocol ([#431][431])
-
-[401]: https://github.com/djpohly/dwl/pull/401
-[430]: https://github.com/djpohly/dwl/pull/430
-[431]: https://github.com/djpohly/dwl/pull/431
-
-
-### Fixed
-
-* Fix crash when creating a layer surface with all outputs disabled
-  ([#421][421])
-* Fix other clients being shown as focused if the focused client have pop ups
-  open ([#408][408])
-* Resize fullscreen clients when updating monitor mode
-* dwl no longer crash at exit like sometimes did
-* Fullscreen background appearing above clients ([#487][487])
-* Fix a segfault when user provides invalid xkb_rules ([#518][518])
-
-[421]: https://github.com/djpohly/dwl/pull/421
-[408]: https://github.com/djpohly/dwl/issues/408
-[487]: https://github.com/djpohly/dwl/issues/487
-[518]: https://github.com/djpohly/dwl/pull/518
-
-
-### Contributors
-
-* A Frederick Christensen
-* Angelo Antony
-* Ben Collerson
-* Devin J. Pohly
-* Forrest Bushstone
-* gan-of-culture
-* godalming123
-* Job79
-* link2xt
-* Micah Gorrell
-* Nikita Ivanov
-* Palanix
-* pino-desktop
-* Weiseguy
-* Yves Zoundi
--- a/67
+++ b/67
@ -4,26 +4,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 \
-	-Wno-unused-parameter -Wshadow -Wunused-macros -Werror=strict-prototypes \
-	-Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types \
-	-Wfloat-conversion
+DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XWAYLAND)
+DWLDEVCFLAGS = -pedantic -Wall -Wextra -Wdeclaration-after-statement -Wno-unused-parameter -Wno-sign-compare -Wshadow -Wunused-macros\
+	-Werror=strict-prototypes -Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types

 # CFLAGS / LDFLAGS
-PKGS      = wayland-server xkbcommon libinput $(XLIBS)
-DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
-LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS)
+PKGS      = wlroots wayland-server xkbcommon libinput $(XLIBS)
+DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
+LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS)

 all: dwl
-dwl: dwl.o util.o dwl-ipc-unstable-v2-protocol.o
-	$(CC) dwl.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) dwl-ipc-unstable-v2-protocol.o -o $@
-dwl.o: dwl.c client.h config.h config.mk cursor-shape-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 dwl-ipc-unstable-v2-protocol.h
+dwl: dwl.o util.o net-tapesoftware-dwl-wm-unstable-v1-protocol.o
+	$(CC) dwl.o util.o net-tapesoftware-dwl-wm-unstable-v1-protocol.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
+dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h net-tapesoftware-dwl-wm-unstable-v1-protocol.h
 util.o: util.c util.h
-dwl-ipc-unstable-v2-protocol.o: dwl-ipc-unstable-v2-protocol.h

 # wayland-scanner is a tool which generates C headers and rigging for Wayland
 # protocols, which are specified in XML. wlroots requires you to rig these up
@ -31,27 +25,21 @@ dwl-ipc-unstable-v2-protocol.o: dwl-ipc-unstable-v2-protocol.h
 WAYLAND_SCANNER   = `$(PKG_CONFIG) --variable=wayland_scanner wayland-scanner`
 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 $@
-dwl-ipc-unstable-v2-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		protocols/dwl-ipc-unstable-v2.xml $@
-dwl-ipc-unstable-v2-protocol.c:
-	$(WAYLAND_SCANNER) private-code \
-		protocols/dwl-ipc-unstable-v2.xml $@
-pointer-constraints-unstable-v1-protocol.h:
-	$(WAYLAND_SCANNER) enum-header \
-		$(WAYLAND_PROTOCOLS)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml $@
-wlr-layer-shell-unstable-v1-protocol.h:
-	$(WAYLAND_SCANNER) enum-header \
-		protocols/wlr-layer-shell-unstable-v1.xml $@
-wlr-output-power-management-unstable-v1-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		protocols/wlr-output-power-management-unstable-v1.xml $@
 xdg-shell-protocol.h:
 	$(WAYLAND_SCANNER) server-header \
 		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
+wlr-layer-shell-unstable-v1-protocol.h:
+	$(WAYLAND_SCANNER) server-header \
+		protocols/wlr-layer-shell-unstable-v1.xml $@
+
+# install rules
+net-tapesoftware-dwl-wm-unstable-v1-protocol.h: protocols/net-tapesoftware-dwl-wm-unstable-v1.xml
+	$(WAYLAND_SCANNER) server-header \
+		protocols/net-tapesoftware-dwl-wm-unstable-v1.xml $@
+net-tapesoftware-dwl-wm-unstable-v1-protocol.c: protocols/net-tapesoftware-dwl-wm-unstable-v1.xml
+	$(WAYLAND_SCANNER) private-code \
+		protocols/net-tapesoftware-dwl-wm-unstable-v1.xml $@
+net-tapesoftware-dwl-wm-unstable-v1-protocol.o: net-tapesoftware-dwl-wm-unstable-v1-protocol.h

 config.h:
 	cp config.def.h $@
@ -60,27 +48,22 @@ clean:

 dist: clean
 	mkdir -p dwl-$(VERSION)
-	cp -R LICENSE* Makefile CHANGELOG.md README.md client.h config.def.h \
-		config.mk protocols dwl.1 dwl.c util.c util.h dwl.desktop \
+	cp -R LICENSE* Makefile README.md client.h config.def.h\
+		config.mk protocols dwl.1 dwl.c util.c util.h\
 		dwl-$(VERSION)
 	tar -caf dwl-$(VERSION).tar.gz dwl-$(VERSION)
 	rm -rf dwl-$(VERSION)

 install: dwl
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	rm -f $(DESTDIR)$(PREFIX)/bin/dwl
 	cp -f dwl $(DESTDIR)$(PREFIX)/bin
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dwl
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	cp -f dwl.1 $(DESTDIR)$(MANDIR)/man1
 	chmod 644 $(DESTDIR)$(MANDIR)/man1/dwl.1
-	mkdir -p $(DESTDIR)$(DATADIR)/wayland-sessions
-	cp -f dwl.desktop $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop
-	chmod 644 $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop
 uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/dwl $(DESTDIR)$(MANDIR)/man1/dwl.1 \
-		$(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop
+	rm -f $(DESTDIR)$(PREFIX)/bin/dwl $(DESTDIR)$(MANDIR)/man1/dwl.1

 .SUFFIXES: .c .o
 .c.o:
-	$(CC) $(CPPFLAGS) $(DWLCFLAGS) -o $@ -c $<
+	$(CC) $(CPPFLAGS) $(DWLCFLAGS) -c $<
--- a/README.md
+++ b/README.md
@ -1,55 +1,62 @@
 # dwl - dwm for Wayland

-Join us on our IRC channel: [#dwl on Libera Chat]  
-Or on the community-maintained [Discord server].
+Join us on our [Discord server] or at [#dwl] on irc.libera.chat.

 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,
-primarily in terms of functionality, and secondarily in terms of
-philosophy. Like dwm, dwl is:
+primarily in terms of philosophy, and secondarily in terms of functionality.
+Like dwm, dwl is:

 - Easy to understand, hack on, and extend with patches
 - One C source file (or a very small number) configurable via `config.h`
+- Limited to 2200 SLOC to promote hackability
 - Tied to as few external dependencies as possible

-## Getting Started:
+dwl is not meant to provide every feature under the sun. Instead, like dwm, it
+sticks to features which are necessary, simple, and straightforward to implement
+given the base on which it is built. Implemented default features are:

-### Latest semi-stable [release]
-This is probably where you want to start. This builds against the dependent
-packages' versions currently shipping in major distributions. If your
-distribution's wlroots version is older, use an earlier dwl [release] or [0.x
-branch].
+- Any features provided by dwm/Xlib: simple window borders, tags, keybindings,
+  client rules, mouse move/resize. Providing a built-in status bar is an
+  exception to this goal, to avoid dependencies on font rendering and/or
+  drawing libraries when an external bar could work well.
+- Configurable multi-monitor layout support, including position and rotation
+- Configurable HiDPI/multi-DPI support
+- Idle-inhibit protocol which lets applications such as mpv disable idle
+  monitoring
+- Provide information to external status bars via stdout/stdin
+- Urgency hints via xdg-activate protocol
+- Support screen lockers via input-inhibitor protocol
+- Various Wayland protocols
+- XWayland support as provided by wlroots (can be enabled in `config.mk`)
+- Zero flickering - Wayland users naturally expect that "every frame is perfect"
+- Layer shell popups (used by Waybar)
+- Damage tracking provided by scenegraph API

-### Development branch [main]
-Active development progresses on the `main` branch. The `main` branch is built
-against a late (and often changing) git commit of wlroots. While the adventurous
-are welcome to use `main`, it is a rocky road. Using `main` requires that the
-user be willing to chase git commits of wlroots. Testing development pull
-requests may involve merging unmerged pull requests in [wlroots]' git repository
-and/or git commits of wayland.
-  
-### Building dwl
-dwl has the following dependencies:
- libinput
- wayland
- wlroots (compiled with the libinput backend)
- xkbcommon
- wayland-protocols (compile-time only)
- pkg-config (compile-time only)
+Features under consideration (possibly as patches) are:

-dwl has the following additional dependencies if XWayland support is enabled:
- libxcb
- libxcb-wm
- wlroots (compiled with X11 support)
- Xwayland (runtime only)
+- Protocols made trivial by wlroots
+- Implement the text-input and input-method protocols to support IME once ibus
+  implements input-method v2 (see https://github.com/ibus/ibus/pull/2256 and
+  https://github.com/djpohly/dwl/pull/235)

-Install these (and their `-devel` versions if your distro has separate
-development packages) and run `make`. If you wish to build against a released
-version of wlroots (*you probably do*), use a [release] or a [0.x branch]. If
-you want to use the unstable development `main` branch, you need to use the git
-version of [wlroots].
+Feature *non-goals* for the main codebase include:

-To enable XWayland, you should uncomment its flags in `config.mk`.
+- Client-side decoration (any more than is necessary to tell the clients not to)
+- Client-initiated window management, such as move, resize, and close, which can
+  be done through the compositor
+- Animations and visual effects
+
+## Building dwl
+
+dwl has only two dependencies: `wlroots` and `wayland-protocols`. 
+
+Simply install these (and their `-devel` versions if your distro has separate
+development packages) and run `make`.  If you wish to build against a Git
+version of wlroots, check out the [wlroots-next branch].
+
+To enable XWayland, you should also install xorg-xwayland and uncomment its flag
+in `config.mk`.

 ## Configuration

@ -58,24 +65,23 @@ manner as dwm. There is no way to separately restart the window manager in
 Wayland without restarting the entire display server, so any changes will take
 effect the next time dwl is executed.

-As in the dwm community, we encourage users to share patches they have
-created. Check out the [dwl-patches] repository!
+As in the dwm community, we encourage users to share patches they have created.
+Check out the [patches page on our wiki]!

 ## Running dwl

 dwl can be run on any of the backends supported by wlroots. This means you can
-run it as a separate window inside either an X11 or Wayland session, as well as
-directly from a VT console. Depending on your distro's setup, you may need to
-add your user to the `video` and `input` groups before you can run dwl on a
-VT. If you are using `elogind` or `systemd-logind` you need to install polkit;
-otherwise you need to add yourself in the `seat` group and enable/start the
-seatd daemon.
+run it as a separate window inside either an X11 or Wayland session, as well
+as directly from a VT console. Depending on your distro's setup, you may need
+to add your user to the `video` and `input` groups before you can run dwl on
+a VT. If you are using `elogind` or `systemd-logind` you need to install
+polkit; otherwise you need to add yourself in the `seat` group and
+enable/start the 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 black. This can be
-modified in `config.h`.
+decoration initially; these are instead clients that can be run within
+the Wayland session.

 If you would like to run a script or command automatically at startup, you can
 specify the command using the `-s` option. This command will be executed as a
@ -83,8 +89,7 @@ shell command using `/bin/sh -c`.  It serves a similar function to `.xinitrc`,
 but differs in that the display server will not shut down when this process
 terminates. Instead, dwl will send this process a SIGTERM at shutdown and wait
 for it to terminate (if it hasn't already). This makes it ideal for execing into
-a user service manager like [s6], [anopa], [runit], [dinit], or [`systemd
--user`].
+a user service manager like [s6], [anopa], [runit], or [`systemd --user`].

 Note: The `-s` command is run as a *child process* of dwl, which means that it
 does not have the ability to affect the environment of dwl or of any processes
@ -100,13 +105,13 @@ automatically, you will need to configure it prior to launching `dwl`, e.g.:

 ### Status information

-Information about selected layouts, current window title, app-id, and
+Information about selected layouts, current window title, and
 selected/occupied/urgent tags is written to the stdin of the `-s` command (see
 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,
-you can close standard input with the `<&-` shell redirection, for example:
+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, you can
+close standard input with the `<&-` shell redirection, for example:

    dwl -s 'foot --server <&-'

@ -121,49 +126,6 @@ To get a list of status bars that work with dwl consult our [wiki].

 You can find a [list of useful resources on our wiki].

-## Background
-
-dwl is not meant to provide every feature under the sun. Instead, like dwm, it
-sticks to features which are necessary, simple, and straightforward to implement
-given the base on which it is built. Implemented default features are:
-
- Any features provided by dwm/Xlib: simple window borders, tags, keybindings,
-  client rules, mouse move/resize. Providing a built-in status bar is an
-  exception to this goal, to avoid dependencies on font rendering and/or drawing
-  libraries when an external bar could work well.
- Configurable multi-monitor layout support, including position and rotation
- Configurable HiDPI/multi-DPI support
- Idle-inhibit protocol which lets applications such as mpv disable idle
-  monitoring
- Provide information to external status bars via stdout/stdin
- Urgency hints via xdg-activate protocol
- Support screen lockers via ext-session-lock-v1 protocol
- Various Wayland protocols
- XWayland support as provided by wlroots (can be enabled in `config.mk`)
- Zero flickering - Wayland users naturally expect that "every frame is perfect"
- Layer shell popups (used by Waybar)
- Damage tracking provided by scenegraph API
-
-Given the Wayland architecture, dwl has to implement features from dwm **and**
-the xorg-server. Because of this, it is impossible to maintain the original
-project goal of 2000 SLOC and have a reasonably complete compositor with
-features comparable to dwm. However, this does not mean that the code will grow
-indiscriminately. We will try to keep the code as small as possible.
-
-Features under consideration (possibly as patches) are:
-
- Protocols made trivial by wlroots
- Implement the text-input and input-method protocols to support IME once ibus
-  implements input-method v2 (see https://github.com/ibus/ibus/pull/2256 and
-  https://codeberg.org/dwl/dwl/pulls/235)
-
-Feature *non-goals* for the main codebase include:
-
- Client-side decoration (any more than is necessary to tell the clients not to)
- Client-initiated window management, such as move, resize, and close, which can
-  be done through the compositor
- Animations and visual effects
-
 ## Acknowledgements

 dwl began by extending the TinyWL example provided (CC0) by the sway/wlroots
@ -174,26 +136,22 @@ possible.
 Many thanks to suckless.org and the dwm developers and community for the
 inspiration, and to the various contributors to the project, including:

- **Devin J. Pohly for creating and nurturing the fledgling project**
 - Alexander Courtis for the XWayland implementation
 - Guido Cella for the layer-shell protocol implementation, patch maintenance,
  and for helping to keep the project running
 - Stivvo for output management and fullscreen support, and patch maintenance


-[`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
-[0.x branch]: https://codeberg.org/dwl/dwl/branches
-[anopa]: https://jjacky.com/anopa/
-[dinit]: https://davmac.org/projects/dinit/
-[dwl-patches]: https://codeberg.org/dwl/dwl-patches
-[list of useful resources on our wiki]: https://codeberg.org/dwl/dwl/wiki/Home#migrating-from-x
-[main]: https://codeberg.org/dwl/dwl/src/branch/main
-[release]: https://codeberg.org/dwl/dwl/releases
-[runit]: http://smarden.org/runit/faq.html#userservices
-[s6]: https://skarnet.org/software/s6/
-[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots/
-[wiki]: https://codeberg.org/dwl/dwl/wiki/Home#compatible-status-bars
 [Discord server]: https://discord.gg/jJxZnrGPWN
+[#dwl]: https://web.libera.chat/?channels=#dwl
 [Wayland]: https://wayland.freedesktop.org/
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots/
+[wlroots-next branch]: https://github.com/djpohly/dwl/tree/wlroots-next
+[patches page on our wiki]: https://github.com/djpohly/dwl/wiki/Patches
+[s6]: https://skarnet.org/software/s6/
+[anopa]: https://jjacky.com/anopa/
+[runit]: http://smarden.org/runit/faq.html#userservices
+[`systemd --user`]: https://wiki.archlinux.org/title/Systemd/User
+[wiki]: https://github.com/djpohly/dwl/wiki#compatible-status-bars
+[list of useful resources on our wiki]:
+    https://github.com/djpohly/dwl/wiki#migrating-from-x
--- a/client.h
+++ b/client.h
@ -10,9 +10,70 @@ static inline int
 client_is_x11(Client *c)
 {
 #ifdef XWAYLAND
-	return c->type == X11;
-#endif
+	return c->type == X11Managed || c->type == X11Unmanaged;
+#else
 	return 0;
+#endif
+}
+
+static inline Client *
+client_from_wlr_surface(struct wlr_surface *s)
+{
+	struct wlr_xdg_surface *surface;
+
+#ifdef XWAYLAND
+	struct wlr_xwayland_surface *xsurface;
+	if (s && wlr_surface_is_xwayland_surface(s)
+			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(s)))
+		return xsurface->data;
+#endif
+	if (s && wlr_surface_is_xdg_surface(s)
+			&& (surface = wlr_xdg_surface_from_wlr_surface(s))
+			&& surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL)
+		return surface->data;
+
+	if (s && wlr_surface_is_subsurface(s))
+		return client_from_wlr_surface(wlr_surface_get_root_surface(s));
+	return NULL;
+}
+
+static inline Client *
+client_get_parent(Client *c)
+{
+#ifdef XWAYLAND
+	if (client_is_x11(c) && c->surface.xwayland->parent)
+		return client_from_wlr_surface(c->surface.xwayland->parent->surface);
+#endif
+	if (c->surface.xdg->toplevel->parent)
+		return client_from_wlr_surface(c->surface.xdg->toplevel->parent->surface);
+
+	return NULL;
+}
+
+static inline void
+client_get_size_hints(Client *c, struct wlr_box *max, struct wlr_box *min)
+{
+	struct wlr_xdg_toplevel *toplevel;
+	struct wlr_xdg_toplevel_state *state;
+#ifdef XWAYLAND
+	if (client_is_x11(c)) {
+		struct wlr_xwayland_surface_size_hints *size_hints;
+		size_hints = c->surface.xwayland->size_hints;
+		if (size_hints) {
+			max->width = size_hints->max_width;
+			max->height = size_hints->max_height;
+			min->width = size_hints->min_width;
+			min->height = size_hints->min_height;
+		}
+		return;
+	}
+#endif
+	toplevel = c->surface.xdg->toplevel;
+	state = &toplevel->current;
+	max->width = state->max_width;
+	max->height = state->max_height;
+	min->width = state->min_width;
+	min->height = state->min_height;
 }

 static inline struct wlr_surface *
@ -25,100 +86,34 @@ client_surface(Client *c)
 	return c->surface.xdg->surface;
 }

-static inline int
-toplevel_from_wlr_surface(struct wlr_surface *s, Client **pc, LayerSurface **pl)
-{
-	struct wlr_xdg_surface *xdg_surface, *tmp_xdg_surface;
-	struct wlr_surface *root_surface;
-	struct wlr_layer_surface_v1 *layer_surface;
-	Client *c = NULL;
-	LayerSurface *l = NULL;
-	int type = -1;
-#ifdef XWAYLAND
-	struct wlr_xwayland_surface *xsurface;
-#endif
-
-	if (!s)
-		return -1;
-	root_surface = wlr_surface_get_root_surface(s);
-
-#ifdef XWAYLAND
-	if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(root_surface))) {
-		c = xsurface->data;
-		type = c->type;
-		goto end;
-	}
-#endif
-
-	if ((layer_surface = wlr_layer_surface_v1_try_from_wlr_surface(root_surface))) {
-		l = layer_surface->data;
-		type = LayerShell;
-		goto end;
-	}
-
-	xdg_surface = wlr_xdg_surface_try_from_wlr_surface(root_surface);
-	while (xdg_surface) {
-		tmp_xdg_surface = NULL;
-		switch (xdg_surface->role) {
-		case WLR_XDG_SURFACE_ROLE_POPUP:
-			if (!xdg_surface->popup || !xdg_surface->popup->parent)
-				return -1;
-
-			tmp_xdg_surface = wlr_xdg_surface_try_from_wlr_surface(xdg_surface->popup->parent);
-
-			if (!tmp_xdg_surface)
-				return toplevel_from_wlr_surface(xdg_surface->popup->parent, pc, pl);
-
-			xdg_surface = tmp_xdg_surface;
-			break;
-		case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
-			c = xdg_surface->data;
-			type = c->type;
-			goto end;
-		case WLR_XDG_SURFACE_ROLE_NONE:
-			return -1;
-		}
-	}
-
-end:
-	if (pl)
-		*pl = l;
-	if (pc)
-		*pc = c;
-	return type;
-}
-
 /* The others */
 static inline void
 client_activate_surface(struct wlr_surface *s, int activated)
 {
-	struct wlr_xdg_toplevel *toplevel;
+	struct wlr_xdg_surface *surface;
 #ifdef XWAYLAND
 	struct wlr_xwayland_surface *xsurface;
-	if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(s))) {
+	if (wlr_surface_is_xwayland_surface(s)
+			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(s))) {
 		wlr_xwayland_surface_activate(xsurface, activated);
 		return;
 	}
 #endif
-	if ((toplevel = wlr_xdg_toplevel_try_from_wlr_surface(s)))
-		wlr_xdg_toplevel_set_activated(toplevel, activated);
+	if (wlr_surface_is_xdg_surface(s)
+			&& (surface = wlr_xdg_surface_from_wlr_surface(s))
+			&& surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL)
+		wlr_xdg_toplevel_set_activated(surface, activated);
 }

-static inline uint32_t
-client_set_bounds(Client *c, int32_t width, int32_t height)
+static inline void
+client_for_each_surface(Client *c, wlr_surface_iterator_func_t fn, void *data)
 {
+	wlr_surface_for_each_surface(client_surface(c), fn, data);
 #ifdef XWAYLAND
 	if (client_is_x11(c))
-		return 0;
+		return;
 #endif
-	if (wl_resource_get_version(c->surface.xdg->toplevel->resource) >=
-			XDG_TOPLEVEL_CONFIGURE_BOUNDS_SINCE_VERSION && width >= 0 && height >= 0
-			&& (c->bounds.width != width || c->bounds.height != height)) {
-		c->bounds.width = width;
-		c->bounds.height = height;
-		return wlr_xdg_toplevel_set_bounds(c->surface.xdg->toplevel, width, height);
-	}
-	return 0;
+	wlr_xdg_surface_for_each_popup_surface(c->surface.xdg, fn, data);
 }

 static inline const char *
@ -126,28 +121,9 @@ 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";
-}
-
-static inline void
-client_get_clip(Client *c, struct wlr_box *clip)
-{
-	*clip = (struct wlr_box){
-		.x = 0,
-		.y = 0,
-		.width = c->geom.width - c->bw,
-		.height = c->geom.height - c->bw,
-	};
-
-#ifdef XWAYLAND
-	if (client_is_x11(c))
-		return;
-#endif
-
-	clip->x = c->surface.xdg->geometry.x;
-	clip->y = c->surface.xdg->geometry.y;
+	return c->surface.xdg->toplevel->app_id;
 }

 static inline void
@ -162,35 +138,7 @@ client_get_geometry(Client *c, struct wlr_box *geom)
 		return;
 	}
 #endif
-	*geom = c->surface.xdg->geometry;
-}
-
-static inline Client *
-client_get_parent(Client *c)
-{
-	Client *p = NULL;
-#ifdef XWAYLAND
-	if (client_is_x11(c)) {
-		if (c->surface.xwayland->parent)
-			toplevel_from_wlr_surface(c->surface.xwayland->parent->surface, &p, NULL);
-		return p;
-	}
-#endif
-	if (c->surface.xdg->toplevel->parent)
-		toplevel_from_wlr_surface(c->surface.xdg->toplevel->parent->base->surface, &p, NULL);
-	return p;
-}
-
-static inline int
-client_has_children(Client *c)
-{
-#ifdef XWAYLAND
-	if (client_is_x11(c))
-		return !wl_list_empty(&c->surface.xwayland->children);
-#endif
-	/* surface.xdg->link is never empty because it always contains at least the
-	 * surface itself. */
-	return wl_list_length(&c->surface.xdg->link) > 1;
+	wlr_xdg_surface_get_geometry(c->surface.xdg, geom);
 }

 static inline const char *
@ -198,92 +146,52 @@ 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
 client_is_float_type(Client *c)
 {
-	struct wlr_xdg_toplevel *toplevel;
-	struct wlr_xdg_toplevel_state state;
+	struct wlr_box min = {0}, max = {0};
+	client_get_size_hints(c, &max, &min);

 #ifdef XWAYLAND
 	if (client_is_x11(c)) {
 		struct wlr_xwayland_surface *surface = c->surface.xwayland;
-		xcb_size_hints_t *size_hints = surface->size_hints;
 		if (surface->modal)
 			return 1;

-		if (wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_DIALOG)
-				|| wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_SPLASH)
-				|| wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_TOOLBAR)
-				|| wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_UTILITY)) {
-			return 1;
-		}
-
-		return size_hints && size_hints->min_width > 0 && size_hints->min_height > 0
-			&& (size_hints->max_width == size_hints->min_width
-				|| size_hints->max_height == size_hints->min_height);
+		for (size_t i = 0; i < surface->window_type_len; i++)
+			if (surface->window_type[i] == netatom[NetWMWindowTypeDialog]
+					|| surface->window_type[i] == netatom[NetWMWindowTypeSplash]
+					|| surface->window_type[i] == netatom[NetWMWindowTypeToolbar]
+					|| surface->window_type[i] == netatom[NetWMWindowTypeUtility])
+				return 1;
 	}
 #endif
-
-	toplevel = c->surface.xdg->toplevel;
-	state = toplevel->current;
-	return toplevel->parent || (state.min_width != 0 && state.min_height != 0
-		&& (state.min_width == state.max_width
-			|| state.min_height == state.max_height));
+	return ((min.width > 0 || min.height > 0 || max.width > 0 || max.height > 0)
+		&& (min.width == max.width || min.height == max.height))
+		|| client_get_parent(c);
 }

 static inline int
-client_is_rendered_on_mon(Client *c, Monitor *m)
+client_is_mapped(Client *c)
 {
-	/* This is needed for when you don't want to check formal assignment,
-	 * but rather actual displaying of the pixels.
-	 * Usually VISIBLEON suffices and is also faster. */
-	struct wlr_surface_output *s;
-	int unused_lx, unused_ly;
-	if (!wlr_scene_node_coords(&c->scene->node, &unused_lx, &unused_ly))
-		return 0;
-	wl_list_for_each(s, &client_surface(c)->current_outputs, link)
-		if (s->output == m->wlr_output)
-			return 1;
-	return 0;
-}
-
-static inline int
-client_is_stopped(Client *c)
-{
-	int pid;
-	siginfo_t in = {0};
 #ifdef XWAYLAND
 	if (client_is_x11(c))
-		return 0;
+		return c->surface.xwayland->mapped;
 #endif
-
-	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 unluckely that
-		 * it is stopped, in order to do not skip frames assume that it is. */
-		if (errno == ECHILD)
-			return 1;
-	} else if (in.si_pid) {
-		if (in.si_code == CLD_STOPPED || in.si_code == CLD_TRAPPED)
-			return 1;
-		if (in.si_code == CLD_CONTINUED)
-			return 0;
-	}
-
-	return 0;
+	return c->surface.xdg->mapped;
 }

 static inline int
 client_is_unmanaged(Client *c)
 {
 #ifdef XWAYLAND
-	if (client_is_x11(c))
-		return c->surface.xwayland->override_redirect;
+	return c->type == X11Unmanaged;
 #endif
 	return 0;
 }
@ -298,6 +206,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)
 {
@ -307,15 +226,7 @@ client_send_close(Client *c)
 		return;
 	}
 #endif
-	wlr_xdg_toplevel_send_close(c->surface.xdg->toplevel);
-}
-
-static inline void
-client_set_border_color(Client *c, const float color[static 4])
-{
-	int i;
-	for (i = 0; i < 4; i++)
-		wlr_scene_rect_set_color(c->border[i], color);
+	wlr_xdg_toplevel_send_close(c->surface.xdg);
 }

 static inline void
@ -327,14 +238,7 @@ client_set_fullscreen(Client *c, int fullscreen)
 		return;
 	}
 #endif
-	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));
+	wlr_xdg_toplevel_set_fullscreen(c->surface.xdg, fullscreen);
 }

 static inline uint32_t
@ -343,43 +247,32 @@ client_set_size(Client *c, uint32_t width, uint32_t height)
 #ifdef XWAYLAND
 	if (client_is_x11(c)) {
 		wlr_xwayland_surface_configure(c->surface.xwayland,
-				c->geom.x + c->bw, c->geom.y + c->bw, width, height);
+				c->geom.x, c->geom.y, width, height);
 		return 0;
 	}
 #endif
-	if ((int32_t)width == c->surface.xdg->toplevel->current.width
-			&& (int32_t)height == c->surface.xdg->toplevel->current.height)
-		return 0;
-	return wlr_xdg_toplevel_set_size(c->surface.xdg->toplevel, (int32_t)width, (int32_t)height);
+	return wlr_xdg_toplevel_set_size(c->surface.xdg, width, height);
 }

 static inline void
 client_set_tiled(Client *c, uint32_t edges)
 {
-#ifdef XWAYLAND
-	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) {
-		wlr_xdg_toplevel_set_tiled(c->surface.xdg->toplevel, edges);
-	} else {
-		wlr_xdg_toplevel_set_maximized(c->surface.xdg->toplevel, edges != WLR_EDGE_NONE);
-	}
-}
-
-static inline void
-client_set_suspended(Client *c, int suspended)
-{
 #ifdef XWAYLAND
 	if (client_is_x11(c))
 		return;
 #endif
+	wlr_xdg_toplevel_set_tiled(c->surface.xdg, edges);
+}

-	wlr_xdg_toplevel_set_suspended(c->surface.xdg->toplevel, suspended);
+static inline struct wlr_surface *
+client_surface_at(Client *c, double cx, double cy, double *sx, double *sy)
+{
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return wlr_surface_surface_at(c->surface.xwayland->surface,
+				cx, cy, sx, sy);
+#endif
+	return wlr_xdg_surface_surface_at(c->surface.xdg, cx, cy, sx, sy);
 }

 static inline int
@ -387,8 +280,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_surface_icccm_input_model(c->surface.xwayland) != WLR_ICCCM_INPUT_MODEL_NONE;
+		&& wlr_xwayland_or_surface_wants_focus(c->surface.xwayland)
+		&& wlr_xwayland_icccm_input_model(c->surface.xwayland) != WLR_ICCCM_INPUT_MODEL_NONE;
 #endif
 	return 0;
 }
@ -402,3 +295,43 @@ client_wants_fullscreen(Client *c)
 #endif
 	return c->surface.xdg->toplevel->requested.fullscreen;
 }
+
+static inline void *
+toplevel_from_popup(struct wlr_xdg_popup *popup)
+{
+	struct wlr_xdg_surface *surface = popup->base;
+
+	while (1) {
+		switch (surface->role) {
+		case WLR_XDG_SURFACE_ROLE_POPUP:
+			if (!surface->popup->parent)
+				return NULL;
+			else if (wlr_surface_is_layer_surface(surface->popup->parent))
+				return wlr_layer_surface_v1_from_wlr_surface(surface->popup->parent)->data;
+			else if (!wlr_surface_is_xdg_surface(surface->popup->parent))
+				return NULL;
+
+			surface = wlr_xdg_surface_from_wlr_surface(surface->popup->parent);
+			break;
+		case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
+				return surface->data;
+		case WLR_XDG_SURFACE_ROLE_NONE:
+			return NULL;
+		}
+	}
+}
+
+static inline void *
+toplevel_from_wlr_layer_surface(struct wlr_surface *s)
+{
+	Client *c;
+	struct wlr_layer_surface_v1 *wlr_layer_surface;
+
+	if ((c = client_from_wlr_surface(s)))
+		return c;
+	else if (s && wlr_surface_is_layer_surface(s)
+			&& (wlr_layer_surface = wlr_layer_surface_v1_from_wlr_surface(s)))
+		return wlr_layer_surface->data;
+
+	return NULL;
+}
--- a/config.def.h
+++ b/config.def.h
@ -1,31 +1,22 @@
-/* Taken from https://github.com/djpohly/dwl/issues/466 */
-#define COLOR(hex)    { ((hex >> 24) & 0xFF) / 255.0f, \
-                        ((hex >> 16) & 0xFF) / 255.0f, \
-                        ((hex >> 8) & 0xFF) / 255.0f, \
-                        (hex & 0xFF) / 255.0f }
 /* appearance */
-static const int sloppyfocus               = 1;  /* focus follows mouse */
-static const int bypass_surface_visibility = 0;  /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible  */
-static const unsigned int borderpx         = 1;  /* border pixel of windows */
-static const float rootcolor[]             = COLOR(0x222222ff);
-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.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
+static const int sloppyfocus        = 1;  /* focus follows mouse */
+static const unsigned int borderpx  = 1;  /* border pixel of windows */
+static const int lockfullscreen     = 1;  /* 1 will force focus on the fullscreen window */
+static const float rootcolor[]      = {0.3, 0.3, 0.3, 1.0};
+static const float bordercolor[]    = {0.5, 0.5, 0.5, 1.0};
+static const float focuscolor[]     = {1.0, 0.0, 0.0, 1.0};
+/* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */
+static const float fullscreen_bg[]  = {0.1, 0.1, 0.1, 1.0};

-/* tagging - TAGCOUNT must be no greater than 31 */
-#define TAGCOUNT (9)
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };

-/* logging */
-static int log_level = WLR_ERROR;
-
-/* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */
 static const Rule rules[] = {
-	/* app_id             title       tags mask     isfloating   monitor */
-	/* examples: */
-	{ "Gimp_EXAMPLE",     NULL,       0,            1,           -1 }, /* Start on currently visible tags floating, not tiled */
-	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           -1 }, /* Start on ONLY tag "9" */
+	/* app_id     title       tags mask     isfloating   monitor */
+	/* examples:
+	{ "Gimp",     NULL,       0,            1,           -1 },
+	*/
+	{ "firefox",  NULL,       1 << 8,       0,           -1 },
 };

 /* layout(s) */
@ -37,18 +28,13 @@ static const Layout layouts[] = {
 };

 /* monitors */
-/* (x=-1, y=-1) is reserved as an "autoconfigure" monitor position indicator
- * WARNING: negative values other than (-1, -1) cause problems with Xwayland clients
- * https://gitlab.freedesktop.org/xorg/xserver/-/issues/899
-*/
-/* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */
 static const MonitorRule monrules[] = {
-	/* name       mfact  nmaster scale layout       rotate/reflect                x    y */
+	/* name       mfact nmaster scale layout       rotate/reflect */
 	/* example of a HiDPI laptop monitor:
-	{ "eDP-1",    0.5f,  1,      2,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
+	{ "eDP-1",    0.5,  1,      2,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL },
 	*/
 	/* defaults */
-	{ NULL,       0.55f, 1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
+	{ NULL,       0.55, 1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL },
 };

 /* keyboard */
@ -80,9 +66,9 @@ LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN
 static const enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;

 /* You can choose between:
-LIBINPUT_CONFIG_CLICK_METHOD_NONE
-LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS
-LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER
+LIBINPUT_CONFIG_CLICK_METHOD_NONE       
+LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS       
+LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER 
 */
 static const enum libinput_config_click_method click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;

@ -100,12 +86,6 @@ LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE
 static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
 static const double accel_speed = 0.0;

-/* You can choose between:
-LIBINPUT_CONFIG_TAP_MAP_LRM -- 1/2/3 finger tap maps to left/right/middle
-LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right
-*/
-static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
-
 /* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
 #define MODKEY WLR_MODIFIER_ALT

@ -120,7 +100,7 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA

 /* commands */
 static const char *termcmd[] = { "foot", NULL };
-static const char *menucmd[] = { "wmenu-run", NULL };
+static const char *menucmd[] = { "bemenu-run", NULL };

 static const Key keys[] = {
 	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
@ -131,8 +111,8 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_k,          focusstack,     {.i = -1} },
 	{ MODKEY,                    XKB_KEY_i,          incnmaster,     {.i = +1} },
 	{ MODKEY,                    XKB_KEY_d,          incnmaster,     {.i = -1} },
-	{ MODKEY,                    XKB_KEY_h,          setmfact,       {.f = -0.05f} },
-	{ MODKEY,                    XKB_KEY_l,          setmfact,       {.f = +0.05f} },
+	{ MODKEY,                    XKB_KEY_h,          setmfact,       {.f = -0.05} },
+	{ MODKEY,                    XKB_KEY_l,          setmfact,       {.f = +0.05} },
 	{ MODKEY,                    XKB_KEY_Return,     zoom,           {0} },
 	{ MODKEY,                    XKB_KEY_Tab,        view,           {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,          killclient,     {0} },
@ -161,9 +141,6 @@ static const Key keys[] = {

 	/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
 	{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
-	/* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is
-	 * do not remove them.
-	 */
 #define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
 	CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
 	CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
--- a/config.mk
+++ b/config.mk
@ -1,36 +1,14 @@
-_VERSION = 0.8-dev
-VERSION  = `git describe --tags --dirty 2>/dev/null || echo $(_VERSION)`
+_VERSION = 0.3.1-dev
+VERSION  = `git describe --long --tags --dirty 2>/dev/null || echo $(_VERSION)`

 PKG_CONFIG = pkg-config

 # paths
 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 installations
-# 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).
-# 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
+#XLIBS = xcb
--- a/config.mma.def.h
+++ b/config.mma.def.h
@ -1,258 +0,0 @@
-/* Taken from https://github.com/djpohly/dwl/issues/466 */
-#define COLOR(hex)    { ((hex >> 24) & 0xFF) / 255.0f, \
-                        ((hex >> 16) & 0xFF) / 255.0f, \
-                        ((hex >> 8) & 0xFF) / 255.0f, \
-                        (hex & 0xFF) / 255.0f }
-/* appearance */
-static const int sloppyfocus                = 0;  /* focus follows mouse */
-static const int bypass_surface_visibility  = 0;  /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible  */
-static const unsigned int borderpx          = 10;  /* border pixel of windows */
-static const int lockfullscreen             = 1;  /* 1 will force focus on the fullscreen window */
-static const float rootcolor[]              = COLOR(0x4d4d4d66);
-static const float bordercolor[]            = COLOR(0x00000000);
-static const float focuscolor[]             = COLOR(0x12121212);
-static const float urgentcolor[]            = COLOR(0xff0000ff);
-/* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */
-static const float fullscreen_bg[]          = COLOR(0x121212ff);
-
-/* tagging - TAGCOUNT must be no greater than 31 */
-#define TAGCOUNT (9)
-
-/* control variables */
-static int cfg_disable_touchpad = 1;
-static const char *cfg_touchpad_device_str = "Synaptic";
-
-/* logging */
-static int log_level = WLR_ERROR;
-
-static const Rule rules[] = {
-	/* app_id     title       tags mask     isfloating   monitor */
-	/* examples:
-	{ "firefox",  NULL,       1 << 8,       0,           -1 },
-	*/
-	{ "Gimp",     NULL,       0,            1,           -1 },
-};
-
-/* layout(s) */
-static const Layout layouts[] = {
-	/* symbol     arrange function */
-	{ "[]=",      tile },
-	{ "><>",      NULL },    /* no layout function means floating behavior */
-	{ "[M]",      monocle },
-};
-
-/* monitors */
-/* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */
-static const MonitorRule monrules[] = {
-	/* name       mfact  nmaster scale layout       rotate/reflect                x    y */
-	/* example of a HiDPI laptop monitor:
-	{ "eDP-1",    0.5f,  1,      2,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
-	*/
-	/* defaults */
-	{ NULL,       0.55f, 1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
-};
-
-/* keyboard */
-static const struct xkb_rule_names xkb_rules = {
-	/* can specify fields: rules, model, layout, variant, options
-     * Base rules in /usr/share/X11/xkb/rules/base.lst */
-	/* example:
-	.options = "ctrl:nocaps",
-	*/
-	.options = "caps:none,compose:rctrl",
-};
-
-static const int repeat_rate = 25;
-static const int repeat_delay = 600;
-
-/* Trackpad */
-static const int tap_to_click = 1;
-static const int tap_and_drag = 1;
-static const int drag_lock = 1;
-static const int natural_scrolling = 1;
-static const int disable_while_typing = 1;
-static const int left_handed = 0;
-static const int middle_button_emulation = 0;
-/* You can choose between:
-LIBINPUT_CONFIG_SCROLL_NO_SCROLL
-LIBINPUT_CONFIG_SCROLL_2FG
-LIBINPUT_CONFIG_SCROLL_EDGE
-LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN
-*/
-static const enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
-
-/* You can choose between:
-LIBINPUT_CONFIG_CLICK_METHOD_NONE
-LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS
-LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER
-*/
-static const enum libinput_config_click_method click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
-
-/* You can choose between:
-LIBINPUT_CONFIG_SEND_EVENTS_ENABLED
-LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
-LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE
-*/
-static const uint32_t send_events_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
-
-/* You can choose between:
-LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT
-LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE
-*/
-static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
-static const double accel_speed = 0.0;
-/* You can choose between:
-LIBINPUT_CONFIG_TAP_MAP_LRM -- 1/2/3 finger tap maps to left/right/middle
-LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right
-*/
-static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
-
-/* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
-/* #define MODKEY WLR_MODIFIER_LOGO */
-#define MODKEY WLR_MODIFIER_ALT
-#define TAGKEYS(KEY,SKEY,TAG) \
-	{ MODKEY,                    KEY,            view,            {.ui = 1 << TAG} }, \
-	{ MODKEY|WLR_MODIFIER_CTRL,  KEY,            toggleview,      {.ui = 1 << TAG} }, \
-	{ MODKEY|WLR_MODIFIER_SHIFT, SKEY,           tag,             {.ui = 1 << TAG} }, \
-	{ MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
-
-#define AD_STR(a) #a
-#define AD_CONCAT(a, b) AD_STR(a ## b)
-#define ACTKEYS_DECL(FUNCP) \
-	static const char *key_cmd_ ## FUNCP[]      = { "dwl_act", #FUNCP,     NULL }; \
-	static const char *key_cmd_S_ ## FUNCP[]    = { "dwl_act", AD_CONCAT(S_,FUNCP),   NULL }; \
-	static const char *key_cmd_C_ ## FUNCP[]    = { "dwl_act", AD_CONCAT(C_,FUNCP),   NULL }; \
-	static const char *key_cmd_SC_ ## FUNCP[]   = { "dwl_act", AD_CONCAT(SC_,FUNCP),  NULL }
-
-#define ACTKEYS_MAP(KEY,FUNCP) \
-	{ 0,                                     KEY,    spawn,  {.v =  key_cmd_ ## FUNCP} }, \
-	{ WLR_MODIFIER_CTRL,                     KEY,    spawn,  {.v =  key_cmd_C_ ## FUNCP} }, \
-	{ WLR_MODIFIER_SHIFT,                    KEY,    spawn,  {.v =  key_cmd_S_ ## FUNCP} }, \
-	{ WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,  KEY,    spawn,  {.v =  key_cmd_SC_ ## FUNCP} }
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static const char *webcmd[]                 = { "dwl_web",                  NULL };
-static const char *mailcmd[]                = { "dwl_email",                NULL };
-static const char *termcmd[]                = { "dwl_term",                 NULL };
-static const char *alttermcmd[]             = { "dwl_alt_term",             NULL };
-static const char *launchcmd[]              = { "dwl_dmenu",                NULL };
-static const char *dispcmd[]                = { "wdisplays",                NULL };
-static const char *lockcmd[]                = { "swaylock",                 NULL };
-
-/* Function key commands */
-ACTKEYS_DECL(vol_mute);
-ACTKEYS_DECL(vol_lower);
-ACTKEYS_DECL(vol_raise);
-ACTKEYS_DECL(mic_mute);
-ACTKEYS_DECL(bright_low);
-ACTKEYS_DECL(bright_high);
-ACTKEYS_DECL(disp);
-ACTKEYS_DECL(wlan);
-ACTKEYS_DECL(webcam);
-ACTKEYS_DECL(tools);
-ACTKEYS_DECL(search);
-ACTKEYS_DECL(launch);
-ACTKEYS_DECL(explore);
-ACTKEYS_DECL(print);
-ACTKEYS_DECL(media_toggle);
-ACTKEYS_DECL(media_stop);
-ACTKEYS_DECL(media_prev);
-ACTKEYS_DECL(media_next);
-
-static const Key keys[] = {
-	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
-	/* modifier                  key                                function            argument */
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return,                    spawn,              {.v = termcmd} },
-	{ MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,
-                                 XKB_KEY_Return,                    spawn,              {.v = alttermcmd} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_P,                         spawn,              {.v = launchcmd} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_N,                         spawn,              {.v = dispcmd} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_W,                         spawn,              {.v = webcmd} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_E,                         spawn,              {.v = mailcmd} },
-	{ MODKEY,                    XKB_KEY_b,                         togglebar,          {0}},
-	{ MODKEY,                    XKB_KEY_j,                         focusstack,         {.i = +1} },
-	{ MODKEY,                    XKB_KEY_k,                         focusstack,         {.i = -1} },
-	{ MODKEY,                    XKB_KEY_i,                         incnmaster,         {.i = +1} },
-	{ MODKEY,                    XKB_KEY_d,                         incnmaster,         {.i = -1} },
-	{ MODKEY,                    XKB_KEY_h,                         setmfact,           {.f = -0.05f} },
-	{ MODKEY,                    XKB_KEY_l,                         setmfact,           {.f = +0.05f} },
-	{ MODKEY,                    XKB_KEY_Return,                    zoom,               {0} },
-	{ MODKEY,                    XKB_KEY_Tab,                       view,               {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,                         killclient,         {0} },
-	{ MODKEY,                    XKB_KEY_t,                         setlayout,          {.v = &layouts[0]} },
-	{ MODKEY,                    XKB_KEY_f,                         setlayout,          {.v = &layouts[1]} },
-	{ MODKEY,                    XKB_KEY_m,                         setlayout,          {.v = &layouts[2]} },
-	{ MODKEY,                    XKB_KEY_space,                     setlayout,          {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,                     togglefloating,     {0} },
-	{ MODKEY,                    XKB_KEY_e,                         togglefullscreen,
-                                                                                        {0} },
-	{ MODKEY,                    XKB_KEY_0,                         view,               {.ui = ~0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright,                tag,                {.ui = ~0} },
-	{ MODKEY,                    XKB_KEY_comma,                     focusmon,           {.i = WLR_DIRECTION_LEFT} },
-	{ MODKEY,                    XKB_KEY_period,                    focusmon,           {.i = WLR_DIRECTION_RIGHT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,                      tagmon,             {.i = WLR_DIRECTION_LEFT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,                   tagmon,             {.i = WLR_DIRECTION_RIGHT} },
-	{ MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT, XKB_KEY_Q,       quit,               {0} },
-	{ MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT, XKB_KEY_L,       spawn,              {.v = lockcmd} },
-	{ WLR_MODIFIER_LOGO, XKB_KEY_l,                                 spawn,              {.v = lockcmd } },
-	{ WLR_MODIFIER_LOGO, XKB_KEY_p,                                 spawn,              {.v = key_cmd_disp } },
-
-	/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
-	{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server,  quit,               {0} },
-
-    /* Media control keys without device specific action buttons */
-	{ WLR_MODIFIER_LOGO, XKB_KEY_space,                             spawn,              {.v = key_cmd_media_toggle } },
-	{ WLR_MODIFIER_LOGO, XKB_KEY_s,                                 spawn,              {.v = key_cmd_media_stop } },
-	{ WLR_MODIFIER_LOGO, XKB_KEY_period,                            spawn,              {.v = key_cmd_media_next } },
-	{ WLR_MODIFIER_LOGO, XKB_KEY_comma,                             spawn,              {.v = key_cmd_media_prev } },
-	{ WLR_MODIFIER_LOGO, XKB_KEY_a,                                 spawn,              {.v = key_cmd_vol_mute } },
-	{ WLR_MODIFIER_LOGO, XKB_KEY_z,                                 spawn,              {.v = key_cmd_vol_lower } },
-	{ WLR_MODIFIER_LOGO, XKB_KEY_q,                                 spawn,              {.v = key_cmd_vol_raise } },
-
-	/* Action buttons */
-	ACTKEYS_MAP(XKB_KEY_XF86AudioMute,                              vol_mute),
-	ACTKEYS_MAP(XKB_KEY_XF86AudioLowerVolume,                       vol_lower),
-	ACTKEYS_MAP(XKB_KEY_XF86AudioRaiseVolume,                       vol_raise),
-	ACTKEYS_MAP(XKB_KEY_XF86AudioMicMute,                           mic_mute),
-	ACTKEYS_MAP(XKB_KEY_XF86MonBrightnessDown,                      bright_low),
-	ACTKEYS_MAP(XKB_KEY_XF86MonBrightnessUp,                        bright_high),
-	ACTKEYS_MAP(XKB_KEY_XF86Display,                                disp),
-	ACTKEYS_MAP(XKB_KEY_XF86WLAN,                                   wlan),
-	ACTKEYS_MAP(XKB_KEY_XF86WebCam,                                 webcam),
-	ACTKEYS_MAP(XKB_KEY_XF86Tools,                                  tools),
-	ACTKEYS_MAP(XKB_KEY_XF86Search,                                 search),
-	ACTKEYS_MAP(XKB_KEY_XF86LaunchA,                                launch),
-	ACTKEYS_MAP(XKB_KEY_XF86Explorer,                               explore),
-	ACTKEYS_MAP(XKB_KEY_Print,                                      print),
-	ACTKEYS_MAP(XKB_KEY_XF86AudioPlay,                              media_toggle),
-	ACTKEYS_MAP(XKB_KEY_XF86AudioStop,                              media_stop),
-	ACTKEYS_MAP(XKB_KEY_XF86AudioPrev,                              media_prev),
-	ACTKEYS_MAP(XKB_KEY_XF86AudioNext,                              media_next),
-	/* { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      toggle_touch_input_device,
-                                                                    {0} },*/
-	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                    0),
-	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                        1),
-	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                2),
-	TAGKEYS(          XKB_KEY_4, XKB_KEY_dollar,                    3),
-	TAGKEYS(          XKB_KEY_5, XKB_KEY_percent,                   4),
-	TAGKEYS(          XKB_KEY_6, XKB_KEY_asciicircum,               5),
-	TAGKEYS(          XKB_KEY_7, XKB_KEY_ampersand,                 6),
-	TAGKEYS(          XKB_KEY_8, XKB_KEY_asterisk,                  7),
-	TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                 8),
-
-	/* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is
-	 * do not remove them.
-	 */
-#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
-	CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
-	CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
-};
-
-static const Button buttons[] = {
-	{ MODKEY, BTN_LEFT,   moveresize,     {.ui = CurMove} },
-	{ MODKEY, BTN_MIDDLE, togglefloating, {0} },
-	{ MODKEY, BTN_RIGHT,  moveresize,     {.ui = CurResize} },
-};
--- a/dwl.1
+++ b/dwl.1
@ -7,7 +7,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl v
-.Op Fl d
 .Op Fl s Ar startup command
 .Sh DESCRIPTION
 .Nm
@ -23,12 +22,6 @@ option,
 writes its name and version to standard error and exits unsuccessfully.
 .Pp
 When given the
-.Fl d
-option,
-.Nm
-enables full wlroots logging, including debug information.
-.Pp
-When given the
 .Fl s
 option,
 .Nm
@ -55,10 +48,10 @@ Move window to a single tag.
 Toggle tag for window.
 .It Mod-p
 Spawn
-.Nm wmenu-run .
+.Nm bemenu-run .
 .It Mod-Shift-Return
 Spawn
-.Nm foot .
+.Nm alacritty .
 .It Mod-[jk]
 Move focus down/up the stack.
 .It Mod-[id]
@ -108,7 +101,7 @@ These environment variables are used by
 A directory where temporary user files, such as the Wayland socket,
 are stored.
 .It Ev XDG_CONFIG_DIR
-A directory containing configuration of various programs and
+A directory containung configuration of various programs and
 libraries, including libxkbcommon.
 .It Ev DISPLAY , WAYLAND_DISPLAY , WAYLAND_SOCKET
 Tell how to connect to an underlying X11 or Wayland server.
@ -140,10 +133,10 @@ server.
 Start
 .Nm
 with s6 in the background:
-.Dl dwl \-s \(aqs6\-svscan <&\-\(aq
+.Dl dwl -s 's6-svscan <&-'
 .Sh SEE ALSO
-.Xr foot 1 ,
-.Xr wmenu 1 ,
+.Xr alacritty 1 ,
+.Xr bemenu 1 ,
 .Xr dwm 1 ,
 .Xr xkeyboard-config 7
 .Sh CAVEATS
--- a/dwl.c
+++ b/dwl.c
--- a/dwl.desktop
+++ b/dwl.desktop
@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=dwl
-Comment=dwm for Wayland
-Exec=dwl
-Type=Application
--- a/ipc-v2-fixed.patch
+++ b/ipc-v2-fixed.patch
@ -1,575 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5320e42..c13557c 100644
--- a/Makefile
-+++ b/Makefile
-@@ -14,10 +14,11 @@ DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CF
- LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS)
- 
- all: dwl
-dwl: dwl.o util.o
-	$(CC) dwl.o util.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
-dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h
-+dwl: dwl.o util.o dwl-ipc-unstable-v2-protocol.o
-+	$(CC) dwl.o util.o dwl-ipc-unstable-v2-protocol.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
-+dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h dwl-ipc-unstable-v2-protocol.h
- util.o: util.c util.h
-+dwl-ipc-unstable-v2-protocol.o: dwl-ipc-unstable-v2-protocol.h
- 
- # wayland-scanner is a tool which generates C headers and rigging for Wayland
- # protocols, which are specified in XML. wlroots requires you to rig these up
-@@ -31,6 +32,12 @@ xdg-shell-protocol.h:
- wlr-layer-shell-unstable-v1-protocol.h:
- 	$(WAYLAND_SCANNER) server-header \
- 		protocols/wlr-layer-shell-unstable-v1.xml $@
-+dwl-ipc-unstable-v2-protocol.h:
-+	$(WAYLAND_SCANNER) server-header \
-+		protocols/dwl-ipc-unstable-v2.xml $@
-+dwl-ipc-unstable-v2-protocol.c:
-+	$(WAYLAND_SCANNER) private-code \
-+		protocols/dwl-ipc-unstable-v2.xml $@
- 
- config.h:
- 	cp config.def.h $@
-diff --git a/config.def.h b/config.def.h
-index 4e30885..f285840 100644
--- a/config.def.h
-+++ b/config.def.h
-@@ -120,6 +120,7 @@ static const Key keys[] = {
- 	/* modifier                  key                 function        argument */
- 	{ MODKEY,                    XKB_KEY_p,          spawn,          {.v = menucmd} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return,     spawn,          {.v = termcmd} },
-+	{ MODKEY,                    XKB_KEY_b,          togglebar,      {0}},
- 	{ MODKEY,                    XKB_KEY_j,          focusstack,     {.i = +1} },
- 	{ MODKEY,                    XKB_KEY_k,          focusstack,     {.i = -1} },
- 	{ MODKEY,                    XKB_KEY_i,          incnmaster,     {.i = +1} },
-diff --git a/dwl.c b/dwl.c
-index a7d41b0..e507e31 100644
--- a/dwl.c
-+++ b/dwl.c
-@@ -58,6 +58,7 @@
- #include <xcb/xcb_icccm.h>
- #endif
- 
-+#include "dwl-ipc-unstable-v2-protocol.h"
- #include "util.h"
- 
- /* macros */
-@@ -128,6 +129,12 @@ typedef struct {
- 	uint32_t resize; /* configure serial of a pending resize */
- } Client;
- 
-+typedef struct {
-+	struct wl_list link;
-+	struct wl_resource *resource;
-+	Monitor *mon;
-+} DwlIpcOutput;
-+
- typedef struct {
- 	uint32_t mod;
- 	xkb_keysym_t keysym;
-@@ -174,6 +181,7 @@ typedef struct {
- 
- struct Monitor {
- 	struct wl_list link;
-+	struct wl_list dwl_ipc_outputs;
- 	struct wlr_output *wlr_output;
- 	struct wlr_scene_output *scene_output;
- 	struct wlr_scene_rect *fullscreen_bg; /* See createmon() for info */
-@@ -255,6 +263,17 @@ static void destroynotify(struct wl_listener *listener, void *data);
- static void destroysessionlock(struct wl_listener *listener, void *data);
- static void destroysessionmgr(struct wl_listener *listener, void *data);
- static Monitor *dirtomon(enum wlr_direction dir);
-+static void dwl_ipc_manager_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id);
-+static void dwl_ipc_manager_destroy(struct wl_resource *resource);
-+static void dwl_ipc_manager_get_output(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *output);
-+static void dwl_ipc_manager_release(struct wl_client *client, struct wl_resource *resource);
-+static void dwl_ipc_output_destroy(struct wl_resource *resource);
-+static void dwl_ipc_output_printstatus(Monitor *monitor);
-+static void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output);
-+static void dwl_ipc_output_set_client_tags(struct wl_client *client, struct wl_resource *resource, uint32_t and_tags, uint32_t xor_tags);
-+static void dwl_ipc_output_set_layout(struct wl_client *client, struct wl_resource *resource, uint32_t index);
-+static void dwl_ipc_output_set_tags(struct wl_client *client, struct wl_resource *resource, uint32_t tagmask, uint32_t toggle_tagset);
-+static void dwl_ipc_output_release(struct wl_client *client, struct wl_resource *resource);
- static void focusclient(Client *c, int lift);
- static void focusmon(const Arg *arg);
- static void focusstack(const Arg *arg);
-@@ -302,6 +321,7 @@ static void startdrag(struct wl_listener *listener, void *data);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
- static void tile(Monitor *m);
-+static void togglebar(const Arg *arg);
- static void togglefloating(const Arg *arg);
- static void togglefullscreen(const Arg *arg);
- static void toggletag(const Arg *arg);
-@@ -374,6 +394,8 @@ static struct wl_listener cursor_frame = {.notify = cursorframe};
- static struct wl_listener cursor_motion = {.notify = motionrelative};
- static struct wl_listener cursor_motion_absolute = {.notify = motionabsolute};
- static struct wl_listener drag_icon_destroy = {.notify = destroydragicon};
-+static struct zdwl_ipc_manager_v2_interface dwl_manager_implementation = {.release = dwl_ipc_manager_release, .get_output = dwl_ipc_manager_get_output};
-+static struct zdwl_ipc_output_v2_interface dwl_output_implementation = {.release = dwl_ipc_output_release, .set_tags = dwl_ipc_output_set_tags, .set_layout = dwl_ipc_output_set_layout, .set_client_tags = dwl_ipc_output_set_client_tags};
- static struct wl_listener idle_inhibitor_create = {.notify = createidleinhibitor};
- static struct wl_listener idle_inhibitor_destroy = {.notify = destroyidleinhibitor};
- static struct wl_listener layout_change = {.notify = updatemons};
-@@ -691,6 +713,9 @@ cleanupmon(struct wl_listener *listener, void *data)
- 	LayerSurface *l, *tmp;
- 	int i;
- 
-+	DwlIpcOutput *ipc_output, *ipc_output_tmp;
-+	wl_list_for_each_safe(ipc_output, ipc_output_tmp, &m->dwl_ipc_outputs, link)
-+		wl_resource_destroy(ipc_output->resource);
- 	for (i = 0; i <= ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY; i++)
- 		wl_list_for_each_safe(l, tmp, &m->layers[i], link)
- 			wlr_layer_surface_v1_destroy(l->layer_surface);
-@@ -902,6 +927,7 @@ createmon(struct wl_listener *listener, void *data)
- 	Monitor *m = wlr_output->data = ecalloc(1, sizeof(*m));
- 	m->wlr_output = wlr_output;
- 
-+	wl_list_init(&m->dwl_ipc_outputs);
- 	wlr_output_init_render(wlr_output, alloc, drw);
- 
- 	/* Initialize monitor state using configured rules */
-@@ -1195,6 +1221,190 @@ dirtomon(enum wlr_direction dir)
- 	return selmon;
- }
- 
-+void
-+dwl_ipc_manager_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id)
-+{
-+	struct wl_resource *manager_resource = wl_resource_create(client, &zdwl_ipc_manager_v2_interface, version, id);
-+	if (!manager_resource) {
-+		wl_client_post_no_memory(client);
-+		return;
-+	}
-+	wl_resource_set_implementation(manager_resource, &dwl_manager_implementation, NULL, dwl_ipc_manager_destroy);
-+
-+	zdwl_ipc_manager_v2_send_tags(manager_resource, TAGCOUNT);
-+
-+	for (int i = 0; i < LENGTH(layouts); i++)
-+		zdwl_ipc_manager_v2_send_layout(manager_resource, layouts[i].symbol);
-+}
-+
-+void
-+dwl_ipc_manager_destroy(struct wl_resource *resource)
-+{
-+	/* No state to destroy */
-+}
-+
-+void
-+dwl_ipc_manager_get_output(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *output)
-+{
-+	DwlIpcOutput *ipc_output;
-+	Monitor *monitor = wlr_output_from_resource(output)->data;
-+	struct wl_resource *output_resource = wl_resource_create(client, &zdwl_ipc_output_v2_interface, wl_resource_get_version(resource), id);
-+	if (!output_resource)
-+		return;
-+
-+	ipc_output = ecalloc(1, sizeof(*ipc_output));
-+	ipc_output->resource = output_resource;
-+	ipc_output->mon = monitor;
-+	wl_resource_set_implementation(output_resource, &dwl_output_implementation, ipc_output, dwl_ipc_output_destroy);
-+	wl_list_insert(&monitor->dwl_ipc_outputs, &ipc_output->link);
-+	dwl_ipc_output_printstatus_to(ipc_output);
-+}
-+
-+void
-+dwl_ipc_manager_release(struct wl_client *client, struct wl_resource *resource)
-+{
-+	wl_resource_destroy(resource);
-+}
-+
-+static void
-+dwl_ipc_output_destroy(struct wl_resource *resource)
-+{
-+	DwlIpcOutput *ipc_output = wl_resource_get_user_data(resource);
-+	wl_list_remove(&ipc_output->link);
-+	free(ipc_output);
-+}
-+
-+void
-+dwl_ipc_output_printstatus(Monitor *monitor)
-+{
-+	DwlIpcOutput *ipc_output;
-+	wl_list_for_each(ipc_output, &monitor->dwl_ipc_outputs, link)
-+		dwl_ipc_output_printstatus_to(ipc_output);
-+}
-+
-+void
-+dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output)
-+{
-+	Monitor *monitor = ipc_output->mon;
-+	Client *c, *focused;
-+	int tagmask, state, numclients, focused_client, tag;
-+	const char *title, *appid;
-+	focused = focustop(monitor);
-+	zdwl_ipc_output_v2_send_active(ipc_output->resource, monitor == selmon);
-+
-+	for (tag = 0 ; tag < TAGCOUNT; tag++) {
-+		numclients = state = focused_client = 0;
-+		tagmask = 1 << tag;
-+		if ((tagmask & monitor->tagset[monitor->seltags]) != 0)
-+			state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
-+
-+		wl_list_for_each(c, &clients, link) {
-+			if (c->mon != monitor)
-+				continue;
-+			if (!(c->tags & tagmask))
-+				continue;
-+			if (c == focused)
-+				focused_client = 1;
-+			if (c->isurgent)
-+				state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT;
-+
-+			numclients++;
-+		}
-+		zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state, numclients, focused_client);
-+	}
-+	title = focused ? client_get_title(focused) : "";
-+	appid = focused ? client_get_appid(focused) : "";
-+
-+	zdwl_ipc_output_v2_send_layout(ipc_output->resource, monitor->lt[monitor->sellt] - layouts);
-+	zdwl_ipc_output_v2_send_title(ipc_output->resource, title ? title : broken);
-+	zdwl_ipc_output_v2_send_appid(ipc_output->resource, appid ? appid : broken);
-+	zdwl_ipc_output_v2_send_layout_symbol(ipc_output->resource, monitor->ltsymbol);
-+	if (wl_resource_get_version(ipc_output->resource) >= ZDWL_IPC_OUTPUT_V2_FULLSCREEN_SINCE_VERSION) {
-+		zdwl_ipc_output_v2_send_fullscreen(ipc_output->resource, focused ? focused->isfullscreen : 0);
-+	}
-+	if (wl_resource_get_version(ipc_output->resource) >= ZDWL_IPC_OUTPUT_V2_FLOATING_SINCE_VERSION) {
-+		zdwl_ipc_output_v2_send_floating(ipc_output->resource, focused ? focused->isfloating : 0);
-+	}
-+	zdwl_ipc_output_v2_send_frame(ipc_output->resource);
-+}
-+
-+void
-+dwl_ipc_output_set_client_tags(struct wl_client *client, struct wl_resource *resource, uint32_t and_tags, uint32_t xor_tags)
-+{
-+	DwlIpcOutput *ipc_output;
-+	Monitor *monitor;
-+	Client *selected_client;
-+	unsigned int newtags = 0;
-+
-+	ipc_output = wl_resource_get_user_data(resource);
-+	if (!ipc_output)
-+		return;
-+
-+	monitor = ipc_output->mon;
-+	selected_client = focustop(monitor);
-+	if (!selected_client)
-+		return;
-+
-+	newtags = (selected_client->tags & and_tags) ^ xor_tags;
-+	if (!newtags)
-+		return;
-+
-+	selected_client->tags = newtags;
-+	focusclient(focustop(selmon), 1);
-+	arrange(selmon);
-+	printstatus();
-+}
-+
-+void
-+dwl_ipc_output_set_layout(struct wl_client *client, struct wl_resource *resource, uint32_t index)
-+{
-+	DwlIpcOutput *ipc_output;
-+	Monitor *monitor;
-+
-+	ipc_output = wl_resource_get_user_data(resource);
-+	if (!ipc_output)
-+		return;
-+
-+	monitor = ipc_output->mon;
-+	if (index >= LENGTH(layouts))
-+		return;
-+	if (index != monitor->lt[monitor->sellt] - layouts)
-+		monitor->sellt ^= 1;
-+
-+	monitor->lt[monitor->sellt] = &layouts[index];
-+	arrange(monitor);
-+	printstatus();
-+}
-+
-+void
-+dwl_ipc_output_set_tags(struct wl_client *client, struct wl_resource *resource, uint32_t tagmask, uint32_t toggle_tagset)
-+{
-+	DwlIpcOutput *ipc_output;
-+	Monitor *monitor;
-+	unsigned int newtags = tagmask & TAGMASK;
-+
-+	ipc_output = wl_resource_get_user_data(resource);
-+	if (!ipc_output)
-+		return;
-+	monitor = ipc_output->mon;
-+
-+	if (!newtags || newtags == monitor->tagset[monitor->seltags])
-+		return;
-+	if (toggle_tagset)
-+		monitor->seltags ^= 1;
-+
-+	monitor->tagset[monitor->seltags] = newtags;
-+	focusclient(focustop(monitor), 1);
-+	arrange(monitor);
-+	printstatus();
-+}
-+
-+void
-+dwl_ipc_output_release(struct wl_client *client, struct wl_resource *resource)
-+{
-+	wl_resource_destroy(resource);
-+}
-+
- void
- focusclient(Client *c, int lift)
- {
-@@ -1846,41 +2056,9 @@ void
- printstatus(void)
- {
- 	Monitor *m = NULL;
-	Client *c;
-	uint32_t occ, urg, sel;
-	const char *appid, *title;
- 
-	wl_list_for_each(m, &mons, link) {
-		occ = urg = 0;
-		wl_list_for_each(c, &clients, link) {
-			if (c->mon != m)
-				continue;
-			occ |= c->tags;
-			if (c->isurgent)
-				urg |= c->tags;
-		}
-		if ((c = focustop(m))) {
-			title = client_get_title(c);
-			appid = client_get_appid(c);
-			printf("%s title %s\n", m->wlr_output->name, title ? title : broken);
-			printf("%s appid %s\n", m->wlr_output->name, appid ? appid : broken);
-			printf("%s fullscreen %u\n", m->wlr_output->name, c->isfullscreen);
-			printf("%s floating %u\n", m->wlr_output->name, c->isfloating);
-			sel = c->tags;
-		} else {
-			printf("%s title \n", m->wlr_output->name);
-			printf("%s appid \n", m->wlr_output->name);
-			printf("%s fullscreen \n", m->wlr_output->name);
-			printf("%s floating \n", m->wlr_output->name);
-			sel = 0;
-		}
-
-		printf("%s selmon %u\n", m->wlr_output->name, m == selmon);
-		printf("%s tags %u %u %u %u\n", m->wlr_output->name, occ, m->tagset[m->seltags],
-				sel, urg);
-		printf("%s layout %s\n", m->wlr_output->name, m->ltsymbol);
-	}
-	fflush(stdout);
-+	wl_list_for_each(m, &mons, link)
-+		dwl_ipc_output_printstatus(m);
- }
- 
- void
-@@ -2295,6 +2473,7 @@ setup(void)
- 	wl_signal_add(&output_mgr->events.test, &output_mgr_test);
- 
- 	wlr_scene_set_presentation(scene, wlr_presentation_create(dpy, backend));
-+	wl_global_create(dpy, &zdwl_ipc_manager_v2_interface, 2, NULL, dwl_ipc_manager_bind);
- 
- #ifdef XWAYLAND
- 	/*
-@@ -2389,6 +2568,13 @@ tile(Monitor *m)
- 	}
- }
- 
-+void
-+togglebar(const Arg *arg) {
-+	DwlIpcOutput *ipc_output;
-+	wl_list_for_each(ipc_output, &selmon->dwl_ipc_outputs, link)
-+		zdwl_ipc_output_v2_send_toggle_visibility(ipc_output->resource);
-+}
-+
- void
- togglefloating(const Arg *arg)
- {
-diff --git a/protocols/dwl-ipc-unstable-v2.xml b/protocols/dwl-ipc-unstable-v2.xml
-new file mode 100644
-index 0000000..0a6e7e5
--- /dev/null
-+++ b/protocols/dwl-ipc-unstable-v2.xml
-@@ -0,0 +1,181 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+This is largely ripped from somebar's ipc patchset; just with some personal modifications.
-+I would probably just submit raphi's patchset but I don't think that would be polite.
-+-->
-+<protocol name="dwl_ipc_unstable_v2">
-+  <description summary="inter-proccess-communication about dwl's state">
-+      This protocol allows clients to update and get updates from dwl.
-+
-+      Warning! The protocol described in this file is experimental and
-+      backward incompatible changes may be made. Backward compatible
-+      changes may be added together with the corresponding interface
-+      version bump.
-+      Backward incompatible changes are done by bumping the version
-+      number in the protocol and interface names and resetting the
-+      interface version. Once the protocol is to be declared stable,
-+      the 'z' prefix and the version number in the protocol and
-+      interface names are removed and the interface version number is
-+      reset.
-+  </description>
-+
-+  <interface name="zdwl_ipc_manager_v2" version="2">
-+    <description summary="manage dwl state">
-+      This interface is exposed as a global in wl_registry.
-+
-+      Clients can use this interface to get a dwl_ipc_output.
-+      After binding the client will recieve the dwl_ipc_manager.tags and dwl_ipc_manager.layout events.
-+      The dwl_ipc_manager.tags and dwl_ipc_manager.layout events expose tags and layouts to the client.
-+    </description>
-+
-+    <request name="release" type="destructor">
-+      <description summary="release dwl_ipc_manager">
-+        Indicates that the client will not the dwl_ipc_manager object anymore.
-+        Objects created through this instance are not affected.
-+      </description>
-+    </request>
-+
-+    <request name="get_output">
-+      <description summary="get a dwl_ipc_outout for a wl_output">
-+        Get a dwl_ipc_outout for the specified wl_output.
-+      </description>
-+      <arg name="id" type="new_id" interface="zdwl_ipc_output_v2"/>
-+      <arg name="output" type="object" interface="wl_output"/>
-+    </request>
-+
-+    <event name="tags">
-+      <description summary="Announces tag amount">
-+        This event is sent after binding.
-+        A roundtrip after binding guarantees the client recieved all tags.
-+      </description>
-+      <arg name="amount" type="uint"/>
-+    </event>
-+
-+    <event name="layout">
-+      <description summary="Announces a layout">
-+        This event is sent after binding.
-+        A roundtrip after binding guarantees the client recieved all layouts.
-+      </description>
-+      <arg name="name" type="string"/>
-+    </event>
-+  </interface>
-+
-+  <interface name="zdwl_ipc_output_v2" version="2">
-+    <description summary="control dwl output">
-+      Observe and control a dwl output.
-+
-+      Events are double-buffered:
-+      Clients should cache events and redraw when a dwl_ipc_output.frame event is sent.
-+
-+      Request are not double-buffered:
-+      The compositor will update immediately upon request.
-+    </description>
-+
-+    <enum name="tag_state">
-+      <entry name="none" value="0" summary="no state"/>
-+      <entry name="active" value="1" summary="tag is active"/>
-+      <entry name="urgent" value="2" summary="tag has at least one urgent client"/>
-+    </enum>
-+
-+    <request name="release" type="destructor">
-+      <description summary="release dwl_ipc_outout">
-+        Indicates to that the client no longer needs this dwl_ipc_output.
-+      </description>
-+    </request>
-+
-+    <event name="toggle_visibility">
-+      <description summary="Toggle client visibilty">
-+        Indicates the client should hide or show themselves.
-+        If the client is visible then hide, if hidden then show.
-+      </description>
-+    </event>
-+
-+    <event name="active">
-+      <description summary="Update the selected output.">
-+        Indicates if the output is active. Zero is invalid, nonzero is valid.
-+      </description>
-+      <arg name="active" type="uint"/>
-+    </event>
-+
-+    <event name="tag">
-+      <description summary="Update the state of a tag.">
-+        Indicates that a tag has been updated.
-+      </description>
-+      <arg name="tag" type="uint" summary="Index of the tag"/>
-+      <arg name="state" type="uint" enum="tag_state" summary="The state of the tag."/>
-+      <arg name="clients" type="uint" summary="The number of clients in the tag."/>
-+      <arg name="focused" type="uint" summary="If there is a focused client. Nonzero being valid, zero being invalid."/>
-+    </event>
-+
-+    <event name="layout">
-+      <description summary="Update the layout.">
-+        Indicates a new layout is selected.
-+      </description>
-+      <arg name="layout" type="uint" summary="Index of the layout."/>
-+    </event>
-+
-+    <event name="title">
-+      <description summary="Update the title.">
-+        Indicates the title has changed.
-+      </description>
-+      <arg name="title" type="string" summary="The new title name."/>
-+    </event>
-+
-+    <event name="appid" since="1">
-+      <description summary="Update the appid.">
-+        Indicates the appid has changed.
-+      </description>
-+      <arg name="appid" type="string" summary="The new appid."/>
-+    </event>
-+
-+    <event name="layout_symbol" since="1">
-+      <description summary="Update the current layout symbol">
-+          Indicates the layout has changed. Since layout symbols are dynamic.
-+          As opposed to the zdwl_ipc_manager.layout event, this should take precendence when displaying.
-+          You can ignore the zdwl_ipc_output.layout event.
-+      </description>
-+      <arg name="layout" type="string" summary="The new layout"/>
-+    </event>
-+
-+    <event name="frame">
-+      <description summary="The update sequence is done.">
-+        Indicates that a sequence of status updates have finished and the client should redraw.
-+      </description>
-+    </event>
-+
-+    <request name="set_tags">
-+      <description summary="Set the active tags of this output"/>
-+      <arg name="tagmask" type="uint" summary="bitmask of the tags that should be set."/>
-+      <arg name="toggle_tagset" type="uint" summary="toggle the selected tagset, zero for invalid, nonzero for valid."/>
-+    </request>
-+
-+    <request name="set_client_tags">
-+      <description summary="Set the tags of the focused client.">
-+        The tags are updated as follows:
-+        new_tags = (current_tags AND and_tags) XOR xor_tags
-+      </description>
-+      <arg name="and_tags" type="uint"/>
-+      <arg name="xor_tags" type="uint"/>
-+    </request>
-+
-+    <request name="set_layout">
-+      <description summary="Set the layout of this output"/>
-+      <arg name="index" type="uint" summary="index of a layout recieved by dwl_ipc_manager.layout"/>
-+    </request>
-+
-+    <!-- Version 2 -->
-+    <event name="fullscreen" since="2">
-+      <description summary="Update fullscreen status">
-+          Indicates if the selected client on this output is fullscreen.
-+      </description>
-+      <arg name="is_fullscreen" type="uint" summary="If the selected client is fullscreen. Nonzero is valid, zero invalid"/>
-+    </event>
-+
-+    <event name="floating" since="2">
-+      <description summary="Update the floating status">
-+          Indicates if the selected client on this output is floating.
-+      </description>
-+      <arg name="is_floating" type="uint" summary="If the selected client is floating. Nonzero is valid, zero invalid"/>
-+    </event>
-+  </interface>
-+</protocol>
-
--- a/protocols/dwl-ipc-unstable-v2.xml
+++ b/protocols/dwl-ipc-unstable-v2.xml
@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This is largely ripped from somebar's ipc patchset; just with some personal modifications.
-I would probably just submit raphi's patchset but I don't think that would be polite.
-->
-<protocol name="dwl_ipc_unstable_v2">
-  <description summary="inter-proccess-communication about dwl's state">
-      This protocol allows clients to update and get updates from dwl.
-
-      Warning! The protocol described in this file is experimental and
-      backward incompatible changes may be made. Backward compatible
-      changes may be added together with the corresponding interface
-      version bump.
-      Backward incompatible changes are done by bumping the version
-      number in the protocol and interface names and resetting the
-      interface version. Once the protocol is to be declared stable,
-      the 'z' prefix and the version number in the protocol and
-      interface names are removed and the interface version number is
-      reset.
-  </description>
-
-  <interface name="zdwl_ipc_manager_v2" version="2">
-    <description summary="manage dwl state">
-      This interface is exposed as a global in wl_registry.
-
-      Clients can use this interface to get a dwl_ipc_output.
-      After binding the client will recieve the dwl_ipc_manager.tags and dwl_ipc_manager.layout events.
-      The dwl_ipc_manager.tags and dwl_ipc_manager.layout events expose tags and layouts to the client.
-    </description>
-
-    <request name="release" type="destructor">
-      <description summary="release dwl_ipc_manager">
-        Indicates that the client will not the dwl_ipc_manager object anymore.
-        Objects created through this instance are not affected.
-      </description>
-    </request>
-
-    <request name="get_output">
-      <description summary="get a dwl_ipc_outout for a wl_output">
-        Get a dwl_ipc_outout for the specified wl_output.
-      </description>
-      <arg name="id" type="new_id" interface="zdwl_ipc_output_v2"/>
-      <arg name="output" type="object" interface="wl_output"/>
-    </request>
-
-    <event name="tags">
-      <description summary="Announces tag amount">
-        This event is sent after binding.
-        A roundtrip after binding guarantees the client recieved all tags.
-      </description>
-      <arg name="amount" type="uint"/>
-    </event>
-
-    <event name="layout">
-      <description summary="Announces a layout">
-        This event is sent after binding.
-        A roundtrip after binding guarantees the client recieved all layouts.
-      </description>
-      <arg name="name" type="string"/>
-    </event>
-  </interface>
-
-  <interface name="zdwl_ipc_output_v2" version="2">
-    <description summary="control dwl output">
-      Observe and control a dwl output.
-
-      Events are double-buffered:
-      Clients should cache events and redraw when a dwl_ipc_output.frame event is sent.
-
-      Request are not double-buffered:
-      The compositor will update immediately upon request.
-    </description>
-
-    <enum name="tag_state">
-      <entry name="none" value="0" summary="no state"/>
-      <entry name="active" value="1" summary="tag is active"/>
-      <entry name="urgent" value="2" summary="tag has at least one urgent client"/>
-    </enum>
-
-    <request name="release" type="destructor">
-      <description summary="release dwl_ipc_outout">
-        Indicates to that the client no longer needs this dwl_ipc_output.
-      </description>
-    </request>
-
-    <event name="toggle_visibility">
-      <description summary="Toggle client visibilty">
-        Indicates the client should hide or show themselves.
-        If the client is visible then hide, if hidden then show.
-      </description>
-    </event>
-
-    <event name="active">
-      <description summary="Update the selected output.">
-        Indicates if the output is active. Zero is invalid, nonzero is valid.
-      </description>
-      <arg name="active" type="uint"/>
-    </event>
-
-    <event name="tag">
-      <description summary="Update the state of a tag.">
-        Indicates that a tag has been updated.
-      </description>
-      <arg name="tag" type="uint" summary="Index of the tag"/>
-      <arg name="state" type="uint" enum="tag_state" summary="The state of the tag."/>
-      <arg name="clients" type="uint" summary="The number of clients in the tag."/>
-      <arg name="focused" type="uint" summary="If there is a focused client. Nonzero being valid, zero being invalid."/>
-    </event>
-
-    <event name="layout">
-      <description summary="Update the layout.">
-        Indicates a new layout is selected.
-      </description>
-      <arg name="layout" type="uint" summary="Index of the layout."/>
-    </event>
-
-    <event name="title">
-      <description summary="Update the title.">
-        Indicates the title has changed.
-      </description>
-      <arg name="title" type="string" summary="The new title name."/>
-    </event>
-
-    <event name="appid" since="1">
-      <description summary="Update the appid.">
-        Indicates the appid has changed.
-      </description>
-      <arg name="appid" type="string" summary="The new appid."/>
-    </event>
-
-    <event name="layout_symbol" since="1">
-      <description summary="Update the current layout symbol">
-          Indicates the layout has changed. Since layout symbols are dynamic.
-          As opposed to the zdwl_ipc_manager.layout event, this should take precendence when displaying.
-          You can ignore the zdwl_ipc_output.layout event.
-      </description>
-      <arg name="layout" type="string" summary="The new layout"/>
-    </event>
-
-    <event name="frame">
-      <description summary="The update sequence is done.">
-        Indicates that a sequence of status updates have finished and the client should redraw.
-      </description>
-    </event>
-
-    <request name="set_tags">
-      <description summary="Set the active tags of this output"/>
-      <arg name="tagmask" type="uint" summary="bitmask of the tags that should be set."/>
-      <arg name="toggle_tagset" type="uint" summary="toggle the selected tagset, zero for invalid, nonzero for valid."/>
-    </request>
-
-    <request name="set_client_tags">
-      <description summary="Set the tags of the focused client.">
-        The tags are updated as follows:
-        new_tags = (current_tags AND and_tags) XOR xor_tags
-      </description>
-      <arg name="and_tags" type="uint"/>
-      <arg name="xor_tags" type="uint"/>
-    </request>
-
-    <request name="set_layout">
-      <description summary="Set the layout of this output"/>
-      <arg name="index" type="uint" summary="index of a layout recieved by dwl_ipc_manager.layout"/>
-    </request>
-
-    <!-- Version 2 -->
-    <event name="fullscreen" since="2">
-      <description summary="Update fullscreen status">
-          Indicates if the selected client on this output is fullscreen.
-      </description>
-      <arg name="is_fullscreen" type="uint" summary="If the selected client is fullscreen. Nonzero is valid, zero invalid"/>
-    </event>
-
-    <event name="floating" since="2">
-      <description summary="Update the floating status">
-          Indicates if the selected client on this output is floating.
-      </description>
-      <arg name="is_floating" type="uint" summary="If the selected client is floating. Nonzero is valid, zero invalid"/>
-    </event>
-  </interface>
-</protocol>
--- a/protocols/wlr-output-power-management-unstable-v1.xml
+++ b/protocols/wlr-output-power-management-unstable-v1.xml
@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="wlr_output_power_management_unstable_v1">
-  <copyright>
-    Copyright © 2019 Purism SPC
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice (including the next
-    paragraph) shall be included in all copies or substantial portions of the
-    Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-  </copyright>
-
-  <description summary="Control power management modes of outputs">
-    This protocol allows clients to control power management modes
-    of outputs that are currently part of the compositor space. The
-    intent is to allow special clients like desktop shells to power
-    down outputs when the system is idle.
-
-    To modify outputs not currently part of the compositor space see
-    wlr-output-management.
-
-    Warning! The protocol described in this file is experimental and
-    backward incompatible changes may be made. Backward compatible changes
-    may be added together with the corresponding interface version bump.
-    Backward incompatible changes are done by bumping the version number in
-    the protocol and interface names and resetting the interface version.
-    Once the protocol is to be declared stable, the 'z' prefix and the
-    version number in the protocol and interface names are removed and the
-    interface version number is reset.
-  </description>
-
-  <interface name="zwlr_output_power_manager_v1" version="1">
-    <description summary="manager to create per-output power management">
-      This interface is a manager that allows creating per-output power
-      management mode controls.
-    </description>
-
-    <request name="get_output_power">
-      <description summary="get a power management for an output">
-        Create a output power management mode control that can be used to
-        adjust the power management mode for a given output.
-      </description>
-      <arg name="id" type="new_id" interface="zwlr_output_power_v1"/>
-      <arg name="output" type="object" interface="wl_output"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the manager">
-        All objects created by the manager will still remain valid, until their
-        appropriate destroy request has been called.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="zwlr_output_power_v1" version="1">
-    <description summary="adjust power management mode for an output">
-      This object offers requests to set the power management mode of
-      an output.
-    </description>
-
-    <enum name="mode">
-      <entry name="off" value="0"
-             summary="Output is turned off."/>
-      <entry name="on" value="1"
-             summary="Output is turned on, no power saving"/>
-    </enum>
-
-    <enum name="error">
-      <entry name="invalid_mode" value="1" summary="inexistent power save mode"/>
-    </enum>
-
-    <request name="set_mode">
-      <description summary="Set an outputs power save mode">
-        Set an output's power save mode to the given mode. The mode change
-        is effective immediately. If the output does not support the given
-        mode a failed event is sent.
-      </description>
-      <arg name="mode" type="uint" enum="mode" summary="the power save mode to set"/>
-    </request>
-
-    <event name="mode">
-      <description summary="Report a power management mode change">
-        Report the power management mode change of an output.
-
-        The mode event is sent after an output changed its power
-        management mode. The reason can be a client using set_mode or the
-        compositor deciding to change an output's mode.
-        This event is also sent immediately when the object is created
-        so the client is informed about the current power management mode.
-      </description>
-      <arg name="mode" type="uint" enum="mode"
-           summary="the output's new power management mode"/>
-    </event>
-
-    <event name="failed">
-      <description summary="object no longer valid">
-        This event indicates that the output power management mode control
-        is no longer valid. This can happen for a number of reasons,
-        including:
-        - The output doesn't support power management
-        - Another client already has exclusive power management mode control
-          for this output
-        - The output disappeared
-
-        Upon receiving this event, the client should destroy this object.
-      </description>
-    </event>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy this power management">
-        Destroys the output power management mode control object.
-      </description>
-    </request>
-  </interface>
-</protocol>
--- a/util.c
+++ b/util.c
@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>

 #include "util.h"

@ -34,18 +33,3 @@ ecalloc(size_t nmemb, size_t size)
 		die("calloc:");
 	return p;
 }
-
-int
-fd_set_nonblock(int fd) {
-	int flags = fcntl(fd, F_GETFL);
-	if (flags < 0) {
-		perror("fcntl(F_GETFL):");
-		return -1;
-	}
-	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
-		perror("fcntl(F_SETFL):");
-		return -1;
-	}
-
-	return 0;
-}
--- a/util.h
+++ b/util.h
@ -2,4 +2,3 @@

 void die(const char *fmt, ...);
 void *ecalloc(size_t nmemb, size_t size);
-int fd_set_nonblock(int fd);