Merge updates from guidocella

Thanks so much for helping to keep the project running while life was
crazy!

Makefile

@@ -1,6 +1,6 @@
 include config.mk
 
-CFLAGS += -I. -DWLR_USE_UNSTABLE -std=c99 -Werror=declaration-after-statement
+CFLAGS += -I. -DWLR_USE_UNSTABLE -std=c99
 
 WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols)
 WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner)
@@ -33,12 +33,22 @@ wlr-layer-shell-unstable-v1-protocol.c:
 
 wlr-layer-shell-unstable-v1-protocol.o: wlr-layer-shell-unstable-v1-protocol.h
 
+idle-protocol.h:
+	$(WAYLAND_SCANNER) server-header \
+		protocols/idle.xml $@
+
+idle-protocol.c:
+	$(WAYLAND_SCANNER) private-code \
+		protocols/idle.xml $@
+
+idle-protocol.o: idle-protocol.h
+
 config.h: | config.def.h
 	cp config.def.h $@
 
-dwl.o: config.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h
+dwl.o: config.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h idle-protocol.h
 
-dwl: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o
+dwl: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o idle-protocol.o
 
 clean:
 	rm -f dwl *.o *-protocol.h *-protocol.c

README.md

@@ -1,71 +1,77 @@
 # dwl - dwm for Wayland
 
-dwl is a compact, hackable compositor for Wayland based on [wlroots](https://github.com/swaywm/wlroots).  It is intended to fill the same space in the Wayland world that dwm does in X11, primarily in terms of philosophy, and secondarily in terms of functionality.  Like dwm, dwl is:
+dwl is a compact, hackable compositor for Wayland based on [wlroots](https://github.com/swaywm/wlroots). It is intended to fill the same space in the Wayland world that dwm does in X11, 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 2000 SLOC to promote hackability
 - Tied to as few external dependencies as possible
 
+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:
 
-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.  Since wlroots provides a number of features that are more complicated to accomplish with Xlib and select extensions, dwl can be in some ways more featureful than dwm *while remaining just as simple.*  Intended default features are:
-
-- Any features provided by dwm/Xlib: simple window borders, tags, keybindings, client rules, mouse move/resize (see below for why the built-in status bar is a possible exception)
+- Any features provided by dwm/Xlib: simple window borders, tags, keybindings, client rules, mouse move/resize. The built-in status bar is an exception to avoid taking a dependency on FreeType or Pango and increasing the SLOC
 - Configurable multi-monitor layout support, including position and rotation
 - Configurable HiDPI/multi-DPI support
-- Wayland protocols needed for daily life in the tiling world: at a minimum, xdg-shell and layer-shell (for bars/menus).  Protocols trivially provided by wlroots may also be added.
+- Various Wayland protocols
 - XWayland support as provided by wlroots
 - Zero flickering - Wayland users naturally expect that "every frame is perfect"
-- Basic yes/no damage tracking to avoid needless redraws (if it can be done simply and has an impact on power consumption)
-
 
-Other features under consideration are:
-
-- Additional Wayland compositor protocols which are trivially provided by wlroots or can be conditionally included via `config.h` settings (e.g. screen capture)
-- External bar support instead of a built-in status bar, to avoid taking a dependency on FreeType or Pango
-- Buffering of input when spawning a client so you don't have to wait for the window (use `wl_client_get_credentials` to get the PID) - would this require passing through something like dmenu?  Extension protocol?
-- More in-depth damage region tracking
+Features yet to be implemented are:
 
+- Write a dwl-status protocol that bars can implement to show tags. You can already use Waybar or yambar, but without tag information
+- Implement the input-inhibitor protocol to support screen lockers
+- Implement the idle-inhibit protocol which the lets application such as mpv disable idle monitoring, and distribute it as a patch
+- Layer shell popups (used by Waybar)
+- Basic yes/no damage tracking to avoid needless redraws
+- More in-depth damage region tracking (this should be worth it according to https://mozillagfx.wordpress.com/2019/10/22/dramatically-reduced-power-usage-in-firefox-70-on-macos-with-core-animation/)
+- 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/12)
+- Implement urgent/attention/focus-request once it's part of the xdg-shell protocol (https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/9)
 
 Feature *non-goals* 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
 
-
 ## Building dwl
 
-dwl has only two dependencies: wlroots (git version currently required) and wayland-protocols.  Simply install these and run `make`.
+dwl has only two dependencies: wlroots 0.12 and wayland-protocols. Simply install these and run `sudo make install`.
 
+To enable XWayland, you should also install xorg-xwayland and uncomment its flag in `config.mk`.
 
 ## Configuration
 
-All configuration is done by editing `config.h` and recompiling, in the same 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.
-
+All configuration is done by editing `config.h` and recompiling, in the same 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.
 
 ## Running dwl
 
-dwl can be run as-is, with no arguments. In an existing Wayland or X11 session, this will open a window to act as a virtual display.  When run from a TTY, the Wayland server will take over the entire virtual terminal.  Clients started by dwl will have `WAYLAND_DISPLAY` set in their environment, and other clients can be started from outside the session by setting this variable accordingly.
+dwl can be run as-is, with no arguments. In an existing Wayland, this will open a window to act as a virtual display. When run from a TTY, the Wayland server will take over the entire virtual terminal. Clients started by dwl will have `WAYLAND_DISPLAY` set in their environment, and other clients can be started from outside the session by setting this variable accordingly.
 
-You can also specify a startup program using the `-s` option.  The argument to this option will be run at startup as a shell command (using `sh -c`) and can serve a similar function to `.xinitrc`: starting a service manager or other startup applications.  Unlike `.xinitrc`, the display server will not shut down when this process terminates.  Instead, as dwl is shutting down, it will send this process a SIGTERM and wait for it to terminate (if it hasn't already).  This makes it ideal not only for initialization but also for execing into a user-level service manager like s6 or `systemd --user`.
+You can also specify a startup program using the `-s` option. The argument to this option will be run at startup as a shell command (using `sh -c`) and can serve a similar function to `.xinitrc`: starting a service manager or other startup applications. Unlike `.xinitrc`, the display server will not shut down when this process terminates. Instead, as dwl is shutting down, it will send this process a SIGTERM and wait for it to terminate (if it hasn't already). This makes it ideal not only for initialization but also for execing into a user-level service manager like s6 or `systemd --user`.
 
 Note: Wayland requires a valid `XDG_RUNTIME_DIR`, which is usually set up by a session manager such as `elogind` or `systemd-logind`.  If your system doesn't do this automatically, you will need to configure it prior to launching `dwl`, e.g.:
 
     export XDG_RUNTIME_DIR=/tmp/xdg-runtime-$(id -u)
     mkdir -p $XDG_RUNTIME_DIR
 
+## Replacements for X applications
 
-## Known limitations and issues
+You can find a [list of Wayland applications on the sway wiki](https://github.com/swaywm/sway/wiki/i3-Migration-Guide).
 
 dwl is a work in progress, and it has not yet reached its feature goals in a number of ways:
 
 - A window's texture is scaled for its "home" monitor only (noticeable when window sits across a monitor boundary)
-- XWayland support is new and could use testing
 - Urgent/attention/focus-request ([not yet supported](https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/9) by xdg-shell protocol)
-- Statusbar support (built-in or external)
 - Damage tracking
 
+## IRC channel
+
+dwl's IRC channel is #dwl on irc.freenode.net.
 
 ## Acknowledgements
 
-dwl began by extending the TinyWL example provided (CC0) by the sway/wlroots developers.  This was made possible in many cases by looking at how sway accomplished something, then trying to do the same in as suckless a way as possible.  Speaking of which, many thanks to suckless.org and the dwm developers and community for the inspiration.
+dwl began by extending the TinyWL example provided (CC0) by the sway/wlroots developers. This was made possible in many cases by looking at how sway accomplished something, then trying to do the same in as suckless a way as possible.
+
+Many thanks to suckless.org and the dwm developers and community for the inspiration, and to the various contributors to the project, including:
+
+- Alexander Courtis for the XWayland implementation
+- Guido Cella for the layer-shell protocol implementation and for helping to keep the project running

config.def.h

@@ -1,5 +1,5 @@
 /* appearance */
-static const int sloppyfocus        = 1;  /* focus follows mouse */
+static const bool sloppyfocus       = true;  /* focus follows mouse */
 static const unsigned int borderpx  = 1;  /* border pixel of windows */
 static const float rootcolor[]      = {0.3, 0.3, 0.3, 1.0};
 static const float bordercolor[]    = {0.5, 0.5, 0.5, 1.0};
@@ -24,7 +24,9 @@ static const Layout layouts[] = {
 	{ "[M]",      monocle },
 };
 
-/* monitors */
+/* monitors
+ * The order in which monitors are defined determines their position.
+ * Non-configured monitors are always added to the left. */
 static const MonitorRule monrules[] = {
 	/* name       mfact nmaster scale layout       rotate/reflect */
 	/* example of a HiDPI laptop monitor:
@@ -42,13 +44,13 @@ static const struct xkb_rule_names xkb_rules = {
 	*/
 };
 
-/* Trackpad */
-int tap_to_click = 1;
-int natural_scrolling = 1;
-
 static const int repeat_rate = 25;
 static const int repeat_delay = 600;
 
+/* Trackpad */
+static const bool tap_to_click = 1;
+static const bool natural_scrolling = 1;
+
 #define MODKEY WLR_MODIFIER_ALT
 #define TAGKEYS(KEY,SKEY,TAG) \
 	{ MODKEY,                    KEY,            view,            {.ui = 1 << TAG} }, \