updated readme

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.
-  
-### 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)
+There are various shortcuts and hotkeys used in this version. Included in my
+build are the following.
 
-dwl has the following additional dependencies if XWayland support is enabled:
-- libxcb
-- libxcb-wm
-- wlroots (compiled with X11 support)
-- Xwayland (runtime 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  |
 
-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].
+Additionally the right hand side control key is set to be used as the compose key.
 
-To enable XWayland, you should uncomment its flags in `config.mk`.
+## Installation
 
-## Configuration
+The following programs are required to be installed for full functionality.
 
-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.
+- [dmenu](https://github.com/tiyn/dmenu)
 
-As in the dwm community, we encourage users to share patches they have
-created. Check out the [dwl-patches] repository!
+The most basic way is to clone the repository and then invoke make.
 
-## 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`

client.h

@@ -131,18 +131,6 @@ client_get_appid(Client *c)
 	return c->surface.xdg->toplevel->app_id ? c->surface.xdg->toplevel->app_id : "broken";
 }
 
-static inline int
-client_get_pid(Client *c)
-{
-	pid_t pid;
-#ifdef XWAYLAND
-	if (client_is_x11(c))
-		return c->surface.xwayland->pid;
-#endif
-	wl_client_get_credentials(c->surface.xdg->client->client, &pid, NULL, NULL);
-	return pid;
-}
-
 static inline void
 client_get_clip(Client *c, struct wlr_box *clip)
 {

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,30 +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 = 1; /* enables autoswallowing newly spawned clients */
+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   isterm   noswallow   monitor */
+	/* app_id                 title       tags mask     isfloating   isterm   noswallow   monitor */
 	/* examples: */
-	{ "foot",             NULL,       0,            0,           1,       1,          -1 },
-	{ "Gimp_EXAMPLE",     NULL,       0,            1,           0,       0,          -1 }, /* Start on currently visible tags floating, not tiled */
-	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           0,       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 */
@@ -55,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;
@@ -109,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} }, \
@@ -122,47 +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,                    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_a,          toggleswallow,  {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,          toggleautoswallow,{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} },
-	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),
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,          quit,           {0} },
+	/* modifier                  key                function          argument */
+	{ 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|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_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_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_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

@@ -74,7 +74,7 @@
 #define MAX(A, B)               ((A) > (B) ? (A) : (B))
 #define MIN(A, B)               ((A) < (B) ? (A) : (B))
 #define CLEANMASK(mask)         (mask & ~WLR_MODIFIER_CAPS)
-#define VISIBLEON(C, M)         ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]) && !(C)->swallowedby)
+#define VISIBLEON(C, M)         ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]))
 #define LENGTH(X)               (sizeof X / sizeof X[0])
 #define END(A)                  ((A) + LENGTH(A))
 #define TAGMASK                 ((1u << TAGCOUNT) - 1)
@@ -101,8 +101,7 @@ typedef struct {
 } Button;
 
 typedef struct Monitor Monitor;
-typedef struct Client Client;
-struct Client {
+typedef struct {
 	/* Must keep this field first */
 	unsigned int type; /* XDGShell or X11* */
 
@@ -139,12 +138,8 @@ struct Client {
 	unsigned int bw;
 	uint32_t tags;
 	int isfloating, isurgent, isfullscreen;
-	int isterm, noswallow;
 	uint32_t resize; /* configure serial of a pending resize */
-	pid_t pid;
-	Client *swallowing;  /* client being hidden */
-	Client *swallowedby;
-};
+} Client;
 
 typedef struct {
 	uint32_t mod;
@@ -232,8 +227,6 @@ typedef struct {
 	const char *title;
 	uint32_t tags;
 	int isfloating;
-	int isterm;
-	int noswallow;
 	int monitor;
 } Rule;
 
@@ -315,7 +308,6 @@ static void moveresize(const Arg *arg);
 static void outputmgrapply(struct wl_listener *listener, void *data);
 static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
 static void outputmgrtest(struct wl_listener *listener, void *data);
-static pid_t parentpid(pid_t pid);
 static void pointerfocus(Client *c, struct wlr_surface *surface,
 		double sx, double sy, uint32_t time);
 static void printstatus(void);
@@ -339,15 +331,11 @@ static void setsel(struct wl_listener *listener, void *data);
 static void setup(void);
 static void spawn(const Arg *arg);
 static void startdrag(struct wl_listener *listener, void *data);
-static void swallow(Client *c, Client *toswallow);
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);
-static Client *termforwin(Client *c);
 static void tile(Monitor *m);
 static void togglefloating(const Arg *arg);
 static void togglefullscreen(const Arg *arg);
-static void toggleswallow(const Arg *arg);
-static void toggleautoswallow(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unlocksession(struct wl_listener *listener, void *data);
@@ -499,15 +487,11 @@ applyrules(Client *c)
 	appid = client_get_appid(c);
 	title = client_get_title(c);
 
-	c->pid = client_get_pid(c);
-
 	for (r = rules; r < END(rules); r++) {
 		if ((!r->title || strstr(title, r->title))
 				&& (!r->id || strstr(appid, r->id))) {
 			c->isfloating = r->isfloating;
 			newtags |= r->tags;
-			c->isterm = r->isterm;
-			c->noswallow = r->noswallow;
 			i = 0;
 			wl_list_for_each(m, &mons, link) {
 				if (r->monitor == i++)
@@ -515,12 +499,6 @@ applyrules(Client *c)
 			}
 		}
 	}
-	if (enableautoswallow && !c->noswallow && !c->isfloating &&
-			!c->surface.xdg->initial_commit) {
-		Client *p = termforwin(c);
-		if (p)
-			swallow(c, p);
-	}
 	setmon(c, mon, newtags);
 }
 
@@ -1851,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);
 }
@@ -2076,20 +2054,6 @@ outputmgrtest(struct wl_listener *listener, void *data)
 	outputmgrapplyortest(config, 1);
 }
 
-pid_t
-parentpid(pid_t pid)
-{
-	unsigned int v = 0;
-	FILE *f;
-	char buf[256];
-	snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)pid);
-	if (!(f = fopen(buf, "r")))
-		return 0;
-	fscanf(f, "%*u %*s %*c %u", &v);
-	fclose(f);
-	return (pid_t)v;
-}
-
 void
 pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
 		uint32_t time)
@@ -2382,7 +2346,7 @@ setfullscreen(Client *c, int fullscreen)
 	c->isfullscreen = fullscreen;
 	if (!c->mon || !client_surface(c)->mapped)
 		return;
-	c->bw = fullscreen ? 0 : BORDERPX(c);
+	c->bw = fullscreen ? 0 : borderpx;
 	client_set_fullscreen(c, fullscreen);
 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen
 			? LyrFS : c->isfloating ? LyrFloat : LyrTile]);
@@ -2449,9 +2413,6 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
 		setfloating(c, c->isfloating);
 	}
 	focusclient(focustop(selmon), 1);
-
-	if (c->swallowing)
-		setmon(c->swallowing, m, newtags);
 }
 
 void
@@ -2722,44 +2683,6 @@ startdrag(struct wl_listener *listener, void *data)
 	LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon);
 }
 
-void
-swallow(Client *c, Client *toswallow)
-{
-	/* Do not allow a client to swallow itself */
-	if (c == toswallow)
-		return;
-
-	/* Swallow */
-	if (toswallow && !c->swallowing) {
-		c->swallowing = toswallow;
-		toswallow->swallowedby = c;
-		toswallow->mon = c->mon;
-		toswallow->mon = c->mon;
-		wl_list_remove(&c->link);
-		wl_list_insert(&c->swallowing->link, &c->link);
-		wl_list_remove(&c->flink);
-		wl_list_insert(&c->swallowing->flink, &c->flink);
-		c->bw = BORDERPX(c);
-		c->tags = toswallow->tags;
-		c->isfloating = toswallow->isfloating;
-		c->geom = toswallow->geom;
-		setfullscreen(toswallow, 0);
-	}
-
-	/* Unswallow */
-	else if (c->swallowing) {
-		wl_list_remove(&c->swallowing->link);
-		wl_list_insert(&c->link, &c->swallowing->link);
-		wl_list_remove(&c->swallowing->flink);
-		wl_list_insert(&c->flink, &c->swallowing->flink);
-		c->swallowing->tags = c->tags;
-		c->swallowing->swallowedby = NULL;
-		c->swallowing = NULL;
-		c->bw = BORDERPX(c);
-		setfullscreen(c, 0);
-	}
-}
-
 void
 tag(const Arg *arg)
 {
@@ -2781,40 +2704,6 @@ tagmon(const Arg *arg)
 		setmon(sel, dirtomon(arg->i), 0);
 }
 
-Client *
-termforwin(Client *c)
-{
-	Client *p;
-	pid_t pid;
-	pid_t pids[32];
-	size_t i, pids_len;
-
-	if (!c->pid || c->isterm)
-		return NULL;
-
-	/* Get all parent pids */
-	pids_len = 0;
-	pid = c->pid;
-	while (pids_len < LENGTH(pids)) {
-		pid = parentpid(pid);
-		if (!pid)
-			break;
-		pids[pids_len++] = pid;
-	}
-
-	/* Find closest parent */
-	for (i = 0; i < pids_len; i++) {
-		wl_list_for_each(p, &clients, link) {
-			if (!p->pid || !p->isterm || p->swallowedby)
-				continue;
-			if (pids[i] == p->pid)
-				return p;
-		}
-	}
-
-	return NULL;
-}
-
 void
 tile(Monitor *m)
 {
@@ -2866,32 +2755,6 @@ togglefullscreen(const Arg *arg)
 		setfullscreen(sel, !sel->isfullscreen);
 }
 
-void
-toggleswallow(const Arg *arg)
-{
-	Client *c, *sel = focustop(selmon);
-	if (!sel)
-		return;
-
-	if (sel->swallowing) {
-		swallow(sel, NULL);
-	} else {
-		wl_list_for_each(c, &sel->flink, flink) {
-			if (&c->flink == &fstack)
-				continue; /* wrap past the sentinel node */
-			if (VISIBLEON(c, selmon))
-				break; /* found it */
-		}
-		swallow(sel, c);
-	}
-}
-
-void
-toggleautoswallow(const Arg *arg)
-{
-	enableautoswallow = !enableautoswallow;
-}
-
 void
 toggletag(const Arg *arg)
 {
@@ -2952,12 +2815,6 @@ unmapnotify(struct wl_listener *listener, void *data)
 		grabc = NULL;
 	}
 
-	if (c->swallowing) {
-		swallow(c, NULL);
-	} else if (c->swallowedby) {
-		swallow(c->swallowedby, NULL);
-	}
-
 	if (client_is_unmanaged(c)) {
 		if (c == exclusive_focus) {
 			exclusive_focus = NULL;

swallow.patch

@@ -1,351 +0,0 @@
-From a220e1ed4b04a66c837dfc8e3363d3e696cbf541 Mon Sep 17 00:00:00 2001
-From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
-Date: Wed, 5 Feb 2025 02:34:39 +0100
-Subject: [PATCH] Swallow: hide the terminal when it spawns a client
-
----
- client.h     |  12 ++++
- config.def.h |  11 +++-
- dwl.c        | 152 +++++++++++++++++++++++++++++++++++++++++++++++++--
- 3 files changed, 168 insertions(+), 7 deletions(-)
-
-diff --git a/client.h b/client.h
-index 42f225f..bc9cad2 100644
---- a/client.h
-+++ b/client.h
-@@ -131,6 +131,18 @@ client_get_appid(Client *c)
- 	return c->surface.xdg->toplevel->app_id;
- }
- 
-+static inline int
-+client_get_pid(Client *c)
-+{
-+	pid_t pid;
-+#ifdef XWAYLAND
-+	if (client_is_x11(c))
-+		return c->surface.xwayland->pid;
-+#endif
-+	wl_client_get_credentials(c->surface.xdg->client->client, &pid, NULL, NULL);
-+	return pid;
-+}
-+
- static inline void
- client_get_clip(Client *c, struct wlr_box *clip)
- {
-diff --git a/config.def.h b/config.def.h
-index 22d2171..42342f1 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -13,6 +13,8 @@ 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 = 1; /* 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)
-@@ -22,10 +24,11 @@ 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" */
-+	{ "foot",             NULL,       0,            0,           1,       1,          -1 },
-+	{ "Gimp_EXAMPLE",     NULL,       0,            1,           0,       0,          -1 }, /* Start on currently visible tags floating, not tiled */
-+	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           0,       0,          -1 }, /* Start on ONLY tag "9" */
- };
- 
- /* layout(s) */
-@@ -142,6 +145,8 @@ static const Key keys[] = {
- 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
- 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
-+	{ MODKEY,                    XKB_KEY_a,          toggleswallow,  {0} },
-+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,          toggleautoswallow,{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} },
-diff --git a/dwl.c b/dwl.c
-index def2562..71d500a 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -73,12 +73,13 @@
- #define MAX(A, B)               ((A) > (B) ? (A) : (B))
- #define MIN(A, B)               ((A) < (B) ? (A) : (B))
- #define CLEANMASK(mask)         (mask & ~WLR_MODIFIER_CAPS)
--#define VISIBLEON(C, M)         ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]))
-+#define VISIBLEON(C, M)         ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]) && !(C)->swallowedby)
- #define LENGTH(X)               (sizeof X / sizeof X[0])
- #define END(A)                  ((A) + LENGTH(A))
- #define TAGMASK                 ((1u << TAGCOUNT) - 1)
- #define LISTEN(E, L, H)         wl_signal_add((E), ((L)->notify = (H), (L)))
- #define LISTEN_STATIC(E, H)     do { static struct wl_listener _l = {.notify = (H)}; wl_signal_add((E), &_l); } while (0)
-+#define BORDERPX(C)             (borderpx + ((C)->swallowing ? (int)ceilf(swallowborder * (C)->swallowing->bw) : 0))
- 
- /* enums */
- enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
-@@ -104,7 +105,8 @@ typedef struct {
- } Button;
- 
- typedef struct Monitor Monitor;
--typedef struct {
-+typedef struct Client Client;
-+struct Client {
- 	/* Must keep these three elements in this order */
- 	unsigned int type; /* XDGShell or X11* */
- 	struct wlr_box geom; /* layout-relative, includes border */
-@@ -140,8 +142,12 @@ typedef struct {
- 	unsigned int bw;
- 	uint32_t tags;
- 	int isfloating, isurgent, isfullscreen;
-+	int isterm, noswallow;
- 	uint32_t resize; /* configure serial of a pending resize */
--} Client;
-+	pid_t pid;
-+	Client *swallowing;  /* client being hidden */
-+	Client *swallowedby;
-+};
- 
- typedef struct {
- 	uint32_t mod;
-@@ -230,6 +236,8 @@ typedef struct {
- 	const char *title;
- 	uint32_t tags;
- 	int isfloating;
-+	int isterm;
-+	int noswallow;
- 	int monitor;
- } Rule;
- 
-@@ -311,6 +319,7 @@ static void moveresize(const Arg *arg);
- static void outputmgrapply(struct wl_listener *listener, void *data);
- static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
- static void outputmgrtest(struct wl_listener *listener, void *data);
-+static pid_t parentpid(pid_t pid);
- static void pointerfocus(Client *c, struct wlr_surface *surface,
- 		double sx, double sy, uint32_t time);
- static void printstatus(void);
-@@ -335,11 +344,15 @@ static void setsel(struct wl_listener *listener, void *data);
- static void setup(void);
- static void spawn(const Arg *arg);
- static void startdrag(struct wl_listener *listener, void *data);
-+static void swallow(Client *c, Client *toswallow);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
-+static Client *termforwin(Client *c);
- static void tile(Monitor *m);
- static void togglefloating(const Arg *arg);
- static void togglefullscreen(const Arg *arg);
-+static void toggleswallow(const Arg *arg);
-+static void toggleautoswallow(const Arg *arg);
- static void toggletag(const Arg *arg);
- static void toggleview(const Arg *arg);
- static void unlocksession(struct wl_listener *listener, void *data);
-@@ -466,11 +479,15 @@ applyrules(Client *c)
- 	if (!(title = client_get_title(c)))
- 		title = broken;
- 
-+	c->pid = client_get_pid(c);
-+
- 	for (r = rules; r < END(rules); r++) {
- 		if ((!r->title || strstr(title, r->title))
- 				&& (!r->id || strstr(appid, r->id))) {
- 			c->isfloating = r->isfloating;
- 			newtags |= r->tags;
-+			c->isterm = r->isterm;
-+			c->noswallow = r->noswallow;
- 			i = 0;
- 			wl_list_for_each(m, &mons, link) {
- 				if (r->monitor == i++)
-@@ -478,6 +495,12 @@ applyrules(Client *c)
- 			}
- 		}
- 	}
-+	if (enableautoswallow && !c->noswallow && !c->isfloating &&
-+			!c->surface.xdg->initial_commit) {
-+		Client *p = termforwin(c);
-+		if (p)
-+			swallow(c, p);
-+	}
- 	setmon(c, mon, newtags);
- }
- 
-@@ -2006,6 +2029,20 @@ outputmgrtest(struct wl_listener *listener, void *data)
- 	outputmgrapplyortest(config, 1);
- }
- 
-+pid_t
-+parentpid(pid_t pid)
-+{
-+	unsigned int v = 0;
-+	FILE *f;
-+	char buf[256];
-+	snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)pid);
-+	if (!(f = fopen(buf, "r")))
-+		return 0;
-+	fscanf(f, "%*u %*s %*c %u", &v);
-+	fclose(f);
-+	return (pid_t)v;
-+}
-+
- void
- pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
- 		uint32_t time)
-@@ -2326,7 +2363,7 @@ setfullscreen(Client *c, int fullscreen)
- 	c->isfullscreen = fullscreen;
- 	if (!c->mon || !client_surface(c)->mapped)
- 		return;
--	c->bw = fullscreen ? 0 : borderpx;
-+	c->bw = fullscreen ? 0 : BORDERPX(c);
- 	client_set_fullscreen(c, fullscreen);
- 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen
- 			? LyrFS : c->isfloating ? LyrFloat : LyrTile]);
-@@ -2404,6 +2441,9 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
- 		setfloating(c, c->isfloating);
- 	}
- 	focusclient(focustop(selmon), 1);
-+
-+	if (c->swallowing)
-+		setmon(c->swallowing, m, newtags);
- }
- 
- void
-@@ -2669,6 +2709,44 @@ startdrag(struct wl_listener *listener, void *data)
- 	LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon);
- }
- 
-+void
-+swallow(Client *c, Client *toswallow)
-+{
-+	/* Do not allow a client to swallow itself */
-+	if (c == toswallow)
-+		return;
-+
-+	/* Swallow */
-+	if (toswallow && !c->swallowing) {
-+		c->swallowing = toswallow;
-+		toswallow->swallowedby = c;
-+		toswallow->mon = c->mon;
-+		toswallow->mon = c->mon;
-+		wl_list_remove(&c->link);
-+		wl_list_insert(&c->swallowing->link, &c->link);
-+		wl_list_remove(&c->flink);
-+		wl_list_insert(&c->swallowing->flink, &c->flink);
-+		c->bw = BORDERPX(c);
-+		c->tags = toswallow->tags;
-+		c->isfloating = toswallow->isfloating;
-+		c->geom = toswallow->geom;
-+		setfullscreen(toswallow, 0);
-+	}
-+
-+	/* Unswallow */
-+	else if (c->swallowing) {
-+		wl_list_remove(&c->swallowing->link);
-+		wl_list_insert(&c->link, &c->swallowing->link);
-+		wl_list_remove(&c->swallowing->flink);
-+		wl_list_insert(&c->flink, &c->swallowing->flink);
-+		c->swallowing->tags = c->tags;
-+		c->swallowing->swallowedby = NULL;
-+		c->swallowing = NULL;
-+		c->bw = BORDERPX(c);
-+		setfullscreen(c, 0);
-+	}
-+}
-+
- void
- tag(const Arg *arg)
- {
-@@ -2690,6 +2768,40 @@ tagmon(const Arg *arg)
- 		setmon(sel, dirtomon(arg->i), 0);
- }
- 
-+Client *
-+termforwin(Client *c)
-+{
-+	Client *p;
-+	pid_t pid;
-+	pid_t pids[32];
-+	size_t i, pids_len;
-+
-+	if (!c->pid || c->isterm)
-+		return NULL;
-+
-+	/* Get all parent pids */
-+	pids_len = 0;
-+	pid = c->pid;
-+	while (pids_len < LENGTH(pids)) {
-+		pid = parentpid(pid);
-+		if (!pid)
-+			break;
-+		pids[pids_len++] = pid;
-+	}
-+
-+	/* Find closest parent */
-+	for (i = 0; i < pids_len; i++) {
-+		wl_list_for_each(p, &clients, link) {
-+			if (!p->pid || !p->isterm || p->swallowedby)
-+				continue;
-+			if (pids[i] == p->pid)
-+				return p;
-+		}
-+	}
-+
-+	return NULL;
-+}
-+
- void
- tile(Monitor *m)
- {
-@@ -2741,6 +2853,32 @@ togglefullscreen(const Arg *arg)
- 		setfullscreen(sel, !sel->isfullscreen);
- }
- 
-+void
-+toggleswallow(const Arg *arg)
-+{
-+	Client *c, *sel = focustop(selmon);
-+	if (!sel)
-+		return;
-+
-+	if (sel->swallowing) {
-+		swallow(sel, NULL);
-+	} else {
-+		wl_list_for_each(c, &sel->flink, flink) {
-+			if (&c->flink == &fstack)
-+				continue; /* wrap past the sentinel node */
-+			if (VISIBLEON(c, selmon))
-+				break; /* found it */
-+		}
-+		swallow(sel, c);
-+	}
-+}
-+
-+void
-+toggleautoswallow(const Arg *arg)
-+{
-+	enableautoswallow = !enableautoswallow;
-+}
-+
- void
- toggletag(const Arg *arg)
- {
-@@ -2801,6 +2939,12 @@ unmapnotify(struct wl_listener *listener, void *data)
- 		grabc = NULL;
- 	}
- 
-+	if (c->swallowing) {
-+		swallow(c, NULL);
-+	} else if (c->swallowedby) {
-+		swallow(c->swallowedby, NULL);
-+	}
-+
- 	if (client_is_unmanaged(c)) {
- 		if (c == exclusive_focus) {
- 			exclusive_focus = NULL;
--- 
-2.49.0
-