updated readme

Makefile

@@ -21,7 +21,7 @@ dwl: dwl.o util.o
 	$(CC) dwl.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
 dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \
 	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 wlr-foreign-toplevel-management-unstable-v1-protocol.h
+	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
 util.o: util.c util.h
 
 # wayland-scanner is a tool which generates C headers and rigging for Wayland
@@ -45,9 +45,6 @@ wlr-output-power-management-unstable-v1-protocol.h:
 xdg-shell-protocol.h:
 	$(WAYLAND_SCANNER) server-header \
 		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
-wlr-foreign-toplevel-management-unstable-v1-protocol.h:
-	$(WAYLAND_SCANNER) server-header \
-		protocols/wlr-foreign-toplevel-management-unstable-v1.xml $@
 
 config.h:
 	cp config.def.h $@

README.md

@@ -1,199 +1,77 @@
-# dwl - dwm for Wayland
+# dwl
 
-Join us on our IRC channel: [#dwl on Libera Chat]  
-Or on the community-maintained [Discord server].
+This is my patched version of dwl.
+This belongs to my larbs installation script and depends heavily on its scripts
+and programs.
+It is supposed to work in the environment after the
+[larbs base installation](https://github.com/tiyn/larbs).
+This repository is set up according to the
+[suckless entry of my wiki](https://github.com/tiyn/wiki/blob/master/wiki/linux/suckless.md).
 
-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:
+## Patches
 
-- Easy to understand, hack on, and extend with patches
-- One C source file (or a very small number) configurable via `config.h`
-- Tied to as few external dependencies as possible
+The list below shows the currently applied patches to the master branch.
 
-## Getting Started:
+- attachtop.patch (new clients are attached at the top of the stack)
+- bottomstack.patch (adds bottomstack and bottomstackhorizontal layouts)
+- deck.patch (adds deck layout with one master and stacked clients)
+- en-keycodes.patch (always uses the english keycodes)
+- fakefullscreenclient.patch (enables per-client fake fullscreen)
+- foreign-toplevel-management.patch (allows external programs to query/control windows)
+- hide-behind-monocle.patch (hides unfocused windows in monocle layout)
+- hide-behind-fullscreen.patch (hides other windows behind fullscreen clients)
+- inputdevicerules-v0.7.patch (adds per-input-device configuration rules)
+- ipc.patch (adds IPC for external control and scripting)
+- pertag.patch (stores layout, mfact, nmaster, bar state per tag)
+- swallow.patch (replaces terminal with spawned application)
+- togglekblayoutandoptions.patch (toggles keyboard layouts and XKB options at runtime)
+- unclutter.patch (hides cursor after inactivity)
+- warpcursor.patch (moves cursor to the focused window)
+- xwayland-handle-minimize.patch (improves minimize/restore handling for XWayland)
 
-### 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].
+## Hotkeys
 
-### 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.
+There are various shortcuts and hotkeys used in this version. Included in my
+build are the following.
 
-### 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)
+| ModKey | Shift | Key         | Function                                                |
+| ------ | ----- | ----------- | ------------------------------------------------------- |
+| Super  |       | h           | (Tiling/Deck) Focus window higher in stack than current |
+| Super  |       | j           | (Tiling/Deck) Focus window lower in stack than current  |
+| Super  |       | k           | (Tiling/Deck) Focus window higher in stack than current |
+| Super  |       | l           | (Tiling/Deck) Focus window lower in stack than current  |
+| Super  |       | 1/2/.../9/0 | Show tag 1/2/.../9/0                                    |
+| Super  |       | .           | Show monitor lower in stack                             |
+| Super  |       | ,           | Show monitor higher in stack                            |
+| Super  | Shift | Escape      | Quit dwl with call for confirmation                     |
+| Super  | Shift | c           | Enable deck(/card) layout                               |
+| Super  | Shift | d           | Toggle floating/tiled for selected window               |
+| Super  | Shift | f           | Toggle fullscreen                                       |
+| Super  | Shift | h           | (Tiling/Deck) Make current window the master window     |
+| Super  | Shift | j           | (Tiling/Deck) Make current window the master window     |
+| Super  | Shift | k           | (Tiling/Deck) Make current window the master window     |
+| Super  | Shift | l           | (Keyboard) Cycle through the keymap layouts             |
+| Super  | Shift | m           | Enable monocle layout                                   |
+| Super  | Shift | o           | (Tiling/Deck) Increase master window size               |
+| Super  | Shift | q           | Close current window                                    |
+| Super  | Shift | t           | Enable tiling layout                                    |
+| Super  | Shift | u           | Enable bottomstack layout                               |
+| Super  | Shift | v           | Enable bottomstackhorizontal layout                     |
+| Super  | Shift | z           | (Tiling/Deck) Decrease master window size               |
+| Super  | Shift | 1/2/.../9/0 | Add current window to tag 1/2/.../9/0                   |
+| Super  | Shift | .           | Add to monitor lower in stack                           |
+| Super  | Shift | ,           | Add to monitor higher in stack                          |
+| Alt    |       | Tab         | (Tiling/Deck) Focus window lower in stack than current  |
 
-dwl has the following additional dependencies if XWayland support is enabled:
-- libxcb
-- libxcb-wm
-- wlroots (compiled with X11 support)
-- Xwayland (runtime only)
+Additionally the right hand side control key is set to be used as the compose key.
 
-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].
+## Installation
 
-To enable XWayland, you should uncomment its flags in `config.mk`.
+The following programs are required to be installed for full functionality.
 
-## Configuration
+- [dmenu](https://github.com/tiyn/dmenu)
 
-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.
+The most basic way is to clone the repository and then invoke make.
 
-As in the dwm community, we encourage users to share patches they have
-created. Check out the [dwl-patches] repository!
-
-## 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.
-
-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`.
-
-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
-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`].
-
-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
-that it spawns. If you need to set environment variables that affect the entire
-dwl session, these must be set prior to running dwl. For example, 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
-    dwl
-
-### Status information
-
-Information about selected layouts, current window title, app-id, and
-selected/occupied/urgent tags is written to the stdin of the `-s` command (see
-the `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:
-
-    dwl -s 'foot --server <&-'
-
-If your startup command is a shell script, you can achieve the same inside the
-script with the line
-
-    exec <&-
-
-To get a list of status bars that work with dwl consult our [wiki].
-
-## Replacements for X applications
-
-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
-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:
-
-- **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
-[Wayland]: https://wayland.freedesktop.org/
+- `git clone https://github.com/tiyn/dwl`
+- `make clean install`

config.def.h

@@ -6,6 +6,7 @@
 /* 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 int smartborders              = 1;
 static const unsigned int borderpx         = 1;  /* border pixel of windows */
 static const float rootcolor[]             = COLOR(0x222222ff);
 static const float bordercolor[]           = COLOR(0x444444ff);
@@ -13,27 +14,54 @@ 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 int enableautoswallow = 0; /* enables autoswallowing newly spawned clients */
+static float swallowborder = 1.0f; /* add this multiplied by borderpx to border when a client is swallowed */
 
 /* tagging - TAGCOUNT must be no greater than 31 */
-#define TAGCOUNT (9)
+#define TAGCOUNT (10)
 
 /* 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 */
+	/* app_id                 title       tags mask     isfloating   isterm   noswallow   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" */
+	{ "firefox",              NULL,                                1 << 1, 0, 0, 0, -1 },
+	{ "zen",                  NULL,                                1 << 1, 0, 0, 0, -1 },
+	{ "Lutris",               NULL,                                1 << 2, 0, 0, 0,  0 },
+	{ "zenity",               NULL,                                     0, 1, 0, 0, -1 },
+	{ "steam",                NULL,                                1 << 2, 0, 0, 0,  0 },
+	{ "discord",              NULL,                                1 << 2, 0, 0, 0,  1 },
+	{ "vesktop",              NULL,                                1 << 2, 0, 0, 0,  1 },
+	{ "TeamSpeak",            NULL,                                1 << 2, 0, 0, 0,  1 },
+	{ "Mattermost",           NULL,                                1 << 2, 0, 0, 0,  1 },
+	{ "Element",              NULL,                                1 << 2, 0, 0, 0,  1 },
+	{ "signal",               NULL,                                1 << 4, 0, 0, 0,  1 },
+	{ "telegram",             NULL,                                1 << 4, 0, 0, 0,  1 },
+	{ "Threema",              NULL,                                1 << 4, 0, 0, 0,  1 },
+	{ "Thunderbird",          NULL,                                1 << 4, 0, 0, 0,  1 },
+	{ "Sonixd",               NULL,                                1 << 8, 0, 0, 0,  1 },
+	{ "KeePassXC",            "Unlock Database - KeePassXC",       1 << 1, 1, 0, 0,  0 },
+	{ "KeePassXC",            NULL,                                1 << 9, 0, 0, 0,  0 },
+	{ "com.obsproject.Studio",NULL,                                1 << 7, 0, 0, 0,  1 },
+	{ "easyeffects",          NULL,                                1 << 9, 0, 0, 0,  1 },
+	{ "pavucontrol",          NULL,                                1 << 9, 0, 0, 0,  1 },
+        { "nextcloud",            NULL,                                     0, 1, 0, 0, -1 },
+        { "st",                   NULL,                                     0, 0, 1, 0, -1 },
+        { "vifm",                 NULL,                                     0, 0, 1, 0, -1 },
+        { "vifmrun",              NULL,                                     0, 0, 1, 0, -1 },
 };
 
 /* layout(s) */
 static const Layout layouts[] = {
 	/* symbol     arrange function */
-	{ "[]=",      tile },
-	{ "><>",      NULL },    /* no layout function means floating behavior */
-	{ "[M]",      monocle },
+	{ "M",      monocle },
+	{ "T",      tile },
+	{ "D",      deck },
+	{ "B",      bstack },
+	{ "B",      bstackhoriz },
+	{ "F",      NULL },    /* no layout function means floating behavior */
 };
 
 /* monitors */
@@ -52,12 +80,33 @@ static const MonitorRule monrules[] = {
 };
 
 /* keyboard */
-static const struct xkb_rule_names xkb_rules = {
-	/* can specify fields: rules, model, layout, variant, options */
-	/* example:
-	.options = "ctrl:nocaps",
-	*/
-	.options = NULL,
+static const struct xkb_rule_names xkb_rules[] = {
+	{
+		.layout = "de",
+	        .options = "compose:rctrl",
+	},
+	{
+		.layout = "de",
+	        .variant = "nodeadkeys",
+	        .options = "compose:rctrl",
+	},
+	{
+	        .layout = "de",
+	        .variant = "ru",
+	        .options = "compose:rctrl",
+	}
+};
+
+/* input devices */
+static const InputRule inputrules[] = {
+	/* name                      kbcreate                 ptrcreate      */
+	/* ignore bad device - like a touchpad ;) */
+	{ "BAD DEVICE",              NULL,                    NULL                },
+	/* ungroup ydotool device - fixes a bug */
+	{ "ydotoold virtual device", createungroupedkeyboard, createpointer       },
+	/* put your touchpad name here to enable toggle touchpad */
+	{ "SYNA8020:00 06CB:CE5C Touchpad",   createkeyboard,          createtogglepointer },
+	{ NULL,                      createkeyboard,          createpointer       },
 };
 
 static const int repeat_rate = 25;
@@ -106,8 +155,10 @@ 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;
 
+static const int cursor_timeout = 5;
+
 /* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
-#define MODKEY WLR_MODIFIER_ALT
+#define MODKEY WLR_MODIFIER_LOGO
 
 #define TAGKEYS(KEY,SKEY,TAG) \
 	{ MODKEY,                    KEY,            view,            {.ui = 1 << TAG} }, \
@@ -119,45 +170,66 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
 
 /* commands */
-static const char *termcmd[] = { "foot", NULL };
-static const char *menucmd[] = { "wmenu-run", NULL };
+static const char *termcmd[] = { "st", NULL };
+static const char *filecmd[] = { "st", "-e", "vifmrun", NULL };
+static const char *menucmd[] = { "dmenu_run", "-F", "-i", "-c", "-l", "20", NULL };
 
 static const Key keys[] = {
 	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
 	/* modifier                  key                function          argument */
-	{ MODKEY,                    XKB_KEY_p,          spawn,          {.v = menucmd} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return,     spawn,          {.v = termcmd} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Escape,    quit,             {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_D,         togglefloating,   {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F,         togglefullscreen, {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT|WLR_MODIFIER_CTRL,  XKB_KEY_F,    togglefakefullscreen, {0} },
+	{ MODKEY,                    XKB_KEY_h,         focusstack,       {.i = -1} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H,         zoom,             {0} },
 	{ MODKEY,                    XKB_KEY_j,         focusstack,       {.i = +1} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_J,         incnmaster,       {.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|WLR_MODIFIER_SHIFT, XKB_KEY_K,         incnmaster,       {.i = +1} },
+	{ MODKEY,                    XKB_KEY_l,         focusstack,       {.i = +1} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_M,         setlayout,        {.v = &layouts[0]} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_U,         setmfact,         {.f = -0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_I,         setmfact,         {.f = -0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_O,         setmfact,         {.f = +0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_P,         setmfact,         {.f = +0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,         killclient,       {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_T,         setlayout,        {.v = &layouts[1]} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,         setlayout,        {.v = &layouts[2]} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_V,         setlayout,        {.v = &layouts[3]} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_S,         setlayout,        {.v = &layouts[4]} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H,         setmfact,         {.f = -0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_L,         incxkbrules,    {.i = +1} },
 	{ 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_SHIFT, XKB_KEY_semicolon, tagmon,           {.i = WLR_DIRECTION_LEFT} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_colon,     tagmon,           {.i = WLR_DIRECTION_RIGHT} },
+
+	{ MODKEY,                    XKB_KEY_r,          spawn,          {.v = menucmd} },
+	{ MODKEY,                    XKB_KEY_f,          spawn,          {.v = filecmd} },
+	{ MODKEY,                    XKB_KEY_Return,     spawn,          {.v = termcmd} },
+	{ MODKEY,                    XKB_KEY_space,      togglepointer,  {0} },
+	{ WLR_MODIFIER_ALT,          XKB_KEY_Tab,        focusstack,     {.i = +1} },
+
         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_2, XKB_KEY_quotedbl,    1),
+        TAGKEYS(XKB_KEY_3, XKB_KEY_section,     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),
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,          quit,           {0} },
+        TAGKEYS(XKB_KEY_6, XKB_KEY_ampersand,   5),
+        TAGKEYS(XKB_KEY_7, XKB_KEY_slash,       6),
+        TAGKEYS(XKB_KEY_8, XKB_KEY_parenleft,   7),
+        TAGKEYS(XKB_KEY_9, XKB_KEY_parenright,  8),
+        TAGKEYS(XKB_KEY_0, XKB_KEY_equal,       9),
+	// TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
+	// TAGKEYS(          XKB_KEY_2, XKB_KEY_quotedbl,                   1),
+	// TAGKEYS(          XKB_KEY_3, XKB_KEY_paragraph,                  2),
+	// TAGKEYS(          XKB_KEY_4, XKB_KEY_dollar,                     3),
+	// TAGKEYS(          XKB_KEY_5, XKB_KEY_percent,                    4),
+	// TAGKEYS(          XKB_KEY_6, XKB_KEY_ampersand,                  5),
+	// TAGKEYS(          XKB_KEY_7, XKB_KEY_asciicircum,                6),
+	// TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                  7),
+	// TAGKEYS(          XKB_KEY_9, XKB_KEY_parenright,                 8),
 
 	/* 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} },

config.mk

@@ -24,11 +24,11 @@ WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.19`
 #	-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 =
+# XWAYLAND =
+# XLIBS =
 # Uncomment to build XWayland support
-#XWAYLAND = -DXWAYLAND
-#XLIBS = xcb xcb-icccm
+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

dwl.c

@@ -24,7 +24,6 @@
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_drm.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
-#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_idle_inhibit_v1.h>
@@ -129,11 +128,6 @@ typedef struct {
 	struct wl_listener fullscreen;
 	struct wl_listener set_decoration_mode;
 	struct wl_listener destroy_decoration;
-	struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
-	struct wl_listener factivate;
-	struct wl_listener fclose;
-	struct wl_listener ffullscreen;
-	struct wl_listener fdestroy;
 #ifdef XWAYLAND
 	struct wl_listener activate;
 	struct wl_listener associate;
@@ -357,11 +351,6 @@ static Monitor *xytomon(double x, double y);
 static void xytonode(double x, double y, struct wlr_surface **psurface,
 		Client **pc, LayerSurface **pl, double *nx, double *ny);
 static void zoom(const Arg *arg);
-static void createforeigntoplevel(Client *c);
-static void factivatenotify(struct wl_listener *listener, void *data);
-static void fclosenotify(struct wl_listener *listener, void *data);
-static void fdestroynotify(struct wl_listener *listener, void *data);
-static void ffullscreennotify(struct wl_listener *listener, void *data);
 
 /* variables */
 static pid_t child_pid = -1;
@@ -406,8 +395,6 @@ static struct wlr_session_lock_manager_v1 *session_lock_mgr;
 static struct wlr_scene_rect *locked_bg;
 static struct wlr_session_lock_v1 *cur_lock;
 
-static struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_mgr;
-
 static struct wlr_seat *seat;
 static KeyboardGroup *kb_group;
 static unsigned int cursor_mode;
@@ -500,11 +487,6 @@ applyrules(Client *c)
 	appid = client_get_appid(c);
 	title = client_get_title(c);
 
-	if (c->foreign_toplevel) {
-		wlr_foreign_toplevel_handle_v1_set_app_id(c->foreign_toplevel, appid);
-		wlr_foreign_toplevel_handle_v1_set_title(c->foreign_toplevel, title);
-	}
-
 	for (r = rules; r < END(rules); r++) {
 		if ((!r->title || strstr(title, r->title))
 				&& (!r->id || strstr(appid, r->id))) {
@@ -1468,8 +1450,6 @@ focusclient(Client *c, int lift)
 			client_set_border_color(old_c, bordercolor);
 
 			client_activate_surface(old, 0);
-			if (old_c->foreign_toplevel)
-				wlr_foreign_toplevel_handle_v1_set_activated(old_c->foreign_toplevel, 0);
 		}
 	}
 	printstatus();
@@ -1488,8 +1468,6 @@ focusclient(Client *c, int lift)
 
 	/* Activate the new client */
 	client_activate_surface(client_surface(c), 1);
-	if (c->foreign_toplevel)
-		wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, 1);
 }
 
 void
@@ -1791,8 +1769,6 @@ mapnotify(struct wl_listener *listener, void *data)
 		c->border[i]->node.data = c;
 	}
 
-	createforeigntoplevel(c);
-
 	/* Initialize client geometry with room for border */
 	client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
 	c->geom.width += 2 * c->bw;
@@ -1853,7 +1829,7 @@ monocle(Monitor *m)
 		n++;
 	}
 	if (n)
-		snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
+		snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "%d", n);
 	if ((c = focustop(m)))
 		wlr_scene_node_raise_to_top(&c->scene->node);
 }
@@ -2427,17 +2403,12 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
 	c->prev = c->geom;
 
 	/* Scene graph sends surface leave/enter events on move and resize */
-	if (oldmon) {
-		if (c->foreign_toplevel)
-			wlr_foreign_toplevel_handle_v1_output_leave(c->foreign_toplevel, oldmon->wlr_output);
+	if (oldmon)
 		arrange(oldmon);
-	}
 	if (m) {
 		/* Make sure window actually overlaps with the monitor */
 		resize(c, c->geom, 0);
 		c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
-		if (c->foreign_toplevel)
-			wlr_foreign_toplevel_handle_v1_output_enter(c->foreign_toplevel, m->wlr_output);
 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
 		setfloating(c, c->isfloating);
 	}
@@ -2558,9 +2529,6 @@ setup(void)
 	power_mgr = wlr_output_power_manager_v1_create(dpy);
 	wl_signal_add(&power_mgr->events.set_mode, &output_power_mgr_set_mode);
 
-	/* Initializes foreign toplevel management */
-	foreign_toplevel_mgr = wlr_foreign_toplevel_manager_v1_create(dpy);
-
 	/* Creates an output layout, which a wlroots utility for working with an
 	 * arrangement of screens in a physical layout. */
 	output_layout = wlr_output_layout_create(dpy);
@@ -2858,11 +2826,6 @@ unmapnotify(struct wl_listener *listener, void *data)
 		wl_list_remove(&c->flink);
 	}
 
-	if (c->foreign_toplevel) {
-		wlr_foreign_toplevel_handle_v1_destroy(c->foreign_toplevel);
-		c->foreign_toplevel = NULL;
-	}
-
 	wlr_scene_node_destroy(&c->scene->node);
 	printstatus();
 	motionnotify(0, NULL, 0, 0, 0, 0);
@@ -2978,12 +2941,6 @@ void
 updatetitle(struct wl_listener *listener, void *data)
 {
 	Client *c = wl_container_of(listener, c, set_title);
-	if (c->foreign_toplevel) {
-		const char *title;
-		if (!(title = client_get_title(c)))
-			title = broken;
-		wlr_foreign_toplevel_handle_v1_set_title(c->foreign_toplevel, title);
-	}
 	if (c == focustop(c->mon))
 		printstatus();
 }
@@ -3113,54 +3070,6 @@ zoom(const Arg *arg)
 	arrange(selmon);
 }
 
-void
-createforeigntoplevel(Client *c)
-{
-	c->foreign_toplevel = wlr_foreign_toplevel_handle_v1_create(foreign_toplevel_mgr);
-
-	LISTEN(&c->foreign_toplevel->events.request_activate, &c->factivate, factivatenotify);
-	LISTEN(&c->foreign_toplevel->events.request_close, &c->fclose, fclosenotify);
-	LISTEN(&c->foreign_toplevel->events.request_fullscreen, &c->ffullscreen, ffullscreennotify);
-	LISTEN(&c->foreign_toplevel->events.destroy, &c->fdestroy, fdestroynotify);
-}
-
-void
-factivatenotify(struct wl_listener *listener, void *data)
-{
-	Client *c = wl_container_of(listener, c, factivate);
-	if (c->mon == selmon) {
-		c->tags = c->mon->tagset[c->mon->seltags];
-	} else {
-		setmon(c, selmon, 0);
-	}
-	focusclient(c, 1);
-	arrange(c->mon);
-}
-
-void
-fclosenotify(struct wl_listener *listener, void *data)
-{
-	Client *c = wl_container_of(listener, c, fclose);
-	client_send_close(c);
-}
-
-void
-ffullscreennotify(struct wl_listener *listener, void *data) {
-	Client *c = wl_container_of(listener, c, ffullscreen);
-	struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data;
-	setfullscreen(c, event->fullscreen);
-}
-
-void
-fdestroynotify(struct wl_listener *listener, void *data)
-{
-	Client *c = wl_container_of(listener, c, fdestroy);
-	wl_list_remove(&c->factivate.link);
-	wl_list_remove(&c->fclose.link);
-	wl_list_remove(&c->ffullscreen.link);
-	wl_list_remove(&c->fdestroy.link);
-}
-
 #ifdef XWAYLAND
 void
 activatex11(struct wl_listener *listener, void *data)

foreign-toplevel-management.patch

@@ -1,507 +0,0 @@
-From dc63d64cd69f515013464b3feb8acb411f5a348f Mon Sep 17 00:00:00 2001
-From: wochap <gean.marroquin@gmail.com>
-Date: Thu, 2 May 2024 17:25:45 -0500
-Subject: [PATCH] implement foreign toplevel management
-
----
- Makefile                                      |   5 +-
- dwl.c                                         |  93 +++++-
- ...oreign-toplevel-management-unstable-v1.xml | 270 ++++++++++++++++++
- 3 files changed, 366 insertions(+), 2 deletions(-)
- create mode 100644 protocols/wlr-foreign-toplevel-management-unstable-v1.xml
-
-diff --git a/Makefile b/Makefile
-index a67fdd3..e0e1260 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,7 +16,7 @@ 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 cursor-shape-v1-protocol.h pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h xdg-shell-protocol.h
-+dwl.o: dwl.c config.mk config.h client.h cursor-shape-v1-protocol.h pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h xdg-shell-protocol.h wlr-foreign-toplevel-management-unstable-v1-protocol.h
- util.o: util.c util.h
- 
- # wayland-scanner is a tool which generates C headers and rigging for Wayland
-@@ -37,6 +37,9 @@ wlr-layer-shell-unstable-v1-protocol.h:
- xdg-shell-protocol.h:
- 	$(WAYLAND_SCANNER) server-header \
- 		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
-+wlr-foreign-toplevel-management-unstable-v1-protocol.h:
-+	$(WAYLAND_SCANNER) server-header \
-+		protocols/wlr-foreign-toplevel-management-unstable-v1.xml $@
- 
- config.h:
- 	cp config.def.h $@
-diff --git a/dwl.c b/dwl.c
-index bf763df..648616d 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -22,6 +22,7 @@
- #include <wlr/types/wlr_data_device.h>
- #include <wlr/types/wlr_drm.h>
- #include <wlr/types/wlr_export_dmabuf_v1.h>
-+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
- #include <wlr/types/wlr_fractional_scale_v1.h>
- #include <wlr/types/wlr_gamma_control_v1.h>
- #include <wlr/types/wlr_idle_inhibit_v1.h>
-@@ -126,6 +127,11 @@ typedef struct {
- 	struct wl_listener fullscreen;
- 	struct wl_listener set_decoration_mode;
- 	struct wl_listener destroy_decoration;
-+	struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
-+	struct wl_listener factivate;
-+	struct wl_listener fclose;
-+	struct wl_listener ffullscreen;
-+	struct wl_listener fdestroy;
- 	struct wlr_box prev; /* layout-relative, includes border */
- 	struct wlr_box bounds;
- #ifdef XWAYLAND
-@@ -347,6 +353,11 @@ static Monitor *xytomon(double x, double y);
- static void xytonode(double x, double y, struct wlr_surface **psurface,
- 		Client **pc, LayerSurface **pl, double *nx, double *ny);
- static void zoom(const Arg *arg);
-+static void createforeigntoplevel(Client *c);
-+static void factivatenotify(struct wl_listener *listener, void *data);
-+static void fclosenotify(struct wl_listener *listener, void *data);
-+static void fdestroynotify(struct wl_listener *listener, void *data);
-+static void ffullscreennotify(struct wl_listener *listener, void *data);
- 
- /* variables */
- static const char broken[] = "broken";
-@@ -392,6 +403,8 @@ static struct wlr_scene_rect *locked_bg;
- static struct wlr_session_lock_v1 *cur_lock;
- static struct wl_listener lock_listener = {.notify = locksession};
- 
-+static struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_mgr;
-+
- static struct wlr_seat *seat;
- static KeyboardGroup kb_group = {0};
- static KeyboardGroup vkb_group = {0};
-@@ -458,6 +471,11 @@ applyrules(Client *c)
- 	if (!(title = client_get_title(c)))
- 		title = broken;
- 
-+	if (c->foreign_toplevel) {
-+		wlr_foreign_toplevel_handle_v1_set_app_id(c->foreign_toplevel, appid);
-+		wlr_foreign_toplevel_handle_v1_set_title(c->foreign_toplevel, title);
-+	}
-+
- 	for (r = rules; r < END(rules); r++) {
- 		if ((!r->title || strstr(title, r->title))
- 				&& (!r->id || strstr(appid, r->id))) {
-@@ -1288,6 +1306,8 @@ focusclient(Client *c, int lift)
- 			client_set_border_color(old_c, bordercolor);
- 
- 			client_activate_surface(old, 0);
-+			if (old_c->foreign_toplevel)
-+				wlr_foreign_toplevel_handle_v1_set_activated(old_c->foreign_toplevel, 0);
- 		}
- 	}
- 	printstatus();
-@@ -1306,6 +1326,8 @@ focusclient(Client *c, int lift)
- 
- 	/* Activate the new client */
- 	client_activate_surface(client_surface(c), 1);
-+	if (c->foreign_toplevel)
-+		wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, 1);
- }
- 
- void
-@@ -1599,6 +1621,8 @@ mapnotify(struct wl_listener *listener, void *data)
- 		c->border[i]->node.data = c;
- 	}
- 
-+	createforeigntoplevel(c);
-+
- 	/* Initialize client geometry with room for border */
- 	client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
- 	c->geom.width += 2 * c->bw;
-@@ -2232,12 +2256,17 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
- 	c->prev = c->geom;
- 
- 	/* Scene graph sends surface leave/enter events on move and resize */
--	if (oldmon)
-+	if (oldmon) {
-+		if (c->foreign_toplevel)
-+			wlr_foreign_toplevel_handle_v1_output_leave(c->foreign_toplevel, oldmon->wlr_output);
- 		arrange(oldmon);
-+	}
- 	if (m) {
- 		/* Make sure window actually overlaps with the monitor */
- 		resize(c, c->geom, 0);
- 		c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
-+		if (c->foreign_toplevel)
-+			wlr_foreign_toplevel_handle_v1_output_enter(c->foreign_toplevel, m->wlr_output);
- 		setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
- 		setfloating(c, c->isfloating);
- 	}
-@@ -2351,6 +2380,9 @@ setup(void)
- 	gamma_control_mgr = wlr_gamma_control_manager_v1_create(dpy);
- 	LISTEN_STATIC(&gamma_control_mgr->events.set_gamma, setgamma);
- 
-+	/* Initializes foreign toplevel management */
-+	foreign_toplevel_mgr = wlr_foreign_toplevel_manager_v1_create(dpy);
-+
- 	/* Creates an output layout, which a wlroots utility for working with an
- 	 * arrangement of screens in a physical layout. */
- 	output_layout = wlr_output_layout_create();
-@@ -2691,6 +2723,11 @@ unmapnotify(struct wl_listener *listener, void *data)
- 		wl_list_remove(&c->flink);
- 	}
- 
-+	if (c->foreign_toplevel) {
-+		wlr_foreign_toplevel_handle_v1_destroy(c->foreign_toplevel);
-+		c->foreign_toplevel = NULL;
-+	}
-+
- 	wlr_scene_node_destroy(&c->scene->node);
- 	printstatus();
- 	motionnotify(0, NULL, 0, 0, 0, 0);
-@@ -2802,6 +2839,12 @@ void
- updatetitle(struct wl_listener *listener, void *data)
- {
- 	Client *c = wl_container_of(listener, c, set_title);
-+	if (c->foreign_toplevel) {
-+		const char *title;
-+		if (!(title = client_get_title(c)))
-+			title = broken;
-+		wlr_foreign_toplevel_handle_v1_set_title(c->foreign_toplevel, title);
-+	}
- 	if (c == focustop(c->mon))
- 		printstatus();
- }
-@@ -2929,6 +2972,54 @@ zoom(const Arg *arg)
- 	arrange(selmon);
- }
- 
-+void
-+createforeigntoplevel(Client *c)
-+{
-+	c->foreign_toplevel = wlr_foreign_toplevel_handle_v1_create(foreign_toplevel_mgr);
-+
-+	LISTEN(&c->foreign_toplevel->events.request_activate, &c->factivate, factivatenotify);
-+	LISTEN(&c->foreign_toplevel->events.request_close, &c->fclose, fclosenotify);
-+	LISTEN(&c->foreign_toplevel->events.request_fullscreen, &c->ffullscreen, ffullscreennotify);
-+	LISTEN(&c->foreign_toplevel->events.destroy, &c->fdestroy, fdestroynotify);
-+}
-+
-+void
-+factivatenotify(struct wl_listener *listener, void *data)
-+{
-+	Client *c = wl_container_of(listener, c, factivate);
-+	if (c->mon == selmon) {
-+		c->tags = c->mon->tagset[c->mon->seltags];
-+	} else {
-+		setmon(c, selmon, 0);
-+	}
-+	focusclient(c, 1);
-+	arrange(c->mon);
-+}
-+
-+void
-+fclosenotify(struct wl_listener *listener, void *data)
-+{
-+	Client *c = wl_container_of(listener, c, fclose);
-+	client_send_close(c);
-+}
-+
-+void
-+ffullscreennotify(struct wl_listener *listener, void *data) {
-+	Client *c = wl_container_of(listener, c, ffullscreen);
-+	struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data;
-+	setfullscreen(c, event->fullscreen);
-+}
-+
-+void
-+fdestroynotify(struct wl_listener *listener, void *data)
-+{
-+	Client *c = wl_container_of(listener, c, fdestroy);
-+	wl_list_remove(&c->factivate.link);
-+	wl_list_remove(&c->fclose.link);
-+	wl_list_remove(&c->ffullscreen.link);
-+	wl_list_remove(&c->fdestroy.link);
-+}
-+
- #ifdef XWAYLAND
- void
- activatex11(struct wl_listener *listener, void *data)
-diff --git a/protocols/wlr-foreign-toplevel-management-unstable-v1.xml b/protocols/wlr-foreign-toplevel-management-unstable-v1.xml
-new file mode 100644
-index 0000000..44505bb
---- /dev/null
-+++ b/protocols/wlr-foreign-toplevel-management-unstable-v1.xml
-@@ -0,0 +1,270 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<protocol name="wlr_foreign_toplevel_management_unstable_v1">
-+  <copyright>
-+    Copyright © 2018 Ilia Bozhinov
-+
-+    Permission to use, copy, modify, distribute, and sell this
-+    software and its documentation for any purpose is hereby granted
-+    without fee, provided that the above copyright notice appear in
-+    all copies and that both that copyright notice and this permission
-+    notice appear in supporting documentation, and that the name of
-+    the copyright holders not be used in advertising or publicity
-+    pertaining to distribution of the software without specific,
-+    written prior permission.  The copyright holders make no
-+    representations about the suitability of this software for any
-+    purpose.  It is provided "as is" without express or implied
-+    warranty.
-+
-+    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-+    THIS SOFTWARE.
-+  </copyright>
-+
-+  <interface name="zwlr_foreign_toplevel_manager_v1" version="3">
-+    <description summary="list and control opened apps">
-+      The purpose of this protocol is to enable the creation of taskbars
-+      and docks by providing them with a list of opened applications and
-+      letting them request certain actions on them, like maximizing, etc.
-+
-+      After a client binds the zwlr_foreign_toplevel_manager_v1, each opened
-+      toplevel window will be sent via the toplevel event
-+    </description>
-+
-+    <event name="toplevel">
-+      <description summary="a toplevel has been created">
-+        This event is emitted whenever a new toplevel window is created. It
-+        is emitted for all toplevels, regardless of the app that has created
-+        them.
-+
-+        All initial details of the toplevel(title, app_id, states, etc.) will
-+        be sent immediately after this event via the corresponding events in
-+        zwlr_foreign_toplevel_handle_v1.
-+      </description>
-+      <arg name="toplevel" type="new_id" interface="zwlr_foreign_toplevel_handle_v1"/>
-+    </event>
-+
-+    <request name="stop">
-+      <description summary="stop sending events">
-+        Indicates the client no longer wishes to receive events for new toplevels.
-+        However the compositor may emit further toplevel_created events, until
-+        the finished event is emitted.
-+
-+        The client must not send any more requests after this one.
-+      </description>
-+    </request>
-+
-+    <event name="finished" type="destructor">
-+      <description summary="the compositor has finished with the toplevel manager">
-+        This event indicates that the compositor is done sending events to the
-+        zwlr_foreign_toplevel_manager_v1. The server will destroy the object
-+        immediately after sending this request, so it will become invalid and
-+        the client should free any resources associated with it.
-+      </description>
-+    </event>
-+  </interface>
-+
-+  <interface name="zwlr_foreign_toplevel_handle_v1" version="3">
-+    <description summary="an opened toplevel">
-+      A zwlr_foreign_toplevel_handle_v1 object represents an opened toplevel
-+      window. Each app may have multiple opened toplevels.
-+
-+      Each toplevel has a list of outputs it is visible on, conveyed to the
-+      client with the output_enter and output_leave events.
-+    </description>
-+
-+    <event name="title">
-+      <description summary="title change">
-+        This event is emitted whenever the title of the toplevel changes.
-+      </description>
-+      <arg name="title" type="string"/>
-+    </event>
-+
-+    <event name="app_id">
-+      <description summary="app-id change">
-+        This event is emitted whenever the app-id of the toplevel changes.
-+      </description>
-+      <arg name="app_id" type="string"/>
-+    </event>
-+
-+    <event name="output_enter">
-+      <description summary="toplevel entered an output">
-+        This event is emitted whenever the toplevel becomes visible on
-+        the given output. A toplevel may be visible on multiple outputs.
-+      </description>
-+      <arg name="output" type="object" interface="wl_output"/>
-+    </event>
-+
-+    <event name="output_leave">
-+      <description summary="toplevel left an output">
-+        This event is emitted whenever the toplevel stops being visible on
-+        the given output. It is guaranteed that an entered-output event
-+        with the same output has been emitted before this event.
-+      </description>
-+      <arg name="output" type="object" interface="wl_output"/>
-+    </event>
-+
-+    <request name="set_maximized">
-+      <description summary="requests that the toplevel be maximized">
-+        Requests that the toplevel be maximized. If the maximized state actually
-+        changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <request name="unset_maximized">
-+      <description summary="requests that the toplevel be unmaximized">
-+        Requests that the toplevel be unmaximized. If the maximized state actually
-+        changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <request name="set_minimized">
-+      <description summary="requests that the toplevel be minimized">
-+        Requests that the toplevel be minimized. If the minimized state actually
-+        changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <request name="unset_minimized">
-+      <description summary="requests that the toplevel be unminimized">
-+        Requests that the toplevel be unminimized. If the minimized state actually
-+        changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <request name="activate">
-+      <description summary="activate the toplevel">
-+        Request that this toplevel be activated on the given seat.
-+        There is no guarantee the toplevel will be actually activated.
-+      </description>
-+      <arg name="seat" type="object" interface="wl_seat"/>
-+    </request>
-+
-+    <enum name="state">
-+      <description summary="types of states on the toplevel">
-+        The different states that a toplevel can have. These have the same meaning
-+        as the states with the same names defined in xdg-toplevel
-+      </description>
-+
-+      <entry name="maximized"  value="0" summary="the toplevel is maximized"/>
-+      <entry name="minimized"  value="1" summary="the toplevel is minimized"/>
-+      <entry name="activated"  value="2" summary="the toplevel is active"/>
-+      <entry name="fullscreen" value="3" summary="the toplevel is fullscreen" since="2"/>
-+    </enum>
-+
-+    <event name="state">
-+      <description summary="the toplevel state changed">
-+        This event is emitted immediately after the zlw_foreign_toplevel_handle_v1
-+        is created and each time the toplevel state changes, either because of a
-+        compositor action or because of a request in this protocol.
-+      </description>
-+
-+      <arg name="state" type="array"/>
-+    </event>
-+
-+    <event name="done">
-+      <description summary="all information about the toplevel has been sent">
-+        This event is sent after all changes in the toplevel state have been
-+        sent.
-+
-+        This allows changes to the zwlr_foreign_toplevel_handle_v1 properties
-+        to be seen as atomic, even if they happen via multiple events.
-+      </description>
-+    </event>
-+
-+    <request name="close">
-+      <description summary="request that the toplevel be closed">
-+        Send a request to the toplevel to close itself. The compositor would
-+        typically use a shell-specific method to carry out this request, for
-+        example by sending the xdg_toplevel.close event. However, this gives
-+        no guarantees the toplevel will actually be destroyed. If and when
-+        this happens, the zwlr_foreign_toplevel_handle_v1.closed event will
-+        be emitted.
-+      </description>
-+    </request>
-+
-+    <request name="set_rectangle">
-+      <description summary="the rectangle which represents the toplevel">
-+        The rectangle of the surface specified in this request corresponds to
-+        the place where the app using this protocol represents the given toplevel.
-+        It can be used by the compositor as a hint for some operations, e.g
-+        minimizing. The client is however not required to set this, in which
-+        case the compositor is free to decide some default value.
-+
-+        If the client specifies more than one rectangle, only the last one is
-+        considered.
-+
-+        The dimensions are given in surface-local coordinates.
-+        Setting width=height=0 removes the already-set rectangle.
-+      </description>
-+
-+      <arg name="surface" type="object" interface="wl_surface"/>
-+      <arg name="x" type="int"/>
-+      <arg name="y" type="int"/>
-+      <arg name="width" type="int"/>
-+      <arg name="height" type="int"/>
-+    </request>
-+
-+    <enum name="error">
-+      <entry name="invalid_rectangle" value="0"
-+        summary="the provided rectangle is invalid"/>
-+    </enum>
-+
-+    <event name="closed">
-+      <description summary="this toplevel has been destroyed">
-+        This event means the toplevel has been destroyed. It is guaranteed there
-+        won't be any more events for this zwlr_foreign_toplevel_handle_v1. The
-+        toplevel itself becomes inert so any requests will be ignored except the
-+        destroy request.
-+      </description>
-+    </event>
-+
-+    <request name="destroy" type="destructor">
-+      <description summary="destroy the zwlr_foreign_toplevel_handle_v1 object">
-+        Destroys the zwlr_foreign_toplevel_handle_v1 object.
-+
-+        This request should be called either when the client does not want to
-+        use the toplevel anymore or after the closed event to finalize the
-+        destruction of the object.
-+      </description>
-+    </request>
-+
-+    <!-- Version 2 additions -->
-+
-+    <request name="set_fullscreen" since="2">
-+      <description summary="request that the toplevel be fullscreened">
-+        Requests that the toplevel be fullscreened on the given output. If the
-+        fullscreen state and/or the outputs the toplevel is visible on actually
-+        change, this will be indicated by the state and output_enter/leave
-+        events.
-+
-+        The output parameter is only a hint to the compositor. Also, if output
-+        is NULL, the compositor should decide which output the toplevel will be
-+        fullscreened on, if at all.
-+      </description>
-+      <arg name="output" type="object" interface="wl_output" allow-null="true"/>
-+    </request>
-+
-+    <request name="unset_fullscreen" since="2">
-+      <description summary="request that the toplevel be unfullscreened">
-+        Requests that the toplevel be unfullscreened. If the fullscreen state
-+        actually changes, this will be indicated by the state event.
-+      </description>
-+    </request>
-+
-+    <!-- Version 3 additions -->
-+
-+    <event name="parent" since="3">
-+      <description summary="parent change">
-+        This event is emitted whenever the parent of the toplevel changes.
-+
-+        No event is emitted when the parent handle is destroyed by the client.
-+      </description>
-+      <arg name="parent" type="object" interface="zwlr_foreign_toplevel_handle_v1" allow-null="true"/>
-+    </event>
-+  </interface>
-+</protocol>
--- 
-2.43.2
-

protocols/wlr-foreign-toplevel-management-unstable-v1.xml

@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="wlr_foreign_toplevel_management_unstable_v1">
-  <copyright>
-    Copyright © 2018 Ilia Bozhinov
-
-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation for any purpose is hereby granted
-    without fee, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation, and that the name of
-    the copyright holders not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission.  The copyright holders make no
-    representations about the suitability of this software for any
-    purpose.  It is provided "as is" without express or implied
-    warranty.
-
-    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-    THIS SOFTWARE.
-  </copyright>
-
-  <interface name="zwlr_foreign_toplevel_manager_v1" version="3">
-    <description summary="list and control opened apps">
-      The purpose of this protocol is to enable the creation of taskbars
-      and docks by providing them with a list of opened applications and
-      letting them request certain actions on them, like maximizing, etc.
-
-      After a client binds the zwlr_foreign_toplevel_manager_v1, each opened
-      toplevel window will be sent via the toplevel event
-    </description>
-
-    <event name="toplevel">
-      <description summary="a toplevel has been created">
-        This event is emitted whenever a new toplevel window is created. It
-        is emitted for all toplevels, regardless of the app that has created
-        them.
-
-        All initial details of the toplevel(title, app_id, states, etc.) will
-        be sent immediately after this event via the corresponding events in
-        zwlr_foreign_toplevel_handle_v1.
-      </description>
-      <arg name="toplevel" type="new_id" interface="zwlr_foreign_toplevel_handle_v1"/>
-    </event>
-
-    <request name="stop">
-      <description summary="stop sending events">
-        Indicates the client no longer wishes to receive events for new toplevels.
-        However the compositor may emit further toplevel_created events, until
-        the finished event is emitted.
-
-        The client must not send any more requests after this one.
-      </description>
-    </request>
-
-    <event name="finished" type="destructor">
-      <description summary="the compositor has finished with the toplevel manager">
-        This event indicates that the compositor is done sending events to the
-        zwlr_foreign_toplevel_manager_v1. The server will destroy the object
-        immediately after sending this request, so it will become invalid and
-        the client should free any resources associated with it.
-      </description>
-    </event>
-  </interface>
-
-  <interface name="zwlr_foreign_toplevel_handle_v1" version="3">
-    <description summary="an opened toplevel">
-      A zwlr_foreign_toplevel_handle_v1 object represents an opened toplevel
-      window. Each app may have multiple opened toplevels.
-
-      Each toplevel has a list of outputs it is visible on, conveyed to the
-      client with the output_enter and output_leave events.
-    </description>
-
-    <event name="title">
-      <description summary="title change">
-        This event is emitted whenever the title of the toplevel changes.
-      </description>
-      <arg name="title" type="string"/>
-    </event>
-
-    <event name="app_id">
-      <description summary="app-id change">
-        This event is emitted whenever the app-id of the toplevel changes.
-      </description>
-      <arg name="app_id" type="string"/>
-    </event>
-
-    <event name="output_enter">
-      <description summary="toplevel entered an output">
-        This event is emitted whenever the toplevel becomes visible on
-        the given output. A toplevel may be visible on multiple outputs.
-      </description>
-      <arg name="output" type="object" interface="wl_output"/>
-    </event>
-
-    <event name="output_leave">
-      <description summary="toplevel left an output">
-        This event is emitted whenever the toplevel stops being visible on
-        the given output. It is guaranteed that an entered-output event
-        with the same output has been emitted before this event.
-      </description>
-      <arg name="output" type="object" interface="wl_output"/>
-    </event>
-
-    <request name="set_maximized">
-      <description summary="requests that the toplevel be maximized">
-        Requests that the toplevel be maximized. If the maximized state actually
-        changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <request name="unset_maximized">
-      <description summary="requests that the toplevel be unmaximized">
-        Requests that the toplevel be unmaximized. If the maximized state actually
-        changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <request name="set_minimized">
-      <description summary="requests that the toplevel be minimized">
-        Requests that the toplevel be minimized. If the minimized state actually
-        changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <request name="unset_minimized">
-      <description summary="requests that the toplevel be unminimized">
-        Requests that the toplevel be unminimized. If the minimized state actually
-        changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <request name="activate">
-      <description summary="activate the toplevel">
-        Request that this toplevel be activated on the given seat.
-        There is no guarantee the toplevel will be actually activated.
-      </description>
-      <arg name="seat" type="object" interface="wl_seat"/>
-    </request>
-
-    <enum name="state">
-      <description summary="types of states on the toplevel">
-        The different states that a toplevel can have. These have the same meaning
-        as the states with the same names defined in xdg-toplevel
-      </description>
-
-      <entry name="maximized"  value="0" summary="the toplevel is maximized"/>
-      <entry name="minimized"  value="1" summary="the toplevel is minimized"/>
-      <entry name="activated"  value="2" summary="the toplevel is active"/>
-      <entry name="fullscreen" value="3" summary="the toplevel is fullscreen" since="2"/>
-    </enum>
-
-    <event name="state">
-      <description summary="the toplevel state changed">
-        This event is emitted immediately after the zlw_foreign_toplevel_handle_v1
-        is created and each time the toplevel state changes, either because of a
-        compositor action or because of a request in this protocol.
-      </description>
-
-      <arg name="state" type="array"/>
-    </event>
-
-    <event name="done">
-      <description summary="all information about the toplevel has been sent">
-        This event is sent after all changes in the toplevel state have been
-        sent.
-
-        This allows changes to the zwlr_foreign_toplevel_handle_v1 properties
-        to be seen as atomic, even if they happen via multiple events.
-      </description>
-    </event>
-
-    <request name="close">
-      <description summary="request that the toplevel be closed">
-        Send a request to the toplevel to close itself. The compositor would
-        typically use a shell-specific method to carry out this request, for
-        example by sending the xdg_toplevel.close event. However, this gives
-        no guarantees the toplevel will actually be destroyed. If and when
-        this happens, the zwlr_foreign_toplevel_handle_v1.closed event will
-        be emitted.
-      </description>
-    </request>
-
-    <request name="set_rectangle">
-      <description summary="the rectangle which represents the toplevel">
-        The rectangle of the surface specified in this request corresponds to
-        the place where the app using this protocol represents the given toplevel.
-        It can be used by the compositor as a hint for some operations, e.g
-        minimizing. The client is however not required to set this, in which
-        case the compositor is free to decide some default value.
-
-        If the client specifies more than one rectangle, only the last one is
-        considered.
-
-        The dimensions are given in surface-local coordinates.
-        Setting width=height=0 removes the already-set rectangle.
-      </description>
-
-      <arg name="surface" type="object" interface="wl_surface"/>
-      <arg name="x" type="int"/>
-      <arg name="y" type="int"/>
-      <arg name="width" type="int"/>
-      <arg name="height" type="int"/>
-    </request>
-
-    <enum name="error">
-      <entry name="invalid_rectangle" value="0"
-        summary="the provided rectangle is invalid"/>
-    </enum>
-
-    <event name="closed">
-      <description summary="this toplevel has been destroyed">
-        This event means the toplevel has been destroyed. It is guaranteed there
-        won't be any more events for this zwlr_foreign_toplevel_handle_v1. The
-        toplevel itself becomes inert so any requests will be ignored except the
-        destroy request.
-      </description>
-    </event>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the zwlr_foreign_toplevel_handle_v1 object">
-        Destroys the zwlr_foreign_toplevel_handle_v1 object.
-
-        This request should be called either when the client does not want to
-        use the toplevel anymore or after the closed event to finalize the
-        destruction of the object.
-      </description>
-    </request>
-
-    <!-- Version 2 additions -->
-
-    <request name="set_fullscreen" since="2">
-      <description summary="request that the toplevel be fullscreened">
-        Requests that the toplevel be fullscreened on the given output. If the
-        fullscreen state and/or the outputs the toplevel is visible on actually
-        change, this will be indicated by the state and output_enter/leave
-        events.
-
-        The output parameter is only a hint to the compositor. Also, if output
-        is NULL, the compositor should decide which output the toplevel will be
-        fullscreened on, if at all.
-      </description>
-      <arg name="output" type="object" interface="wl_output" allow-null="true"/>
-    </request>
-
-    <request name="unset_fullscreen" since="2">
-      <description summary="request that the toplevel be unfullscreened">
-        Requests that the toplevel be unfullscreened. If the fullscreen state
-        actually changes, this will be indicated by the state event.
-      </description>
-    </request>
-
-    <!-- Version 3 additions -->
-
-    <event name="parent" since="3">
-      <description summary="parent change">
-        This event is emitted whenever the parent of the toplevel changes.
-
-        No event is emitted when the parent handle is destroyed by the client.
-      </description>
-      <arg name="parent" type="object" interface="zwlr_foreign_toplevel_handle_v1" allow-null="true"/>
-    </event>
-  </interface>
-</protocol>