diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index 299675f..0000000
--- a/.clang-format
+++ /dev/null
@@ -1,8 +0,0 @@
-BasedOnStyle: Google
-IndentWidth: 4
-InsertBraces: true
-ColumnLimit: 79
-AlignConsecutiveMacros: Consecutive
-AllowShortFunctionsOnASingleLine: None
-AllowShortLoopsOnASingleLine: false
-AllowShortIfStatementsOnASingleLine: Never
diff --git a/.clang-tidy b/.clang-tidy
deleted file mode 100644
index 17ce268..0000000
--- a/.clang-tidy
+++ /dev/null
@@ -1,30 +0,0 @@
-Checks: |
- -*,
- abseil-*,
- bugprone-*,
- clang-analyzer-*,
- misc-*,
- modernize-*,
- performance-*,
- portability-*,
- readability-*,
- llvm-*,
- -bugprone-easily-swappable-parameters,
- -readability-avoid-const-params-in-decls,
- -readability-identifier-length
-
-CheckOptions:
- - key: readability-inconsistent-declaration-parameter-name.Strict
- value: true
- - key: readability-identifier-naming.StructCase
- value: lower_case
- - key: readability-identifier-naming.FunctionCase
- value: lower_case
- - key: readability-identifier-naming.VariableCase
- value: lower_case
- - key: readability-identifier-naming.EnumConstantCase
- value: UPPER_CASE
- - key: readability-identifier-naming.MacroDefinitionCase
- value: UPPER_CASE
- - key: readability-function-cognitive-complexity.Threshold
- value: 15
diff --git a/.clangd b/.clangd
deleted file mode 100644
index f8cd025..0000000
--- a/.clangd
+++ /dev/null
@@ -1,3 +0,0 @@
-Diagnostics:
- UnusedIncludes: Strict
- MissingIncludes: Strict
diff --git a/.gitignore b/.gitignore
index a747f82..f6b676c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-compile_commands.json
-.cache/clangd/index
-drw.o
-dwm
-dwm.o
-util.o
+dwm-final
+dwm-dev-1.0.0_1.x86_64.xbps
+pkg/usr
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1b17b6d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "dwm-flexipatch"]
+ path = dwm-flexipatch
+ url = https://github.com/bakkeby/dwm-flexipatch
+[submodule "flexipatch-finalizer"]
+ path = flexipatch-finalizer
+ url = https://github.com/bakkeby/flexipatch-finalizer
diff --git a/.woodpecker.yml b/.woodpecker.yml
index c116072..2d0c733 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -5,12 +5,21 @@ when:
steps:
build:
image: gcc
- environment:
- - BUILD_DEPS=libx11-dev libx11-xcb-dev libxcb1-dev libxcb-res0-dev libxft-dev libxinerama-dev libfreetype6-dev libfontconfig1-dev
commands: |
apt-get update
- apt-get install -y $${BUILD_DEPS}
- make install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr"
+ apt-get install -y \
+ libx11-dev libx11-xcb-dev libxcb1-dev \
+ libxcb-res0-dev libxft-dev libxinerama-dev \
+ libfreetype6-dev libfontconfig1-dev
+ cp -f config.mk Makefile patches.h dwm-flexipatch/
+ flexipatch-finalizer/flexipatch-finalizer.sh -r -d dwm-flexipatch -o dwm-final
+ for patch in patches/*.diff; do
+ patch -d dwm-final <"$patch"
+ done
+ cp -f config.h dwm-final/
+ cd dwm-final || exit 1
+ make clean install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr"
+
package-xbps:
image: ghcr.io/void-linux/void-musl-busybox
@@ -24,7 +33,6 @@ steps:
-n "$${CI_REPO_NAME}-$${CI_COMMIT_TAG}_1" \
-m "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" \
-s "$${SHORT_DESCRIPTION}" \
- -c "$${CI_COMMIT_MESSAGE}" \
"$${CI_WORKSPACE}/pkg"
package-targz:
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 995172f..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,38 +0,0 @@
-MIT/X Consortium License
-
-© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
-© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
-© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
-© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
-© 2007-2009 Szabolcs Nagy <nszabolcs at gmail dot com>
-© 2007-2009 Christof Musik <christof at sendfax dot de>
-© 2007-2009 Premysl Hruby <dfenze at gmail dot com>
-© 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
-© 2008 Martin Hurton <martin dot hurton at gmail dot com>
-© 2008 Neale Pickett <neale dot woozle dot org>
-© 2009 Mate Nagy <mnagy at port70 dot net>
-© 2010-2016 Hiltjo Posthuma <hiltjo@codemadness.org>
-© 2010-2012 Connor Lane Smith <cls@lubutu.com>
-© 2011 Christoph Lohmann <20h@r-36.net>
-© 2015-2016 Quentin Rameau <quinq@fifth.space>
-© 2015-2016 Eric Pruitt <eric.pruitt@gmail.com>
-© 2016-2017 Markus Teich <markus.teich@stusta.mhn.de>
-© 2020-2022 Chris Down <chris@chrisdown.name>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 819d43e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# dwm - dynamic window manager
-# See LICENSE file for copyright and license details.
-
-include config.mk
-
-SRC = drw.c dwm.c util.c
-OBJ = ${SRC:.c=.o}
-
-all: options dwm
-
-options:
- @echo dwm build options:
- @echo "CFLAGS = ${CFLAGS}"
- @echo "LDFLAGS = ${LDFLAGS}"
- @echo "CC = ${CC}"
-
-.c.o:
- ${CC} -c ${CFLAGS} $<
-
-${OBJ}: config.h config.mk
-
-config.h:
- cp config.def.h $@
-
-dwm: ${OBJ}
- ${CC} -o $@ ${OBJ} ${LDFLAGS}
-
-clean:
- rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
-
-dist: clean
- mkdir -p dwm-${VERSION}
- cp -R LICENSE Makefile README config.def.h config.mk\
- drw.h util.h ${SRC} transient.c dwm-${VERSION}
- tar -cf dwm-${VERSION}.tar dwm-${VERSION}
- gzip dwm-${VERSION}.tar
- rm -rf dwm-${VERSION}
-
-install: all
- mkdir -p ${DESTDIR}${PREFIX}/bin
- cp -f dwm ${DESTDIR}${PREFIX}/bin
- chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
- mkdir -p ${DESTDIR}${PREFIX}/share/dwm
- cp -f README.md ${DESTDIR}${PREFIX}/share/dwm/dwm.md
- chmod 644 ${DESTDIR}${PREFIX}/share/dwm/dwm.md
-
-uninstall:
- rm -f ${DESTDIR}${PREFIX}/bin/dwm
-
-.PHONY: all options clean dist install uninstall
diff --git a/README.md b/README.md
deleted file mode 100644
index 888b62a..0000000
--- a/README.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Client/Tag Control
-Modifier(s)|Key|Action
-:--|:--|:--
-Mod|0|Show all tags
-Mod Shift|0|Make a client sticky
-Mod|Tab|Focus last active client
-Mod Shift|Tab|Move active client to top of stack
-Mod|,|Focus previous monitor on stack
-Mod Shift|,|Move active client to previous monitor on stack
-Mod|.|Focus next monitor on stack
-Mod Shift|.|Move active client to next monitor on stack
-Mod|f|Toggle fullscreen on active client
-Mod|q|Kill active client
-Mod|j|Focus next client on stack
-Mod Shift|j|Move active client down stack
-Mod|k|Focus previous client on stack
-Mod Shift|k|Move active client up stack
-Mod|v|Focus first client on stack
-Mod|space|Move active client to top of stack
-Mod Shift|space|Make active client float
-
-# Layout Control
-Modifier(s)|Key|Action
-:--|:--|:--
-Mod|c|Increase number of master clients
-Mod Shift|c|Reset number of master clients
-Mod|r|Decrease number of master clients
-Mod Shift|r|Reset number of master clients
-Mod|l|Increase master area size
-Mod|h|Decrease master area size
-Mod|n|Switch to tile layout
-Mod Shift|n|Switch to bottom stack layout
-Mod|s|Switch to centered master layout
-Mod Shift|s|Switch to grid layout
-Mod|minus|Switch to monocle layout
-Mod Shift|minus|Switch to horizontal bottom stack layout
-
-# Spawn Programs
-Modifier(s)|Key|Action
-:--|:--|:--
-Mod|g|Spawn wiki.vim scratchpad
-Mod|t|Spawn a browser window
-Mod Shift|t|Spawn a private browser window
-Mod|o|Toggle HTOP (Process Manager) scratchpad
-Mod Shift|o|Spawn an HTOP (Process Manager) window
-Mod|e|Toggle LF (File Manager) scratchpad
-Mod Shift|e|Spawn an LF (File Manager) window
-Mod|u|Spawn launcher menu
-Mod|backslash|Toggle calculator scratchpad
-Mod|Return|Spawn a terminal window
-Mod Shift|Return|Spawn a terminal scratchpad
-Mod Alt|Return|Spawn a terminal window in working directory of active client
-Mod|b|Spawn an NMTUI (Network Manager) window
-Mod|w|Spawn Ferdium
-
-# System
-Modifier(s)|Key|Action
-:--|:--|:--
-Mod|i|Close the topmost notification
-Mod Shift|i|Bring back the last closed notification
-Mod|d|Open the context menu for the topmost notification
-Mod Shift|d|Run the default action for the topmost notification
-Mod|F2|Toggle Picom compositor
-Mod|F3|Spawn volume panel
-Mod|F5|Toggle Touchpad
-Mod|F9|Spawn mounting menu
-Mod|F10|Spawn unmounting menu
-Mod|F11|Spawn display select menu
-Mod|F12|Switch keyboard layout
-Mod|BackSpace|Spawn system menu
-Mod Shift|End|Kill DWM
-Mod|Up|Increase volume by 5
-Mod Shift|Up|Increase volume by 20
-Mod|Down|Decrease volume by 5
-Mod Shift|Down|Decrease volume by 20
-Mod|m|Mute all sound
-Mod Shift|m|Stop all players
-Mod|p|Play or pause the last active player
-
-# Misc.
-Modifier(s)|Key|Action
-:--|:--|:--
-Mod Shift|b|Toggle status bar
-Mod|F1|Show this help manual
-Mod|\`|Spawn emoji/fontawesome picker, immediately paste
-Mod Shift|\`|Spawn emoji/fontawesome picker, copy to clipboard
-||Print|Make screenshot
-Shift|Print|Spawn screenshot menu
-Mod|Print|Spawn recording menu
-Mod Shift|Print|Kill recording
-Mod|Delete|Kill recording
-Mod|Left|Play last track
-Mod Shift|Left|Seek track to beginning
-Mod|Right|Play next track
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..4f1eab0
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+cp config.mk patches.h dwm-flexipatch/
+flexipatch-finalizer/flexipatch-finalizer.sh -r -d dwm-flexipatch -o dwm-final
+for patch in patches/*.diff; do
+ patch -d dwm-final <"$patch"
+done
+cp config.h dwm-final/
+cd dwm-final || exit 1
+make clean install DESTDIR="../pkg" PREFIX="/usr"
+cd - || exit 1
+
+# xbps-create -A x86_64 \
+# -n "dwm-dev-1.0.0_1" \
+# -s "Test build of dwm" \
+# pkg
diff --git a/config.h b/config.h
index a6c2527..a03721d 100644
--- a/config.h
+++ b/config.h
@@ -1,159 +1,310 @@
/* See LICENSE file for copyright and license details. */
+#define TERM "st"
+#define TERM_FLAG_NAME "-n"
+#define TERM_FLAG_EXEC "-e"
+#define TERM_START "tmux"
+
+#define STATUSBAR "dwmblocks"
+
#define BROWSER "brave-browser"
-#define BROWSER_FLAG "--enable-blink-features=MiddleClickAutoscroll"
-#define INCOGNITO "--incognito"
-#define TERMINAL "st"
-#define PLAYERCTL "brave" /* this is currently only passed to playerctl as the client to control */
+#define BROWSER_FLAG_INCOG "--incognito"
+#define BROWSER_FLAG_1 "--enable-blink-features=MiddleClickAutoscroll"
+
/* appearance */
-static const unsigned int borderpx = 2;
-static const unsigned int snap = 20;
-static const int showbar = 1;
-static const int topbar = 1;
-static const int swallowfloating = 0;
-static const unsigned int systraypinning = 0;
-static const unsigned int systrayonleft = 0;
-static const unsigned int systrayspacing = 2;
-static const int systraypinningfailfirst = 1;
-static const int showsystray = 1;
-static const char *fonts[] = {
- "FiraCode Nerd Font Mono:pixelsize=14",
- "FiraCode Nerd Font Mono:pixelsize=20",
- "FiraCode Nerd Font Mono:pixelsize=30",
- "Noto Color Emoji:pixelsize=14",
- "FontAwesome:pixelsize=14"
+static const unsigned int borderpx = 2;
+static const unsigned int snap = 33;
+static const int swallowfloating = 1;
+static const int showbar = 1;
+static const int topbar = 0;
+static const int focusonwheel = 1;
+static int floatposgrid_x = 5;
+static int floatposgrid_y = 3;
+static const unsigned int systrayspacing = 0;
+static const int showsystray = 1;
+
+/* Indicators: see patch/bar_indicators.h for options */
+static int tagindicatortype = INDICATOR_NONE;
+static int tiledindicatortype = INDICATOR_NONE;
+static int floatindicatortype = INDICATOR_NONE;
+
+static const char font[] = "FiraCode Nerd Font 28";
+static const char dmenufont[] = "FiraCode Nerd Font:pixelsize=14";
+
+#define NOCOLOR "#FF0000"
+#define COLOR0 "#15161E"
+#define COLOR1 "#f7768e"
+#define COLOR2 "#9ece6a"
+#define COLOR3 "#e0af68"
+#define COLOR4 "#7aa2f7"
+#define COLOR5 "#bb9af7"
+#define COLOR6 "#7dcfff"
+#define COLOR7 "#a9b1d6"
+#define COLOR8 "#414868"
+#define COLOR9 "#f7768e"
+#define COLOR10 "#9ece6a"
+#define COLOR11 "#e0af68"
+#define COLOR12 "#7aa2f7"
+#define COLOR13 "#bb9af7"
+#define COLOR14 "#7dcfff"
+#define COLOR15 "#c0caf5"
+
+#define BORDERNORM "#383c4a"
+#define BORDERSEL COLOR4
+
+static char normfgcolor[] = COLOR15;
+static char normbgcolor[] = COLOR0;
+static char normbordercolor[] = BORDERNORM;
+static char normfloatcolor[] = BORDERNORM;
+
+static char selfgcolor[] = COLOR15;
+static char selbgcolor[] = COLOR4;
+static char selbordercolor[] = BORDERSEL;
+static char selfloatcolor[] = BORDERSEL;
+
+static char titlenormfgcolor[] = COLOR7;
+static char titlenormbgcolor[] = COLOR0;
+static char titlenormbordercolor[] = NOCOLOR;
+static char titlenormfloatcolor[] = NOCOLOR;
+
+static char titleselfgcolor[] = COLOR7;
+static char titleselbgcolor[] = COLOR0;
+static char titleselbordercolor[] = NOCOLOR;
+static char titleselfloatcolor[] = NOCOLOR;
+
+static char tagsnormfgcolor[] = COLOR7;
+static char tagsnormbgcolor[] = COLOR0;
+static char tagsnormbordercolor[] = NOCOLOR;
+static char tagsnormfloatcolor[] = NOCOLOR;
+
+static char tagsselfgcolor[] = COLOR0;
+static char tagsselbgcolor[] = COLOR4;
+static char tagsselbordercolor[] = NOCOLOR;
+static char tagsselfloatcolor[] = NOCOLOR;
+
+static char hidnormfgcolor[] = NOCOLOR;
+static char hidselfgcolor[] = NOCOLOR;
+static char hidnormbgcolor[] = NOCOLOR;
+static char hidselbgcolor[] = NOCOLOR;
+
+static char urgfgcolor[] = COLOR0;
+static char urgbgcolor[] = COLOR1;
+static char urgbordercolor[] = COLOR1;
+static char urgfloatcolor[] = COLOR1;
+
+static char scratchselfgcolor[] = COLOR15;
+static char scratchselbgcolor[] = COLOR4;
+static char scratchselbordercolor[] = BORDERSEL;
+static char scratchselfloatcolor[] = BORDERSEL;
+
+static char scratchnormfgcolor[] = COLOR15;
+static char scratchnormbgcolor[] = COLOR0;
+static char scratchnormbordercolor[] = BORDERNORM;
+static char scratchnormfloatcolor[] = BORDERNORM;
+
+static const unsigned int baralpha = 0xcc;
+static const unsigned int borderalpha = OPAQUE;
+static const unsigned int alphas[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { OPAQUE, baralpha, borderalpha },
+ [SchemeSel] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTitleNorm] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTitleSel] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTagsNorm] = { OPAQUE, baralpha, borderalpha },
+ [SchemeTagsSel] = { OPAQUE, OPAQUE, borderalpha },
+ [SchemeHidNorm] = { OPAQUE, baralpha, borderalpha },
+ [SchemeHidSel] = { OPAQUE, baralpha, borderalpha },
+ [SchemeUrg] = { OPAQUE, OPAQUE, borderalpha },
+ [SchemeScratchSel] = { OPAQUE, baralpha, borderalpha },
+ [SchemeScratchNorm] = { OPAQUE, baralpha, borderalpha },
};
-static const char color0[] = "#15161E";
-static const char color1[] = "#f7768e";
-static const char color2[] = "#9ece6a";
-static const char color3[] = "#e0af68";
-static const char color4[] = "#7aa2f7";
-static const char color5[] = "#bb9af7";
-static const char color6[] = "#7dcfff";
-static const char color7[] = "#a9b1d6";
-static const char color8[] = "#414868";
-static const char color9[] = "#f7768e";
-static const char color10[] = "#9ece6a";
-static const char color11[] = "#e0af68";
-static const char color12[] = "#7aa2f7";
-static const char color13[] = "#bb9af7";
-static const char color14[] = "#7dcfff";
-static const char color15[] = "#c0caf5";
-static const char bordernorm[] = "#383c4a";
-static const char bordersel[] = "#7aa2f7";
-
-static const char *barschemes[][3] = {
- /* fg bg border */
- [SchemeNorm] = { color15, color0, bordernorm },
- [SchemeSel] = { color15, color4, bordersel },
- [SchemeStatus] = { color7, color0, "#000000" }, // Statusbar right
- [SchemeTagsSel] = { color0, color4, "#000000" }, // Tagbar left selected
- [SchemeTagsNorm] = { color7, color0, "#000000" }, // Tagbar left unselected
- [SchemeInfoSel] = { color7, color0, "#000000" }, // infobar middle selected
- [SchemeInfoNorm] = { color7, color0, "#000000" }, // infobar middle unselected
+static char *colors[][ColCount] = {
+ /* fg bg border float */
+ [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor, normfloatcolor },
+ [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor, selfloatcolor },
+ [SchemeTitleNorm] = { titlenormfgcolor, titlenormbgcolor, titlenormbordercolor, titlenormfloatcolor },
+ [SchemeTitleSel] = { titleselfgcolor, titleselbgcolor, titleselbordercolor, titleselfloatcolor },
+ [SchemeTagsNorm] = { tagsnormfgcolor, tagsnormbgcolor, tagsnormbordercolor, tagsnormfloatcolor },
+ [SchemeTagsSel] = { tagsselfgcolor, tagsselbgcolor, tagsselbordercolor, tagsselfloatcolor },
+ [SchemeHidNorm] = { hidnormfgcolor, hidnormbgcolor, NOCOLOR, NOCOLOR },
+ [SchemeHidSel] = { hidselfgcolor, hidselbgcolor, NOCOLOR, NOCOLOR },
+ [SchemeUrg] = { urgfgcolor, urgbgcolor, urgbordercolor, urgfloatcolor },
+ [SchemeScratchSel] = { scratchselfgcolor, scratchselbgcolor, scratchselbordercolor, scratchselfloatcolor },
+ [SchemeScratchNorm] = { scratchnormfgcolor, scratchnormbgcolor, scratchnormbordercolor, scratchnormfloatcolor },
};
-/* tagging */
-static const char *tags[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9"};
+static const char *layoutmenu_cmd = "xmenulayout";
+// static const char *layoutxmenu = "$HOME/.local/libexec/dwm/xmenulayout"; // TODO: Patch layoutmenu to accept arguments
+// static const char *layoutdmenu = "$HOME/.local/libexec/dwm/dmenulayout"; // TODO: Patch layoutmenu to accept shell commands
+
+// TODO: Enable this when ready
+static const char *const autostart[] = {
+ "sh", "-c", "exec runsvdir $SVDIR", NULL,
+ "sh", "-c", "exec $HOME/.local/libexec/dwm/autostart.sh", NULL,
+ NULL
+};
+
+static const char *spterm[] = { "t", TERM, "-n", "spterm", TERM_FLAG_EXEC, "tmux", NULL };
+static const char *spfile[] = { "l", TERM, "-n", "spfile", TERM_FLAG_EXEC, "lf-sixel", NULL };
+static const char *spproc[] = { "h", TERM, "-n", "sphtop", TERM_FLAG_EXEC, "htop", NULL };
+static const char *spvolm[] = { "m", TERM, "-n", "spvolm", TERM_FLAG_EXEC, "pulsemixer", NULL };
+static const char *sphelp[] = { "n", TERM, "-n", "sphelp", TERM_FLAG_EXEC, "/bin/sh", "-c", "glow -p -s $XDG_CONFIG_HOME/glow/style.json /usr/share/dwm/dwm.md", NULL };
+static const char *spinet[] = { "i", TERM, "-n", "spinet", TERM_FLAG_EXEC, "nmtui", NULL };
+static const char *spwiki[] = { "v", TERM, "-n", "spwiki", TERM_FLAG_EXEC, "zk", "edit", "-i", NULL };
+static const char *spcalc[] = { "c", TERM, "-n", "spcalc", TERM_FLAG_EXEC, "bc", "-li", NULL };
+
+static char *tagicons[][NUMTAGS] =
+{
+ [DEFAULT_TAGS] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" },
+};
static const Rule rules[] = {
/* xprop(1):
- * WM_CLASS(STRING) = instance, class
- * WM_NAME(STRING) = title
- * If X, Y, W or H are between 0 and 1 (inclusive), their values interpreted as percentages of the current monitor resolution.
- * If X or Y are negative, they are subtracted from the current monitor resolution and then that value is interpreted.
- class instance title scratch key tags mask isfloating isterminal noswallow x, y, w, h borderpx */
- { NULL, NULL, "Event Tester", 0, 0, 0, 0, 1, 0, 0, 0, 0, -1 },
- { "Xournalpp", "xournalpp", NULL, 0, 0, 0, 0, -1, 0, 0, 0, 0, -1 },
- { "Zathura", "org.pwmt.zathura", NULL, 0, 0, 0, 0, -1, 0, 0, 0, 0, -1 },
- { NULL, "st", NULL, 0, 0, 0, 1, 0, 0, 0, 0, 0, -1 },
- { "Brave-browser", NULL, "Bitwarden", 0, 0, 1, 0, 0, .5, .5, .4, .8, -1 },
- { "Qalculate-gtk", NULL, NULL, 'q', 0, 1, 0, 0, .5, .5, 722, 512, -1 },
- { NULL, "sphelp", NULL, 'n', 0, 1, 0, 0, .5, .5, .4, .8, -1 },
- { NULL, "spterm", NULL, 't', 0, 1, 1, 0, .5, .5, .8, .8, -1 },
- { NULL, "splf", NULL, 'l', 0, 1, 0, 0, .5, .5, .8, .8, -1 },
- { NULL, "sphtop", NULL, 'h', 0, 1, 0, 0, .5, .5, .8, .8, -1 },
- { NULL, "spmix", NULL, 'm', 0, 1, 0, 0, -4, -4, 900, 600, -1 },
- { NULL, "spnmtui", NULL, 'i', 0, 1, 0, 0, -4, -4, 800, 800, -1 },
- { NULL, "spwiki", NULL, 'v', 0, 1, 0, 0, .5, .5, .8, .8, -1 },
+ * WM_CLASS(STRING) = instance, class
+ * WM_NAME(STRING) = title
+ * WM_WINDOW_ROLE(STRING) = role
+ * _NET_WM_WINDOW_TYPE(ATOM) = wintype
+ */
+ RULE(.wintype = WTYPE "DIALOG", .isfloating = 1)
+ RULE(.wintype = WTYPE "UTILITY", .isfloating = 1)
+ RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1)
+ RULE(.wintype = WTYPE "SPLASH", .isfloating = 1)
+ RULE(.title = "Event Tester", .noswallow = 1)
+ RULE(.class = "St", .isterminal = 1)
+ RULE(.instance = "sphelp", .scratchkey = 'h', .isfloating = 1, .floatpos = "50% 50% 40% 80%")
+ RULE(.instance = "spcalc", .scratchkey = 'c', .isfloating = 1, .floatpos = "50% 50% 40% 80%")
+ RULE(.instance = "spterm", .scratchkey = 't', .isfloating = 1, .floatpos = "50% 50% 80% 80%")
+ RULE(.instance = "spfile", .scratchkey = 'f', .isfloating = 1, .floatpos = "50% 50% 80% 80%")
+ RULE(.instance = "spproc", .scratchkey = 'p', .isfloating = 1, .floatpos = "50% 50% 80% 80%")
+ RULE(.instance = "spwiki", .scratchkey = 'w', .isfloating = 1, .floatpos = "50% 50% 80% 80%")
+ RULE(.instance = "spvolm", .scratchkey = 'v', .isfloating = 1, .floatpos = "100% 100% 900W 600H")
+ RULE(.instance = "spinet", .scratchkey = 'i', .isfloating = 1, .floatpos = "100% 100% 800W 800H")
+};
+
+/* Bar rules allow you to configure what is shown where on the bar, as well as
+ * introducing your own bar modules.
+ *
+ * monitor:
+ * -1 show on all monitors
+ * 0 show on monitor 0
+ * 'A' show on active monitor (i.e. focused / selected) (or just -1 for active?)
+ * bar - bar index, 0 is default, 1 is extrabar
+ * alignment - how the module is aligned compared to other modules
+ * widthfunc, drawfunc, clickfunc - providing bar module width, draw and click functions
+ * name - does nothing, intended for visual clue and for logging / debugging
+ */
+static const BarRule barrules[] = {
+ /* monitor bar alignment widthfunc drawfunc clickfunc hoverfunc name */
+ { -1, 0, BAR_ALIGN_LEFT, width_tags, draw_tags, click_tags, hover_tags, "tags" },
+ { 'A', 0, BAR_ALIGN_RIGHT, width_systray, draw_systray, click_systray, NULL, "systray" },
+ { -1, 0, BAR_ALIGN_LEFT, width_ltsymbol, draw_ltsymbol, click_ltsymbol, NULL, "layout" },
+ { 'A', 0, BAR_ALIGN_RIGHT, width_status, draw_status, click_statuscmd, NULL, "status" },
+ { -1, 0, BAR_ALIGN_NONE, width_wintitle, draw_wintitle, click_wintitle, NULL, "wintitle" },
};
/* layout(s) */
-static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */
-static const int nmaster = 1; /* number of clients in master area */
-static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
+static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */
+static const int nmaster = 1; /* number of clients in master area */
+static const int nstack = 0; /* number of clients in primary stack area */
+static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
+static const int decorhints = 1; /* 1 means respect decoration hints */
+
+
static const Layout layouts[] = {
- /* symbol arrange function */
- { "[]=", tile },
- { "TTT", bstack },
- { "|M|", centeredmaster },
- { ":::", gaplessgrid },
- { "[M]", monocle },
- { "===", bstackhoriz },
- { ">M>", centeredfloatingmaster },
- { "><>", NULL }, /* Floating */
+ /* symbol arrange function, { nmaster, nstack, layout, master axis, stack axis, secondary stack axis, symbol func } */
+ { "[]=", flextile, { -1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, TOP_TO_BOTTOM, 0, NULL } }, // default tile layout
+ { "><>", NULL, {0} }, /* no layout function means floating behavior */
+ { "[M]", flextile, { -1, -1, NO_SPLIT, MONOCLE, MONOCLE, 0, NULL } }, // monocle
+ { "|||", flextile, { -1, -1, SPLIT_VERTICAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // columns (col) layout
+ { ">M>", flextile, { -1, -1, FLOATING_MASTER, LEFT_TO_RIGHT, LEFT_TO_RIGHT, 0, NULL } }, // floating master
+ { "[D]", flextile, { -1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, MONOCLE, 0, NULL } }, // deck
+ { "TTT", flextile, { -1, -1, SPLIT_HORIZONTAL, LEFT_TO_RIGHT, LEFT_TO_RIGHT, 0, NULL } }, // bstack
+ { "===", flextile, { -1, -1, SPLIT_HORIZONTAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // bstackhoriz
+ { "|M|", flextile, { -1, -1, SPLIT_CENTERED_VERTICAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, TOP_TO_BOTTOM, NULL } }, // centeredmaster
+ { "-M-", flextile, { -1, -1, SPLIT_CENTERED_HORIZONTAL, TOP_TO_BOTTOM, LEFT_TO_RIGHT, LEFT_TO_RIGHT, NULL } }, // centeredmaster horiz
+ { ":::", flextile, { -1, -1, NO_SPLIT, GAPPLESSGRID, GAPPLESSGRID, 0, NULL } }, // gappless grid
+ { "[\\]", flextile, { -1, -1, NO_SPLIT, DWINDLE, DWINDLE, 0, NULL } }, // fibonacci dwindle
+ { "(@)", flextile, { -1, -1, NO_SPLIT, SPIRAL, SPIRAL, 0, NULL } }, // fibonacci spiral
+ { "[T]", flextile, { -1, -1, SPLIT_VERTICAL, LEFT_TO_RIGHT, TATAMI, 0, NULL } }, // tatami mats
+ { "[M]", monocle, {0} },
};
+
/* key definitions */
#define MODKEY Mod4Mask
#define TAGKEYS(KEY,TAG) \
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
+ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } }
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */
-static const char *spqalc[] = { "q", "qalculate-gtk", NULL };
-static const char *spterm[] = { "t", TERMINAL, "-n", "spterm", "-e", "env", "SCRATCHPAD=true", "tmux", NULL };
-static const char *splf[] = { "l", TERMINAL, "-n", "splf", "-e", "env", "SCRATCHPAD=true", "lf-sixel", NULL };
-static const char *sphtop[] = { "h", TERMINAL, "-n", "sphtop", "-e", "env", "SCRATCHPAD=true", "htop", NULL };
-static const char *spmix[] = { "m", TERMINAL, "-n", "spmix", "-e", "env", "SCRATCHPAD=true", "pulsemixer", NULL };
-static const char *sphelp[] = { "n", TERMINAL, "-n", "sphelp", "-e", "env", "SCRATCHPAD=true", "/bin/sh", "-c", "glow /usr/share/dwm/dwm.md | less", NULL };
-static const char *spnmtui[] = { "i", TERMINAL, "-n", "spnmtui", "-e", "env", "SCRATCHPAD=true", "nmtui", NULL };
-static const char *spwiki[] = { "v", TERMINAL, "-n", "spwiki", "-e", "env", "SCRATCHPAD=true", "zk", "edit", "-i", NULL };
+static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+static const char *dmenucmd[] = {
+ "dmenu_run",
+ "-m", dmenumon,
+ "-fn", dmenufont,
+ "-nb", normbgcolor,
+ "-nf", normfgcolor,
+ "-sb", selbgcolor,
+ "-sf", selfgcolor,
+ topbar ? NULL : "-b",
+ NULL
+};
+static const char *termcmd[] = { TERM, TERM_FLAG_EXEC, TERM_START, NULL };
#include <X11/XF86keysym.h>
-
static const Key keys[] = {
- /* modifier key function argument */
+ /* modifier key function argument */
{ MODKEY, XK_F1, togglescratch, {.v = sphelp} },
+ // { MODKEY | ShiftMask, XK_F1, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_F2, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenuhandler") },
- { MODKEY, XK_F3, togglescratch, {.v = spmix} },
+ // { MODKEY | ShiftMask, XK_F2, spawn, {.v = (const char *[]){NULL}} },
+ { MODKEY, XK_F3, spawn, SHCMD("$HOME/.local/libexec/dwm/togtouchpad") },
+ // { MODKEY | ShiftMask, XK_F3, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_F4, spawn, SHCMD("$HOME/.local/libexec/dwm/togcompositor") },
- { MODKEY, XK_F5, spawn, SHCMD("$HOME/.local/libexec/dwm/togtouchpad") },
+ // { MODKEY | ShiftMask, XK_F4, spawn, {.v = (const char *[]){NULL}} },
+ { MODKEY, XK_F5, xrdb, {.v = NULL } },
// { MODKEY, XK_F6, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_F6, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_F7, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_F7, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_F8, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_F8, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_F9, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenumount") },
+ // { MODKEY | ShiftMask, XK_F9, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_F10, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenuumount") },
+ // { MODKEY | ShiftMask, XK_F10, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_F11, spawn, SHCMD("$HOME/.local/libexec/dwm/displayselect") },
+ // { MODKEY | ShiftMask, XK_F11, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_F12, spawn, SHCMD("$HOME/.local/libexec/dwm/remaps") },
+ // { MODKEY | ShiftMask, XK_F12, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_grave, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenuunicode --nocopy") },
{ MODKEY | ShiftMask, XK_grave, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenuunicode") },
- TAGKEYS( XK_1, 0)
- TAGKEYS( XK_2, 1)
- TAGKEYS( XK_3, 2)
- TAGKEYS( XK_4, 3)
- TAGKEYS( XK_5, 4)
- TAGKEYS( XK_6, 5)
- TAGKEYS( XK_7, 6)
- TAGKEYS( XK_8, 7)
- TAGKEYS( XK_9, 8)
- { MODKEY, XK_0, view, {.ui = ~0} },
- { MODKEY | ShiftMask, XK_0, tag, {.ui = ~0} },
+ TAGKEYS( XK_1, 0),
+ TAGKEYS( XK_2, 1),
+ TAGKEYS( XK_3, 2),
+ TAGKEYS( XK_4, 3),
+ TAGKEYS( XK_5, 4),
+ TAGKEYS( XK_6, 5),
+ TAGKEYS( XK_7, 6),
+ TAGKEYS( XK_8, 7),
+ TAGKEYS( XK_9, 8),
+ { MODKEY, XK_0, view, {.ui = ~0} },
+ { MODKEY | ShiftMask, XK_0, tag, {.ui = ~0} },
+ { MODKEY | Mod1Mask, XK_0, winview, {0} },
// { MODKEY, XK_bracketleft, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_bracketleft, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_bracketright, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_bracketright, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_BackSpace, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenusys") },
// { MODKEY | ShiftMask, XK_BackSpace, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_Tab, focusstack, {.i = PREVSEL} },
- // { MODKEY | ShiftMask, XK_Tab, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY, XK_Tab, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_Tab, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_apostrophe, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_apostrophe, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_comma, focusmon, {.i = +1} },
@@ -164,47 +315,46 @@ static const Key keys[] = {
// { MODKEY | ShiftMask, XK_p, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_y, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_y, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_f, togglefullscr, {0} },
- // { MODKEY | ShiftMask, XK_f, setlayout, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_g, togglescratch, {.v = spwiki} },
- // { MODKEY | ShiftMask, XK_g, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_c, incnmaster, {.i = +1} },
- { MODKEY | ShiftMask, XK_c, resetnmaster, {0} },
- { MODKEY, XK_r, incnmaster, {.i = -1} },
- { MODKEY | ShiftMask, XK_r, resetnmaster, {0} },
+ { MODKEY, XK_f, togglefullscreen, {0} },
+ // { MODKEY | ShiftMask, XK_f, spawn, {.v = (const char *[]){NULL}} },
+ { MODKEY, XK_g, cyclelayout, {.i = -1} },
+ { MODKEY | ShiftMask, XK_g, rotatelayoutaxis, {.i = -1} },
+ { MODKEY, XK_c, setlayout, {.v = &layouts[0]} },
+ // { MODKEY | ShiftMask, XK_c, spawn, {.v = (const char *[]){NULL}} }, /* TODO: reset axis */
+ { MODKEY, XK_r, cyclelayout, {.i = +1} },
+ { MODKEY | ShiftMask, XK_r, rotatelayoutaxis, {.i = +1} },
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
- // { MODKEY | ShiftMask, XK_l, spawn, {.v = (const char *[]){NULL}} },
+ { MODKEY | ShiftMask, XK_l, setcfact, {.f = +0.1} },
// { MODKEY, XK_slash, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_slash, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_equal, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_equal, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_a, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_a, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_o, togglescratch, {.v = sphtop} },
- { MODKEY | ShiftMask, XK_o, spawn, {.v = (const char *[]){TERMINAL, "-e", "htop", NULL}} },
- { MODKEY, XK_e, togglescratch, {.v = splf} },
+ { MODKEY, XK_o, togglescratch, {.v = spproc} },
+ // { MODKEY | ShiftMask, XK_o, spawn, {.v = (const char *[]){NULL}} },
+ { MODKEY, XK_e, togglescratch, {.v = spfile} },
// { MODKEY | ShiftMask, XK_e, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_u, spawn, {.v = (const char *[]){"dmenu_run", NULL}} },
+ { MODKEY, XK_u, spawn, {.v = dmenucmd} },
// { MODKEY | ShiftMask, XK_u, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_i, spawn, {.v = (const char *[]){"dunstctl", "close", NULL}} },
{ MODKEY | ShiftMask, XK_i, spawn, {.v = (const char *[]){"dunstctl", "history-pop", NULL}} },
{ MODKEY, XK_d, spawn, {.v = (const char *[]){"dunstctl", "context", NULL}} },
{ MODKEY | ShiftMask, XK_d, spawn, {.v = (const char *[]){"dunstctl", "action", "0", NULL}} },
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
- // { MODKEY | ShiftMask, XK_h, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_t, spawn, {.v = (const char *[]){BROWSER, BROWSER_FLAG, NULL}} },
- { MODKEY | ShiftMask, XK_t, spawn, {.v = (const char *[]){BROWSER, BROWSER_FLAG, INCOGNITO, NULL}} },
- { MODKEY, XK_n, setlayout, {.v = &layouts[0]} },
- { MODKEY | ShiftMask, XK_n, setlayout, {.v = &layouts[1]} },
- { MODKEY, XK_s, setlayout, {.v = &layouts[2]} },
- { MODKEY | ShiftMask, XK_s, setlayout, {.v = &layouts[3]} },
- { MODKEY, XK_minus, setlayout, {.v = &layouts[4]} },
- { MODKEY | ShiftMask, XK_minus, setlayout, {.v = &layouts[5]} },
- { MODKEY, XK_backslash, togglescratch, {.v = spqalc} },
+ { MODKEY | ShiftMask, XK_h, setcfact, {.f = -0.1} },
+ { MODKEY, XK_t, spawn, {.v = (const char *[]){BROWSER, BROWSER_FLAG_1, NULL}} },
+ { MODKEY | ShiftMask, XK_t, spawn, {.v = (const char *[]){BROWSER, BROWSER_FLAG_1, BROWSER_FLAG_INCOG, NULL}} },
+ { MODKEY, XK_n, focusstack, {.i = PREVSEL} },
+ { MODKEY | ShiftMask, XK_n, pushstack, {.i = PREVSEL} },
+ { MODKEY, XK_s, incnmaster, {.i = +1 } },
+ { MODKEY | ShiftMask, XK_s, incnmaster, {.i = -1 } },
+ // { MODKEY, XK_minus, spawn, {.v = (const char *[]){NULL}} }, /* TODO: reset nmaster */
+ // { MODKEY | ShiftMask, XK_minus, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY, XK_backslash, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_backslash, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_Return, spawn, {.v = (const char *[]){TERMINAL, "tmux", NULL}} },
- { MODKEY | ShiftMask, XK_Return, togglescratch, {.v = spterm} },
- { MODKEY | Mod3Mask, XK_Return, spawn, {.v = (const char *[]){"sd", NULL}} },
+ { MODKEY, XK_Return, zoom, {0} },
+ { MODKEY | ShiftMask, XK_Return, mirrorlayout, {0} },
// { MODKEY, XK_semicolon, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_semicolon, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY, XK_q, killclient, {0} },
@@ -213,92 +363,98 @@ static const Key keys[] = {
{ MODKEY | ShiftMask, XK_j, pushstack, {.i = INC(+1)} },
{ MODKEY, XK_k, focusstack, {.i = INC(-1)} },
{ MODKEY | ShiftMask, XK_k, pushstack, {.i = INC(-1)} },
- // { MODKEY, XK_x, spawn, {.v = (const char *[]){NULL}} },
+ { MODKEY, XK_x, togglescratch, {.v = spcalc }},
// { MODKEY | ShiftMask, XK_x, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_b, togglescratch, {.v = spnmtui} },
- { MODKEY | ShiftMask, XK_b, togglebar, {0} },
- { MODKEY, XK_m, spawn, SHCMD("$HOME/.local/libexec/dwm/pamixer-notify -t") },
- { MODKEY | ShiftMask, XK_m, spawn, {.v = (const char *[]){"playerctl", "-a", "stop"}} },
- { MODKEY, XK_w, spawn, {.v = (const char *[]){"ferdium", NULL}} },
+ { MODKEY, XK_b, togglescratch, {.v = spinet} },
+ // { MODKEY | ShiftMask, XK_b, spawn, {.v = (const char *[]){NULL}} },
+ { MODKEY, XK_m, togglescratch, {.v = spvolm} },
+ // { MODKEY | ShiftMask, XK_m, spawn, {.v = (const char *[]){NULL}} },
+ { MODKEY, XK_w, togglescratch, {.v = spwiki} },
// { MODKEY | ShiftMask, XK_w, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_v, focusstack, {.i = 0} },
- { MODKEY | ShiftMask, XK_v, pushstack, {.i = 0} },
+ // { MODKEY, XK_v, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_v, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_z, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY | ShiftMask, XK_z, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_space, zoom, {0} },
- { MODKEY | ShiftMask, XK_space, togglefloating, {0} },
- { 0, XK_Print, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenumaim full") },
- { ShiftMask, XK_Print, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenumaim") },
+ { MODKEY, XK_space, spawn, {.v = termcmd} },
+ { MODKEY | ShiftMask, XK_space, togglescratch, {.v = spterm} },
{ MODKEY, XK_Print, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenurecord") },
{ MODKEY | ShiftMask, XK_Print, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenurecord kill") },
- // { MODKEY, XK_Scroll_Lock, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY | ShiftMask, XK_Scroll_Lock, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY, XK_Pause, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY | ShiftMask, XK_Pause, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY, XK_Insert, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY | ShiftMask, XK_Insert, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY, XK_Home, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY | ShiftMask, XK_Home, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY, XK_Page_Up, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY | ShiftMask, XK_Page_Up, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY, XK_Delete, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY | ShiftMask, XK_Delete, spawn, {.v = (const char *[]){NULL}} },
+ { 0, XK_Print, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenumaim full") },
+ { ShiftMask, XK_Print, spawn, SHCMD("$HOME/.local/libexec/dwm/dmenumaim") },
+ // { MODKEY, XK_scroll_lock, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_scroll_lock, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY, XK_pause, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_pause, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY, XK_insert, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_insert, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY, XK_home, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_home, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY, XK_page_up, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_page_up, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY, XK_delete, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_delete, spawn, {.v = (const char *[]){NULL}} },
// { MODKEY, XK_End, spawn, {.v = (const char *[]){NULL}} },
{ MODKEY | ShiftMask, XK_End, quit, {0} },
- // { MODKEY, XK_Page_Down, spawn, {.v = (const char *[]){NULL}} },
- // { MODKEY | ShiftMask, XK_Page_Down, spawn, {.v = (const char *[]){NULL}} },
- { MODKEY, XK_Left, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "previous", NULL}} },
- { MODKEY | ShiftMask, XK_Left, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "position", "0", NULL}} },
- { MODKEY, XK_Right, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "next", NULL}} },
- // { MODKEY | ShiftMask, XK_Right, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY, XK_page_down, spawn, {.v = (const char *[]){NULL}} },
+ // { MODKEY | ShiftMask, XK_page_down, spawn, {.v = (const char *[]){NULL}} },
+ { MODKEY, XK_Left, spawn, {.v = (const char *[]){"playerctl", "position", "5-", NULL}} },
+ { MODKEY | ShiftMask, XK_Left, spawn, {.v = (const char *[]){"playerctl", "previous", NULL}} },
+ { MODKEY, XK_Right, spawn, {.v = (const char *[]){"playerctl", "position", "5+", NULL}} },
+ { MODKEY | ShiftMask, XK_Right, spawn, {.v = (const char *[]){"playerctl", "next", NULL}} },
{ MODKEY, XK_Up, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify --allow-boost -i 5") },
- { MODKEY | ShiftMask, XK_Up, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify --allow-boost -i 20") },
+ { MODKEY | ShiftMask, XK_Up, spawn, {.v = (const char *[]){"playerctl", "volume", "5+", NULL}} },
{ MODKEY, XK_Down, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify --allow-boost -d 5") },
- { MODKEY | ShiftMask, XK_Down, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify --allow-boost -d 20") },
+ { MODKEY | ShiftMask, XK_Down, spawn, {.v = (const char *[]){"playerctl", "volume", "5-", NULL}} },
- { 0, XF86XK_AudioMute, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify -t") },
- { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify --allow-boost -i 5") },
- { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify --allow-boost -d 5") },
- { 0, XF86XK_AudioPrev, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "previous", NULL}} },
- { 0, XF86XK_AudioNext, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "next", NULL}} },
- { 0, XF86XK_AudioPause, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "pause", NULL}} },
- { 0, XF86XK_AudioPlay, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "play-pause", NULL}} }, // Most keyboards only have a play button
- { 0, XF86XK_AudioStop, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "stop", NULL}} },
- { 0, XF86XK_AudioRewind, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "position", "10-", NULL}} },
- { 0, XF86XK_AudioForward, spawn, {.v = (const char *[]){"playerctl", "-p", PLAYERCTL, "position", "10+", NULL}} },
- // { 0, XF86XK_AudioMedia, spawn, {.v = (const char *[]){NULL}} },
- { 0, XF86XK_AudioMicMute, spawn, {.v = (const char *[]){"pactl set-source-mute @DEFAULT_SOURCE@ toggle", NULL}} },
- { 0, XF86XK_PowerOff, spawn, {.v = (const char *[]){"sysact", NULL}} },
- { 0, XF86XK_Calculator, spawn, {.v = (const char *[]){TERMINAL, "-e", "bc", "-l", NULL}} },
- { 0, XF86XK_Sleep, spawn, {.v = (const char *[]){"sudo", "-A", "zzz", NULL}} },
- { 0, XF86XK_WWW, spawn, {.v = (const char *[]){BROWSER, BROWSER_FLAG, NULL}} },
- { 0, XF86XK_WLAN, spawn, SHCMD("sleep 0.1; pkill -RTMIN+4 dwmblocks") },
- { 0, XF86XK_DOS, spawn, {.v = (const char *[]){TERMINAL, NULL}} },
- { 0, XF86XK_ScreenSaver, spawn, SHCMD("xset s activate & mpc pause & pauseallmpv") },
- { 0, XF86XK_TaskPane, spawn, {.v = (const char *[]){TERMINAL, "-e", "htop", NULL}} },
- { 0, XF86XK_Mail, spawn, SHCMD("$TERMINAL -e neomutt; pkill -RTMIN+12 dwmblocks") },
- { 0, XF86XK_MyComputer, spawn, {.v = (const char *[]){TERMINAL, "-e", "lfub", "/", NULL}} },
- // { 0, XF86XK_Battery, spawn, {.v = (const char *[]){NULL}} },
- { 0, XF86XK_Launch1, spawn, {.v = (const char *[]){"xset", "dpms", "force", "off", NULL}} },
- { 0, XF86XK_TouchpadToggle, spawn, SHCMD("$HOME/.local/libexec/dwm/togtouchpad") },
- { 0, XF86XK_TouchpadOff, spawn, SHCMD("$HOME/.local/libexec/dwm/togtouchpad -n") },
- { 0, XF86XK_TouchpadOn, spawn, SHCMD("$HOME/.local/libexec/dwm/togtouchpad -y") },
+ { 0, XF86XK_AudioMute, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify -t") },
+ { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify --allow-boost -i 5") },
+ { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("$HOME/.local/libexec/pamixer-notify --allow-boost -d 5") },
+ { 0, XF86XK_AudioPrev, spawn, {.v = (const char *[]){"playerctl", "previous", NULL}} },
+ { 0, XF86XK_AudioNext, spawn, {.v = (const char *[]){"playerctl", "next", NULL}} },
+ { 0, XF86XK_AudioPause, spawn, {.v = (const char *[]){"playerctl", "pause", NULL}} },
+ { 0, XF86XK_AudioPlay, spawn, {.v = (const char *[]){"playerctl", "play-pause", NULL}} }, // Most keyboards only have a play button
+ { 0, XF86XK_AudioStop, spawn, {.v = (const char *[]){"playerctl", "stop", NULL}} },
+ { 0, XF86XK_AudioRewind, spawn, {.v = (const char *[]){"playerctl", "position", "5-", NULL}} },
+ { 0, XF86XK_AudioForward, spawn, {.v = (const char *[]){"playerctl", "position", "5+", NULL}} },
+ // { 0, XF86XK_AudioMedia, spawn, {.v = (const char *[]){NULL}} },
+ { 0, XF86XK_AudioMicMute, spawn, {.v = (const char *[]){"pactl", "set-source-mute", "@DEFAULT_SOURCE@", "toggle", NULL}} }, /* TODO: Test this */
+ { 0, XF86XK_PowerOff, spawn, {.v = (const char *[]){"dmenusys", NULL}} },
+ { 0, XF86XK_Calculator, spawn, {.v = (const char *[]){TERM, "-e", "bc", "-li", NULL}} },
+ { 0, XF86XK_Sleep, spawn, {.v = (const char *[]){"loginctl", "suspend", "-i", NULL}} },
+ { 0, XF86XK_WWW, spawn, {.v = (const char *[]){BROWSER, BROWSER_FLAG_1, NULL}} },
+ // { 0, XF86XK_WLAN, spawn, {.v = (const char *[]){NULL}} },
+ { 0, XF86XK_DOS, spawn, {.v = (const char *[]){TERM, NULL}} },
+ { 0, XF86XK_ScreenSaver, spawn, {.v = (const char *[]){"xset", "s", "activate", NULL}} },
+ { 0, XF86XK_TaskPane, spawn, {.v = (const char *[]){TERM, "-e", "htop", NULL}} },
+ // { 0, XF86XK_Mail, spawn, {.v = (const char *[]){NULL}} },
+ { 0, XF86XK_MyComputer, spawn, {.v = (const char *[]){TERM, "-e", "lfX", "/", NULL}} },
+ // { 0, XF86XK_Battery, spawn, {.v = (const char *[]){NULL}} },
+ // { 0, XF86XK_Launch1, spawn, {.v = (const char *[]){NULL}} },
+ { 0, XF86XK_TouchpadToggle, spawn, SHCMD("$HOME/.local/libexec/dwm/togtouchpad") },
+ { 0, XF86XK_TouchpadOff, spawn, SHCMD("$HOME/.local/libexec/dwm/togtouchpad -n") },
+ { 0, XF86XK_TouchpadOn, spawn, SHCMD("$HOME/.local/libexec/dwm/togtouchpad -y") },
+ { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("$HOME/.local/libexec/dwm/brightness-notify +5") },
+ { 0, XF86XK_MonBrightnessDown, spawn, SHCMD("$HOME/.local/libexec/dwm/brightness-notify -5") },
/* WARN: If you have multiple backlight controllers this will fail */
- { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("$HOME/.local/libexec/dwm/brightness-notify +5") },
- { 0, XF86XK_MonBrightnessDown, spawn, SHCMD("$HOME/.local/libexec/dwm/brightness-notify -5") },
};
/* button definitions */
-static Button buttons[] = {
- /* click event mask button function argument */
- { ClkLtSymbol, 0, Button1, setlayout, {0} },
- // { ClkWinTitle, 0, Button2, zoom, {0} },
- { ClkClientWin, MODKEY, Button1, movemouse, {0} },
- { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
- { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
- { ClkTagBar, 0, Button1, view, {0} },
- // { ClkTagBar, 0, Button3, toggleview, {0} },
- // { ClkTagBar, MODKEY, Button1, tag, {0} },
- // { ClkTagBar, MODKEY, Button3, toggletag, {0} },
-};
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
+static const Button buttons[] = {
+ /* click event mask button function argument */
+ { ClkLtSymbol, 0, Button1, layoutmenu, {0} },
+ // { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
+ // { ClkWinTitle, 0, Button2, zoom, {0} },
+ { ClkStatusText, 0, Button1, sigstatusbar, {.i = 1 } },
+ { ClkStatusText, 0, Button2, sigstatusbar, {.i = 2 } },
+ { ClkStatusText, 0, Button3, sigstatusbar, {.i = 3 } },
+ { ClkClientWin, MODKEY, Button1, movemouse, {0} },
+ { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
+ { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
+ { ClkTagBar, 0, Button1, view, {0} },
+ { ClkTagBar, 0, Button3, toggleview, {0} },
+ // { ClkTagBar, MODKEY, Button1, tag, {0} },
+ // { ClkTagBar, MODKEY, Button3, toggletag, {0} },
+};
+
+
diff --git a/config.mk b/config.mk
index 9db0dfa..a3dd682 100644
--- a/config.mk
+++ b/config.mk
@@ -5,9 +5,14 @@ VERSION = 6.4
# paths
PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/share/man
-X11INC = /usr/include/X11
-X11LIB = /usr/lib/X11
+X11INC = /usr/X11R6/include
+X11LIB = /usr/X11R6/lib
+
+# FreeBSD (uncomment)
+#X11INC = /usr/local/include
+#X11LIB = /usr/local/lib
# Xinerama, comment if you don't want it
XINERAMALIBS = -lXinerama
@@ -16,18 +21,48 @@ XINERAMAFLAGS = -DXINERAMA
# freetype
FREETYPELIBS = -lfontconfig -lXft
FREETYPEINC = /usr/include/freetype2
+# FreeBSD (uncomment)
+#FREETYPEINC = /usr/local/include/freetype2
# OpenBSD (uncomment)
#FREETYPEINC = ${X11INC}/freetype2
+# OpenBSD - Uncomment this for the swallow patch / SWALLOW_PATCH
#KVMLIB = -lkvm
+# Uncomment this for the alpha patch and the winicon patch (BAR_ALPHA_PATCH, BAR_WINICON_PATCH)
+XRENDER = -lXrender
+
+# Uncomment this for the mdpcontrol patch / MDPCONTROL_PATCH
+#MPDCLIENT = -lmpdclient
+
+# Uncomment for the pango patch / BAR_PANGO_PATCH
+PANGOINC = `pkg-config --cflags xft pango pangoxft`
+PANGOLIB = `pkg-config --libs xft pango pangoxft`
+
+# Uncomment for the ipc patch / IPC_PATCH
+#YAJLLIBS = -lyajl
+#YAJLINC = -I/usr/include/yajl
+
+# Uncomment this for the rounded corners patch / ROUNDED_CORNERS_PATCH
+#XEXTLIB = -lXext
+
+# Uncomment this for the swallow patch / SWALLOW_PATCH
+XCBLIBS = -lX11-xcb -lxcb -lxcb-res
+
+# This is needed for the winicon and tagpreview patches / BAR_WINICON_PATCH / BAR_TAGPREVIEW_PATCH
+#IMLIB2LIBS = -lImlib2
+
+# Uncomment for the bidi patch
+#BDINC = `pkg-config --cflags fribidi`
+#BDLIBS = `pkg-config --libs fribidi`
+
# includes and libs
-INCS = -I${X11INC} -I${FREETYPEINC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res ${KVMLIB}
+INCS = -I${X11INC} -I${FREETYPEINC} ${YAJLINC} ${PANGOINC} ${BDINC}
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} ${XRENDER} ${MPDCLIENT} ${XEXTLIB} ${XCBLIBS} ${KVMLIB} ${PANGOLIB} ${YAJLLIBS} ${IMLIB2LIBS} $(BDLIBS)
# flags
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
+CFLAGS = -std=c99 -pedantic -Wall -Wno-unused-function -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
LDFLAGS = ${LIBS}
# Solaris
diff --git a/drw.c b/drw.c
deleted file mode 100644
index a8224be..0000000
--- a/drw.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <X11/Xft/Xft.h>
-#include <X11/Xlib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "drw.h"
-#include "util.h"
-
-#define UTF_INVALID 0xFFFD
-#define UTF_SIZ 4
-
-static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
-static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static const long utfmin[UTF_SIZ + 1] = {0, 0, 0x80, 0x800, 0x10000};
-static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
-
-static long utf8decodebyte(const char c, size_t *i) {
- for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
- if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
- return (unsigned char)c & ~utfmask[*i];
- return 0;
-}
-
-static size_t utf8validate(long *u, size_t i) {
- if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
- *u = UTF_INVALID;
- for (i = 1; *u > utfmax[i]; ++i)
- ;
- return i;
-}
-
-static size_t utf8decode(const char *c, long *u, size_t clen) {
- size_t i, j, len, type;
- long udecoded;
-
- *u = UTF_INVALID;
- if (!clen)
- return 0;
- udecoded = utf8decodebyte(c[0], &len);
- if (!BETWEEN(len, 1, UTF_SIZ))
- return 1;
- for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
- udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
- if (type)
- return j;
- }
- if (j < len)
- return 0;
- *u = udecoded;
- utf8validate(u, len);
-
- return len;
-}
-
-Drw *drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) {
- Drw *drw = ecalloc(1, sizeof(Drw));
-
- drw->dpy = dpy;
- drw->screen = screen;
- drw->root = root;
- drw->w = w;
- drw->h = h;
- drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
- drw->gc = XCreateGC(dpy, root, 0, NULL);
- XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
-
- return drw;
-}
-
-void drw_resize(Drw *drw, unsigned int w, unsigned int h) {
- if (!drw)
- return;
-
- drw->w = w;
- drw->h = h;
- if (drw->drawable)
- XFreePixmap(drw->dpy, drw->drawable);
- drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-}
-
-void drw_free(Drw *drw) {
- XFreePixmap(drw->dpy, drw->drawable);
- XFreeGC(drw->dpy, drw->gc);
- drw_fontset_free(drw->fonts);
- free(drw);
-}
-
-/* This function is an implementation detail. Library users should use
- * drw_fontset_create instead.
- */
-static Fnt *xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) {
- Fnt *font;
- XftFont *xfont = NULL;
- FcPattern *pattern = NULL;
-
- if (fontname) {
- /* Using the pattern found at font->xfont->pattern does not yield the
- * same substitution results as using the pattern returned by
- * FcNameParse; using the latter results in the desired fallback
- * behaviour whereas the former just results in missing-character
- * rectangles being drawn, at least with some fonts. */
- if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
- fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
- return NULL;
- }
- if (!(pattern = FcNameParse((FcChar8 *)fontname))) {
- fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
- XftFontClose(drw->dpy, xfont);
- return NULL;
- }
- } else if (fontpattern) {
- if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
- fprintf(stderr, "error, cannot load font from pattern.\n");
- return NULL;
- }
- } else {
- die("no font specified.");
- }
-
- font = ecalloc(1, sizeof(Fnt));
- font->xfont = xfont;
- font->pattern = pattern;
- font->h = xfont->ascent + xfont->descent;
- font->dpy = drw->dpy;
-
- return font;
-}
-
-static void xfont_free(Fnt *font) {
- if (!font)
- return;
- if (font->pattern)
- FcPatternDestroy(font->pattern);
- XftFontClose(font->dpy, font->xfont);
- free(font);
-}
-
-Fnt *drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount) {
- Fnt *cur, *ret = NULL;
- size_t i;
-
- if (!drw || !fonts)
- return NULL;
-
- for (i = 1; i <= fontcount; i++) {
- if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
- cur->next = ret;
- ret = cur;
- }
- }
- return (drw->fonts = ret);
-}
-
-void drw_fontset_free(Fnt *font) {
- if (font) {
- drw_fontset_free(font->next);
- xfont_free(font);
- }
-}
-
-void drw_clr_create(Drw *drw, Clr *dest, const char *clrname) {
- if (!drw || !dest || !clrname)
- return;
-
- if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
- DefaultColormap(drw->dpy, drw->screen), clrname, dest))
- die("error, cannot allocate color '%s'", clrname);
-
- dest->pixel |= 0xff << 24;
-}
-
-/* Wrapper to create color schemes. The caller has to call free(3) on the
- * returned color scheme when done using it. */
-Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) {
- int i;
- Clr *ret;
-
- /* need at least two colors for a scheme */
- if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
- return NULL;
-
- for (i = 0; i < clrcount; i++)
- drw_clr_create(drw, &ret[i], clrnames[i]);
- return ret;
-}
-
-void drw_setfontset(Drw *drw, Fnt *set) {
- if (drw)
- drw->fonts = set;
-}
-
-void drw_setscheme(Drw *drw, Clr *scm) {
- if (drw)
- drw->scheme = scm;
-}
-
-void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) {
- if (!drw || !drw->scheme)
- return;
- XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
- if (filled)
- XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
- else
- XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
-}
-
-int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad,
- const char *text, int invert) {
- int i, ty, ellipsis_x = 0;
- unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
- XftDraw *d = NULL;
- Fnt *usedfont, *curfont, *nextfont;
- int utf8strlen, utf8charlen, render = x || y || w || h;
- long utf8codepoint = 0;
- const char *utf8str;
- FcCharSet *fccharset;
- FcPattern *fcpattern;
- FcPattern *match;
- XftResult result;
- int charexists = 0, overflow = 0;
- /* keep track of a couple codepoints for which we have no match. */
- enum { nomatches_len = 64 };
- static struct {
- long codepoint[nomatches_len];
- unsigned int idx;
- } nomatches;
- static unsigned int ellipsis_width = 0;
-
- if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
- return 0;
-
- if (!render) {
- w = invert ? invert : ~invert;
- } else {
- XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
- XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
- d = XftDrawCreate(drw->dpy, drw->drawable, DefaultVisual(drw->dpy, drw->screen),
- DefaultColormap(drw->dpy, drw->screen));
- x += lpad;
- w -= lpad;
- }
-
- usedfont = drw->fonts;
- if (!ellipsis_width && render)
- ellipsis_width = drw_fontset_getwidth(drw, "...");
- while (1) {
- ew = ellipsis_len = utf8strlen = 0;
- utf8str = text;
- nextfont = NULL;
- while (*text) {
- utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
- for (curfont = drw->fonts; curfont; curfont = curfont->next) {
- charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
- if (charexists) {
- drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
- if (ew + ellipsis_width <= w) {
- /* keep track where the ellipsis still fits */
- ellipsis_x = x + ew;
- ellipsis_w = w - ew;
- ellipsis_len = utf8strlen;
- }
-
- if (ew + tmpw > w) {
- overflow = 1;
- /* called from drw_fontset_getwidth_clamp():
- * it wants the width AFTER the overflow
- */
- if (!render)
- x += tmpw;
- else
- utf8strlen = ellipsis_len;
- } else if (curfont == usedfont) {
- utf8strlen += utf8charlen;
- text += utf8charlen;
- ew += tmpw;
- } else {
- nextfont = curfont;
- }
- break;
- }
- }
-
- if (overflow || !charexists || nextfont)
- break;
- else
- charexists = 0;
- }
-
- if (utf8strlen) {
- if (render) {
- ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
- XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], usedfont->xfont, x, ty,
- (XftChar8 *)utf8str, utf8strlen);
- }
- x += ew;
- w -= ew;
- }
- if (render && overflow)
- drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
-
- if (!*text || overflow) {
- break;
- } else if (nextfont) {
- charexists = 0;
- usedfont = nextfont;
- } else {
- /* Regardless of whether or not a fallback font is found, the
- * character must be drawn. */
- charexists = 1;
-
- for (i = 0; i < nomatches_len; ++i) {
- /* avoid calling XftFontMatch if we know we won't find a match */
- if (utf8codepoint == nomatches.codepoint[i])
- goto no_match;
- }
-
- fccharset = FcCharSetCreate();
- FcCharSetAddChar(fccharset, utf8codepoint);
-
- if (!drw->fonts->pattern) {
- /* Refer to the comment in xfont_create for more information. */
- die("the first font in the cache must be loaded from a font string.");
- }
-
- fcpattern = FcPatternDuplicate(drw->fonts->pattern);
- FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
- FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-
- FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
- FcDefaultSubstitute(fcpattern);
- match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
-
- FcCharSetDestroy(fccharset);
- FcPatternDestroy(fcpattern);
-
- if (match) {
- usedfont = xfont_create(drw, NULL, match);
- if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
- for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
- ; /* NOP */
- curfont->next = usedfont;
- } else {
- xfont_free(usedfont);
- nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
- no_match:
- usedfont = drw->fonts;
- }
- }
- }
- }
- if (d)
- XftDrawDestroy(d);
-
- return x + (render ? w : 0);
-}
-
-void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) {
- if (!drw)
- return;
-
- XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
- XSync(drw->dpy, False);
-}
-
-unsigned int drw_fontset_getwidth(Drw *drw, const char *text) {
- if (!drw || !drw->fonts || !text)
- return 0;
- return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
-}
-
-unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) {
- unsigned int tmp = 0;
- if (drw && drw->fonts && text && n)
- tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
- return MIN(n, tmp);
-}
-
-void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w,
- unsigned int *h) {
- XGlyphInfo ext;
-
- if (!font || !text)
- return;
-
- XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
- if (w)
- *w = ext.xOff;
- if (h)
- *h = font->h;
-}
-
-Cur *drw_cur_create(Drw *drw, int shape) {
- Cur *cur;
-
- if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
- return NULL;
-
- cur->cursor = XCreateFontCursor(drw->dpy, shape);
-
- return cur;
-}
-
-void drw_cur_free(Drw *drw, Cur *cursor) {
- if (!cursor)
- return;
-
- XFreeCursor(drw->dpy, cursor->cursor);
- free(cursor);
-}
diff --git a/drw.h b/drw.h
deleted file mode 100644
index 6471431..0000000
--- a/drw.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-typedef struct {
- Cursor cursor;
-} Cur;
-
-typedef struct Fnt {
- Display *dpy;
- unsigned int h;
- XftFont *xfont;
- FcPattern *pattern;
- struct Fnt *next;
-} Fnt;
-
-enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */
-typedef XftColor Clr;
-
-typedef struct {
- unsigned int w, h;
- Display *dpy;
- int screen;
- Window root;
- Drawable drawable;
- GC gc;
- Clr *scheme;
- Fnt *fonts;
-} Drw;
-
-/* Drawable abstraction */
-Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
-void drw_resize(Drw *drw, unsigned int w, unsigned int h);
-void drw_free(Drw *drw);
-
-/* Fnt abstraction */
-Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
-void drw_fontset_free(Fnt* set);
-unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
-unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
-void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
-
-/* Colorscheme abstraction */
-void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
-Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
-
-/* Cursor abstraction */
-Cur *drw_cur_create(Drw *drw, int shape);
-void drw_cur_free(Drw *drw, Cur *cursor);
-
-/* Drawing context manipulation */
-void drw_setfontset(Drw *drw, Fnt *set);
-void drw_setscheme(Drw *drw, Clr *scm);
-
-/* Drawing functions */
-void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
-int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
-
-/* Map functions */
-void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
diff --git a/dwm-flexipatch b/dwm-flexipatch
new file mode 160000
index 0000000..5e85bc8
--- /dev/null
+++ b/dwm-flexipatch
@@ -0,0 +1 @@
+Subproject commit 5e85bc8b5c784b47cdd3015b53c5bb517500ba9c
diff --git a/dwm.c b/dwm.c
deleted file mode 100644
index d05fc2c..0000000
--- a/dwm.c
+++ /dev/null
@@ -1,3267 +0,0 @@
-/* See LICENSE file for copyright and license details.
- *
- * dynamic window manager is designed like any other X client as well. It is
- * driven through handling X events. In contrast to other X clients, a window
- * manager selects for SubstructureRedirectMask on the root window, to receive
- * events about window (dis-)appearance. Only one X connection at a time is
- * allowed to select for this event mask.
- *
- * The event handlers of dwm are organized in an array which is accessed
- * whenever a new event has been fetched. This allows event dispatching
- * in O(1) time.
- *
- * Each child of the root window is called a client, except windows which have
- * set the override_redirect flag. Clients are organized in a linked client
- * list on each monitor, the focus history is remembered through a stack list
- * on each monitor. Each client contains a bit array to indicate the tags of a
- * client.
- *
- * Keys and tagging rules are organized as arrays and defined in config.h.
- *
- * To understand everything else, start reading main().
- */
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#include <X11/cursorfont.h>
-#include <X11/keysym.h>
-#include <errno.h>
-#include <locale.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif /* XINERAMA */
-#include <X11/Xft/Xft.h>
-#include <X11/Xlib-xcb.h>
-#include <xcb/res.h>
-#ifdef __OpenBSD__
-#include <kvm.h>
-#include <sys/sysctl.h>
-#endif /* __OpenBSD */
-
-#include "drw.h"
-#include "util.h"
-
-/* macros */
-#define BUTTONMASK (ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask) \
- (mask & ~(numlockmask | LockMask) & \
- (ShiftMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask))
-#define GETINC(X) ((X)-2000)
-#define INC(X) ((X) + 2000)
-#define INTERSECT(x, y, w, h, m) \
- (MAX(0, MIN((x) + (w), (m)->wx + (m)->ww) - MAX((x), (m)->wx)) * \
- MAX(0, MIN((y) + (h), (m)->wy + (m)->wh) - MAX((y), (m)->wy)))
-#define ISINC(X) ((X) > 1000 && (X) < 3000)
-#define ISVISIBLEONTAG(C, T) ((C->tags & T))
-#define ISVISIBLE(C) ISVISIBLEONTAG(C, C->mon->tagset[C->mon->seltags])
-#define PREVSEL 3000
-#define LENGTH(X) (sizeof X / sizeof X[0])
-#define MOD(N, M) ((N) % (M) < 0 ? (N) % (M) + (M) : (N) % (M))
-#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
-#define WIDTH(X) ((X)->w + 2 * (X)->bw)
-#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
-#define TAGMASK ((1 << LENGTH(tags)) - 1)
-#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
-#define TRUNC(X, A, B) (MAX((A), MIN((X), (B))))
-
-#define SYSTEM_TRAY_REQUEST_DOCK 0
-/* XEMBED messages */
-#define XEMBED_EMBEDDED_NOTIFY 0
-#define XEMBED_WINDOW_ACTIVATE 1
-#define XEMBED_FOCUS_IN 4
-#define XEMBED_MODALITY_ON 10
-#define XEMBED_MAPPED (1 << 0)
-#define XEMBED_WINDOW_ACTIVATE 1
-#define XEMBED_WINDOW_DEACTIVATE 2
-#define VERSION_MAJOR 0
-#define VERSION_MINOR 0
-#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
-
-/* enums */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum {
- SchemeNorm,
- SchemeSel,
- SchemeStatus,
- SchemeTagsSel,
- SchemeTagsNorm,
- SchemeInfoSel,
- SchemeInfoNorm
-}; /* color schemes */
-enum {
- NetSupported,
- NetWMName,
- NetWMState,
- NetWMCheck,
- NetSystemTray,
- NetSystemTrayOP,
- NetSystemTrayOrientation,
- NetSystemTrayOrientationHorz,
- NetWMFullscreen,
- NetActiveWindow,
- NetWMWindowType,
- NetWMWindowTypeDialog,
- NetClientList,
- NetLast
-}; /* EWMH atoms */
-enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
-enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
-enum {
- ClkTagBar,
- ClkLtSymbol,
- ClkStatusText,
- ClkWinTitle,
- ClkClientWin,
- ClkRootWin,
- ClkLast
-}; /* clicks */
-
-typedef union {
- int i;
- unsigned int ui;
- float f;
- const void *v;
-} Arg;
-
-typedef struct {
- unsigned int click;
- unsigned int mask;
- unsigned int button;
- void (*func)(const Arg *arg);
- const Arg arg;
-} Button;
-
-typedef struct Monitor Monitor;
-typedef struct Client Client;
-struct Client {
- char name[256];
- float mina, maxa;
- int x, y, w, h;
- int oldx, oldy, oldw, oldh;
- int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
- int bw, oldbw;
- unsigned int tags;
- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow;
- int floatborderpx, hasfloatbw;
- char scratchkey;
- pid_t pid;
- Client *next;
- Client *snext;
- Client *swallowing;
- Monitor *mon;
- Window win;
-};
-
-typedef struct {
- unsigned int mod;
- KeySym keysym;
- void (*func)(const Arg *);
- const Arg arg;
-} Key;
-
-typedef struct {
- const char *symbol;
- void (*arrange)(Monitor *);
-} Layout;
-
-typedef struct Pertag Pertag;
-struct Monitor {
- char ltsymbol[16];
- float mfact;
- int nmaster;
- int num;
- int by; /* bar geometry */
- int mx, my, mw, mh; /* screen size */
- int wx, wy, ww, wh; /* window area */
- unsigned int seltags;
- unsigned int sellt;
- unsigned int tagset[2];
- int showbar;
- int topbar;
- Client *clients;
- Client *sel;
- Client *stack;
- Monitor *next;
- Window barwin;
- const Layout *lt[2];
- Pertag *pertag;
-};
-
-typedef struct {
- const char *class;
- const char *instance;
- const char *title;
- const char scratchkey;
- unsigned int tags;
- int isfloating;
- int isterminal;
- int noswallow;
- float floatx, floaty, floatw, floath;
- int floatborderpx;
- // int monitor;
-} Rule;
-
-typedef struct Systray Systray;
-struct Systray {
- Window win;
- Client *icons;
-};
-
-/* function declarations */
-static void applyrules(Client *c);
-static void applyfloatrules(Client *c, const Rule *r);
-static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
-static void arrange(Monitor *m);
-static void arrangemon(Monitor *m);
-static void attach(Client *c);
-static void attachtop(Client *c);
-static void attachstack(Client *c);
-static void bstack(Monitor *m);
-static void bstackhoriz(Monitor *m);
-static void buttonpress(XEvent *e);
-static void centeredmaster(Monitor *m);
-static void centeredfloatingmaster(Monitor *m);
-static void checkotherwm(void);
-static void cleanup(void);
-static void cleanupmon(Monitor *mon);
-static void clientmessage(XEvent *e);
-static void configure(Client *c);
-static void configurenotify(XEvent *e);
-static void configurerequest(XEvent *e);
-static Monitor *createmon(void);
-static void destroynotify(XEvent *e);
-static void detach(Client *c);
-static void detachstack(Client *c);
-static Monitor *dirtomon(int dir);
-static void drawbar(Monitor *m);
-static void drawbars(void);
-static void enternotify(XEvent *e);
-static void expose(XEvent *e);
-static void focus(Client *c);
-static void focusin(XEvent *e);
-static void focusmon(const Arg *arg);
-static void focusstack(const Arg *arg);
-static void gaplessgrid(Monitor *m);
-static Atom getatomprop(Client *c, Atom prop);
-static int getrootptr(int *x, int *y);
-static long getstate(Window w);
-static unsigned int getsystraywidth(void);
-static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void grabbuttons(Client *c, int focused);
-static void grabkeys(void);
-static void incnmaster(const Arg *arg);
-static void keypress(XEvent *e);
-static void killclient(const Arg *arg);
-static void manage(Window w, XWindowAttributes *wa);
-static void mappingnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void monocle(Monitor *m);
-static int matchrules(Client *c);
-static void motionnotify(XEvent *e);
-static void movemouse(const Arg *arg);
-static Client *nexttiled(Client *c);
-static void pop(Client *c);
-static void propertynotify(XEvent *e);
-static void pushstack(const Arg *arg);
-static void quit(const Arg *arg);
-static Monitor *recttomon(int x, int y, int w, int h);
-static void removesystrayicon(Client *i);
-static void resetnmaster(const Arg *arg);
-static void resize(Client *c, int x, int y, int w, int h, int interact);
-static void resizebarwin(Monitor *m);
-static void resizeclient(Client *c, int x, int y, int w, int h);
-static void resizemouse(const Arg *arg);
-static void resizerequest(XEvent *e);
-static void restack(Monitor *m);
-static void run(void);
-static void scan(void);
-static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
-static void sendmon(Client *c, Monitor *m);
-static void setclientstate(Client *c, long state);
-static void setfocus(Client *c);
-static void setfullscreen(Client *c, int fullscreen);
-static void setlayout(const Arg *arg);
-static void setmfact(const Arg *arg);
-static void setup(void);
-static void seturgent(Client *c, int urg);
-static void showhide(Client *c);
-static void sighup(int unused);
-static void sigterm(int unused);
-static void spawn(const Arg *arg);
-static void spawnscratch(const Arg *arg);
-static Monitor *systraytomon(Monitor *m);
-static int stackpos(const Arg *arg);
-static void tag(const Arg *arg);
-static void tagmon(const Arg *arg);
-static void tile(Monitor *m);
-static void togglebar(const Arg *arg);
-static void togglefloating(const Arg *arg);
-static void togglefullscr(const Arg *arg);
-static void togglescratch(const Arg *arg);
-static void toggletag(const Arg *arg);
-static void toggleview(const Arg *arg);
-static void unfocus(Client *c, int setfocus);
-static void unmanage(Client *c, int destroyed);
-static void unmapnotify(XEvent *e);
-static void updatebarpos(Monitor *m);
-static void updatebars(void);
-static void updateclientlist(void);
-static int updategeom(void);
-static void updatenumlockmask(void);
-static void updatesizehints(Client *c);
-static void updatestatus(void);
-static void updatesystray(void);
-static void updatesystrayicongeom(Client *i, int w, int h);
-static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
-static void updatetitle(Client *c);
-static void updatewindowtype(Client *c);
-static void updatewmhints(Client *c);
-static void view(const Arg *arg);
-static Client *wintoclient(Window w);
-static Monitor *wintomon(Window w);
-static Client *wintosystrayicon(Window w);
-static int xerror(Display *dpy, XErrorEvent *ee);
-static int xerrordummy(Display *dpy, XErrorEvent *ee);
-static int xerrorstart(Display *dpy, XErrorEvent *ee);
-static void zoom(const Arg *arg);
-
-static pid_t getparentprocess(pid_t p);
-static int isdescprocess(pid_t p, pid_t c);
-static Client *swallowingclient(Window w);
-static Client *termforwin(const Client *c);
-static pid_t winpid(Window w);
-
-/* variables */
-static Systray *systray = NULL;
-static const char broken[] = "broken";
-static char stext[512];
-static int screen;
-static int sw, sh; /* X display screen geometry width, height */
-static int bh; /* bar height */
-static int lrpad; /* sum of left and right padding for text */
-static int (*xerrorxlib)(Display *, XErrorEvent *);
-static unsigned int numlockmask = 0;
-static void (*handler[LASTEvent])(XEvent *) = {[ButtonPress] = buttonpress,
- [ClientMessage] = clientmessage,
- [ConfigureRequest] = configurerequest,
- [ConfigureNotify] = configurenotify,
- [DestroyNotify] = destroynotify,
- [EnterNotify] = enternotify,
- [Expose] = expose,
- [FocusIn] = focusin,
- [KeyPress] = keypress,
- [MappingNotify] = mappingnotify,
- [MapRequest] = maprequest,
- [ResizeRequest] = resizerequest,
- [MotionNotify] = motionnotify,
- [PropertyNotify] = propertynotify,
- [UnmapNotify] = unmapnotify};
-static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
-static int restart = 0;
-static int running = 1;
-static Cur *cursor[CurLast];
-static Clr **scheme;
-static Clr *barclrs;
-static Display *dpy;
-static Drw *drw;
-static Monitor *mons, *selmon;
-static Window root, wmcheckwin;
-
-static xcb_connection_t *xcon;
-
-/* configuration, allows nested code to access above variables */
-#include "config.h"
-
-static const char *colors[] = {
- color0, color1, color2, color3, color4, color5, color6, color7,
- color8, color9, color10, color11, color12, color13, color14, color15,
-};
-
-struct Pertag {
- unsigned int curtag, prevtag; /* current and previous tag */
- int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
- float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
- unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */
- const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes */
- int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */
-};
-
-/* compile-time check if all tags fit into an unsigned int bit array. */
-struct NumTags {
- char limitexceeded[LENGTH(tags) > 31 ? -1 : 1];
-};
-
-/* function implementations */
-void applyrules(Client *c) {
- unsigned int i = -1;
- const Rule *r;
- // Monitor *m;
-
- c->isfloating = 0;
- c->tags = 0;
- c->scratchkey = 0;
- i = matchrules(c);
- if (i >= 0) {
- r = &rules[i];
- c->isterminal = r->isterminal;
- c->noswallow = r->noswallow;
- c->isfloating = r->isfloating;
- c->tags |= r->tags;
- c->scratchkey = r->scratchkey;
- if (r->floatborderpx >= 0) {
- c->floatborderpx = r->floatborderpx;
- c->hasfloatbw = 1;
- }
- if (r->isfloating) {
- applyfloatrules(c, r);
- }
- }
- c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
-}
-
-void applyfloatrules(Client *c, const Rule *r) {
- if (r->floatw > 1)
- c->w = r->floatw;
- else if (r->floatw > 0)
- c->w = (int)((float)c->mon->ww * r->floatw);
- c->w = MIN(c->w, c->mon->ww) - c->bw * 2;
-
- if (r->floath > 1)
- c->h = r->floath;
- else if (r->floath > 0)
- c->h = (int)((float)c->mon->wh * r->floath);
- c->h = MIN(c->h, c->mon->wh) - c->bw * 2;
-
- if (r->floatx > 1)
- c->x = r->floatx;
- else if (r->floatx > 0)
- c->x = (int)((float)c->mon->ww * r->floatx - (float)WIDTH(c) / 2);
- else if (r->floatx == 0)
- ;
- else if (r->floatx > -1)
- c->x = c->mon->ww + (int)((float)c->mon->ww * r->floatx - (float)WIDTH(c) / 2);
- else
- c->x = c->mon->ww + r->floatx - WIDTH(c);
- if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
- c->x = c->mon->ww - WIDTH(c);
- c->x = MAX(c->x + c->mon->wx, c->mon->wx);
-
- if (r->floaty > 1)
- c->y = r->floaty;
- else if (r->floaty > 0)
- c->y = (int)((float)c->mon->wh * r->floaty - (float)HEIGHT(c) / 2);
- else if (r->floaty == 0)
- ;
- else if (r->floaty > -1)
- c->y = c->mon->wh + (int)((float)c->mon->wh * r->floaty - (float)HEIGHT(c) / 2);
- else
- c->y = c->mon->wh + r->floaty - HEIGHT(c);
- if (c->y + HEIGHT(c) > c->mon->wy + c->mon->wh)
- c->y = c->mon->wh - HEIGHT(c);
- c->y = MAX(c->y + c->mon->wy, c->mon->wy);
-}
-
-int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact) {
- int baseismin;
- Monitor *m = c->mon;
-
- /* set minimum possible */
- *w = MAX(1, *w);
- *h = MAX(1, *h);
- if (interact) {
- if (*x > sw)
- *x = sw - WIDTH(c);
- if (*y > sh)
- *y = sh - HEIGHT(c);
- if (*x + *w + 2 * c->bw < 0)
- *x = 0;
- if (*y + *h + 2 * c->bw < 0)
- *y = 0;
- } else {
- if (*x >= m->wx + m->ww)
- *x = m->wx + m->ww - WIDTH(c);
- if (*y >= m->wy + m->wh)
- *y = m->wy + m->wh - HEIGHT(c);
- if (*x + *w + 2 * c->bw <= m->wx)
- *x = m->wx;
- if (*y + *h + 2 * c->bw <= m->wy)
- *y = m->wy;
- }
- if (*h < bh)
- *h = bh;
- if (*w < bh)
- *w = bh;
- if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {
- if (!c->hintsvalid)
- updatesizehints(c);
- /* see last two sentences in ICCCM 4.1.2.3 */
- baseismin = c->basew == c->minw && c->baseh == c->minh;
- if (!baseismin) { /* temporarily remove base dimensions */
- *w -= c->basew;
- *h -= c->baseh;
- }
- /* adjust for aspect limits */
- if (c->mina > 0 && c->maxa > 0) {
- if (c->maxa < (float)*w / *h)
- *w = *h * c->maxa + 0.5;
- else if (c->mina < (float)*h / *w)
- *h = *w * c->mina + 0.5;
- }
- if (baseismin) { /* increment calculation requires this */
- *w -= c->basew;
- *h -= c->baseh;
- }
- /* adjust for increment value */
- if (c->incw)
- *w -= *w % c->incw;
- if (c->inch)
- *h -= *h % c->inch;
- /* restore base dimensions */
- *w = MAX(*w + c->basew, c->minw);
- *h = MAX(*h + c->baseh, c->minh);
- if (c->maxw)
- *w = MIN(*w, c->maxw);
- if (c->maxh)
- *h = MIN(*h, c->maxh);
- }
- return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
-}
-
-void arrange(Monitor *m) {
- if (m)
- showhide(m->stack);
- else
- for (m = mons; m; m = m->next)
- showhide(m->stack);
- if (m) {
- arrangemon(m);
- restack(m);
- } else
- for (m = mons; m; m = m->next)
- arrangemon(m);
-}
-
-void arrangemon(Monitor *m) {
- strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
- if (m->lt[m->sellt]->arrange)
- m->lt[m->sellt]->arrange(m);
-}
-
-void attach(Client *c) {
- c->next = c->mon->clients;
- c->mon->clients = c;
-}
-
-void attachtop(Client *c) {
- int n;
- Monitor *m = selmon;
- Client *below;
-
- for (n = 1, below = c->mon->clients;
- below && below->next &&
- (below->isfloating || !ISVISIBLEONTAG(below, c->tags) || n != m->nmaster);
- n = below->isfloating || !ISVISIBLEONTAG(below, c->tags) ? n + 0 : n + 1,
- below = below->next)
- ;
- c->next = NULL;
- if (below) {
- c->next = below->next;
- below->next = c;
- } else
- c->mon->clients = c;
-}
-
-void attachstack(Client *c) {
- c->snext = c->mon->stack;
- c->mon->stack = c;
-}
-
-void swallow(Client *p, Client *c) {
-
- if (c->noswallow || c->isterminal)
- return;
- if (c->noswallow && !swallowfloating && c->isfloating)
- return;
-
- detach(c);
- detachstack(c);
-
- setclientstate(c, WithdrawnState);
- XUnmapWindow(dpy, p->win);
-
- p->swallowing = c;
- c->mon = p->mon;
-
- Window w = p->win;
- p->win = c->win;
- c->win = w;
- updatetitle(p);
- XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
- arrange(p->mon);
- configure(p);
- updateclientlist();
-}
-
-void unswallow(Client *c) {
- c->win = c->swallowing->win;
-
- free(c->swallowing);
- c->swallowing = NULL;
-
- /* unfullscreen the client */
- setfullscreen(c, 0);
- updatetitle(c);
- arrange(c->mon);
- XMapWindow(dpy, c->win);
- XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
- setclientstate(c, NormalState);
- focus(NULL);
- arrange(c->mon);
-}
-
-static void bstack(Monitor *m) {
- int w, h, mh, mx, tx, ty, tw;
- unsigned int i, n;
- Client *c;
-
- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
- ;
- if (n == 0)
- return;
- if (n > m->nmaster) {
- mh = m->nmaster ? m->mfact * m->wh : 0;
- tw = m->ww / (n - m->nmaster);
- ty = m->wy + mh;
- } else {
- mh = m->wh;
- tw = m->ww;
- ty = m->wy;
- }
- for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
- if (i < m->nmaster) {
- w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
- resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
- mx += WIDTH(c);
- } else {
- h = m->wh - mh;
- resize(c, tx, ty, tw - (2 * c->bw), h - (2 * c->bw), 0);
- if (tw != m->ww)
- tx += WIDTH(c);
- }
- }
-}
-
-static void bstackhoriz(Monitor *m) {
- int w, mh, mx, tx, ty, th;
- unsigned int i, n;
- Client *c;
-
- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
- ;
- if (n == 0)
- return;
- if (n > m->nmaster) {
- mh = m->nmaster ? m->mfact * m->wh : 0;
- th = (m->wh - mh) / (n - m->nmaster);
- ty = m->wy + mh;
- } else {
- th = mh = m->wh;
- ty = m->wy;
- }
- for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
- if (i < m->nmaster) {
- w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
- resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
- mx += WIDTH(c);
- } else {
- resize(c, tx, ty, m->ww - (2 * c->bw), th - (2 * c->bw), 0);
- if (th != m->wh)
- ty += HEIGHT(c);
- }
- }
-}
-
-void buttonpress(XEvent *e) {
- unsigned int i, x, click;
- Arg arg = {0};
- Client *c;
- Monitor *m;
- XButtonPressedEvent *ev = &e->xbutton;
-
- click = ClkRootWin;
- /* focus monitor if necessary */
- if ((m = wintomon(ev->window)) && m != selmon) {
- unfocus(selmon->sel, 1);
- selmon = m;
- focus(NULL);
- }
- if (ev->window == selmon->barwin) {
- i = x = 0;
- unsigned int occ = 0;
- for (c = m->clients; c; c = c->next)
- occ |= c->tags;
- do {
- /* Do not reserve space for vacant tags */
- if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
- continue;
- x += TEXTW(tags[i]);
- } while (ev->x >= x && ++i < LENGTH(tags));
- if (i < LENGTH(tags)) {
- click = ClkTagBar;
- arg.ui = 1 << i;
- } else if (ev->x < x + TEXTW(selmon->ltsymbol))
- click = ClkLtSymbol;
- else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth())
- click = ClkStatusText;
- else
- click = ClkWinTitle;
- } else if ((c = wintoclient(ev->window))) {
- focus(c);
- restack(selmon);
- XAllowEvents(dpy, ReplayPointer, CurrentTime);
- click = ClkClientWin;
- }
- for (i = 0; i < LENGTH(buttons); i++)
- if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button &&
- CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
- buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
-}
-
-void centeredmaster(Monitor *m) {
- unsigned int i, n, h, mw, mx, my, oty, ety, tw;
- Client *c;
-
- /* count number of clients in the selected monitor */
- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
- ;
- if (n == 0)
- return;
-
- /* initialize areas */
- mw = m->ww;
- mx = 0;
- my = 0;
- tw = mw;
-
- if (n > m->nmaster) {
- /* go mfact box in the center if more than nmaster clients */
- mw = m->nmaster ? m->ww * m->mfact : 0;
- tw = m->ww - mw;
-
- if (n - m->nmaster > 1) {
- /* only one client */
- mx = (m->ww - mw) / 2;
- tw = (m->ww - mw) / 2;
- }
- }
-
- oty = 0;
- ety = 0;
- for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
- if (i < m->nmaster) {
- /* nmaster clients are stacked vertically, in the center
- * of the screen */
- h = (m->wh - my) / (MIN(n, m->nmaster) - i);
- resize(c, m->wx + mx, m->wy + my, mw - (2 * c->bw), h - (2 * c->bw), 0);
- my += HEIGHT(c);
- } else {
- /* stack clients are stacked vertically */
- if ((i - m->nmaster) % 2) {
- h = (m->wh - ety) / ((1 + n - i) / 2);
- resize(c, m->wx, m->wy + ety, tw - (2 * c->bw), h - (2 * c->bw), 0);
- ety += HEIGHT(c);
- } else {
- h = (m->wh - oty) / ((1 + n - i) / 2);
- resize(c, m->wx + mx + mw, m->wy + oty, tw - (2 * c->bw), h - (2 * c->bw), 0);
- oty += HEIGHT(c);
- }
- }
-}
-
-void centeredfloatingmaster(Monitor *m) {
- unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx;
- Client *c;
-
- /* count number of clients in the selected monitor */
- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
- ;
- if (n == 0)
- return;
-
- /* initialize nmaster area */
- if (n > m->nmaster) {
- /* go mfact box in the center if more than nmaster clients */
- if (m->ww > m->wh) {
- mw = m->nmaster ? m->ww * m->mfact : 0;
- mh = m->nmaster ? m->wh * 0.9 : 0;
- } else {
- mh = m->nmaster ? m->wh * m->mfact : 0;
- mw = m->nmaster ? m->ww * 0.9 : 0;
- }
- mx = mxo = (m->ww - mw) / 2;
- my = myo = (m->wh - mh) / 2;
- } else {
- /* go fullscreen if all clients are in the master area */
- mh = m->wh;
- mw = m->ww;
- mx = mxo = 0;
- my = myo = 0;
- }
-
- for (i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
- if (i < m->nmaster) {
- /* nmaster clients are stacked horizontally, in the center
- * of the screen */
- w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i);
- resize(c, m->wx + mx, m->wy + my, w - (2 * c->bw), mh - (2 * c->bw), 0);
- mx += WIDTH(c);
- } else {
- /* stack clients are stacked horizontally */
- w = (m->ww - tx) / (n - i);
- resize(c, m->wx + tx, m->wy, w - (2 * c->bw), m->wh - (2 * c->bw), 0);
- tx += WIDTH(c);
- }
-}
-
-void checkotherwm(void) {
- xerrorxlib = XSetErrorHandler(xerrorstart);
- /* this causes an error if some other window manager is running */
- XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
- XSync(dpy, False);
- XSetErrorHandler(xerror);
- XSync(dpy, False);
-}
-
-void cleanup(void) {
- Arg a = {.ui = ~0};
- Layout foo = {"", NULL};
- Monitor *m;
- size_t i;
-
- view(&a);
- selmon->lt[selmon->sellt] = &foo;
- for (m = mons; m; m = m->next)
- while (m->stack)
- unmanage(m->stack, 0);
- XUngrabKey(dpy, AnyKey, AnyModifier, root);
- while (mons)
- cleanupmon(mons);
-
- if (showsystray) {
- XUnmapWindow(dpy, systray->win);
- XDestroyWindow(dpy, systray->win);
- free(systray);
- }
-
- for (i = 0; i < CurLast; i++)
- drw_cur_free(drw, cursor[i]);
- for (i = 0; i < LENGTH(colors); i++)
- free(scheme[i]);
- free(scheme);
- XDestroyWindow(dpy, wmcheckwin);
- drw_free(drw);
- XSync(dpy, False);
- XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
- XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-}
-
-void cleanupmon(Monitor *mon) {
- Monitor *m;
-
- if (mon == mons)
- mons = mons->next;
- else {
- for (m = mons; m && m->next != mon; m = m->next)
- ;
- m->next = mon->next;
- }
- XUnmapWindow(dpy, mon->barwin);
- XDestroyWindow(dpy, mon->barwin);
- free(mon);
-}
-
-void clientmessage(XEvent *e) {
- XWindowAttributes wa;
- XSetWindowAttributes swa;
- XClientMessageEvent *cme = &e->xclient;
- Client *c = wintoclient(cme->window);
-
- if (showsystray && cme->window == systray->win &&
- cme->message_type == netatom[NetSystemTrayOP]) {
- /* add systray icons */
- if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
- if (!(c = (Client *)calloc(1, sizeof(Client))))
- die("fatal: could not malloc() %u bytes\n", sizeof(Client));
- if (!(c->win = cme->data.l[2])) {
- free(c);
- return;
- }
- c->mon = selmon;
- c->next = systray->icons;
- systray->icons = c;
- if (!XGetWindowAttributes(dpy, c->win, &wa)) {
- /* use sane defaults */
- wa.width = bh;
- wa.height = bh;
- wa.border_width = 0;
- }
- c->x = c->oldx = c->y = c->oldy = 0;
- c->w = c->oldw = wa.width;
- c->h = c->oldh = wa.height;
- c->oldbw = wa.border_width;
- c->bw = 0;
- c->isfloating = True;
- /* reuse tags field as mapped status */
- c->tags = 1;
- updatesizehints(c);
- updatesystrayicongeom(c, wa.width, wa.height);
- XAddToSaveSet(dpy, c->win);
- XSelectInput(dpy, c->win,
- StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
- XReparentWindow(dpy, c->win, systray->win, 0, 0);
- /* use parents background color */
- swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
- XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
- sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime,
- XEMBED_EMBEDDED_NOTIFY, 0, systray->win, XEMBED_EMBEDDED_VERSION);
- /* FIXME not sure if I have to send these events, too */
- sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0,
- systray->win, XEMBED_EMBEDDED_VERSION);
- sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime,
- XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
- sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON,
- 0, systray->win, XEMBED_EMBEDDED_VERSION);
- XSync(dpy, False);
- resizebarwin(selmon);
- updatesystray();
- setclientstate(c, NormalState);
- }
- return;
- }
-
- if (!c)
- return;
- if (cme->message_type == netatom[NetWMState]) {
- if (cme->data.l[1] == netatom[NetWMFullscreen] ||
- cme->data.l[2] == netatom[NetWMFullscreen])
- setfullscreen(
- c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
- || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
- } else if (cme->message_type == netatom[NetActiveWindow]) {
- if (c != selmon->sel && !c->isurgent)
- seturgent(c, 1);
- }
-}
-
-void configure(Client *c) {
- XConfigureEvent ce;
-
- ce.type = ConfigureNotify;
- ce.display = dpy;
- ce.event = c->win;
- ce.window = c->win;
- ce.x = c->x;
- ce.y = c->y;
- ce.width = c->w;
- ce.height = c->h;
- ce.border_width = c->bw;
- ce.above = None;
- ce.override_redirect = False;
- XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
-}
-
-void configurenotify(XEvent *e) {
- Monitor *m;
- Client *c;
- XConfigureEvent *ev = &e->xconfigure;
- int dirty;
-
- /* TODO: updategeom handling sucks, needs to be simplified */
- if (ev->window == root) {
- dirty = (sw != ev->width || sh != ev->height);
- sw = ev->width;
- sh = ev->height;
- if (updategeom() || dirty) {
- drw_resize(drw, sw, bh);
- updatebars();
- for (m = mons; m; m = m->next) {
- for (c = m->clients; c; c = c->next)
- if (c->isfullscreen)
- resizeclient(c, m->mx, m->my, m->mw, m->mh);
- resizebarwin(m);
- }
- focus(NULL);
- arrange(NULL);
- }
- }
-}
-
-void configurerequest(XEvent *e) {
- Client *c;
- Monitor *m;
- XConfigureRequestEvent *ev = &e->xconfigurerequest;
- XWindowChanges wc;
-
- if ((c = wintoclient(ev->window))) {
- if (ev->value_mask & CWBorderWidth)
- c->bw = ev->border_width;
- else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
- m = c->mon;
- if (ev->value_mask & CWX) {
- c->oldx = c->x;
- c->x = m->mx + ev->x;
- }
- if (ev->value_mask & CWY) {
- c->oldy = c->y;
- c->y = m->my + ev->y;
- }
- if (ev->value_mask & CWWidth) {
- c->oldw = c->w;
- c->w = ev->width;
- }
- if (ev->value_mask & CWHeight) {
- c->oldh = c->h;
- c->h = ev->height;
- }
- if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
- c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
- if ((c->y + c->h) > m->my + m->mh && c->isfloating)
- c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
- if ((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight)))
- configure(c);
- if (ISVISIBLE(c))
- XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
- } else
- configure(c);
- } else {
- wc.x = ev->x;
- wc.y = ev->y;
- wc.width = ev->width;
- wc.height = ev->height;
- wc.border_width = ev->border_width;
- wc.sibling = ev->above;
- wc.stack_mode = ev->detail;
- XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
- }
- XSync(dpy, False);
-}
-
-Monitor *createmon(void) {
- Monitor *m;
- unsigned int i;
-
- m = ecalloc(1, sizeof(Monitor));
- m->tagset[0] = m->tagset[1] = 1;
- m->mfact = mfact;
- m->nmaster = nmaster;
- m->showbar = showbar;
- m->topbar = topbar;
- m->lt[0] = &layouts[0];
- m->lt[1] = &layouts[1 % LENGTH(layouts)];
- strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
- m->pertag = ecalloc(1, sizeof(Pertag));
- m->pertag->curtag = m->pertag->prevtag = 1;
-
- for (i = 0; i <= LENGTH(tags); i++) {
- m->pertag->nmasters[i] = m->nmaster;
- m->pertag->mfacts[i] = m->mfact;
-
- m->pertag->ltidxs[i][0] = m->lt[0];
- m->pertag->ltidxs[i][1] = m->lt[1];
- m->pertag->sellts[i] = m->sellt;
-
- m->pertag->showbars[i] = m->showbar;
- }
-
- return m;
-}
-
-void destroynotify(XEvent *e) {
- Client *c;
- XDestroyWindowEvent *ev = &e->xdestroywindow;
-
- if ((c = wintoclient(ev->window)))
- unmanage(c, 1);
- else if ((c = swallowingclient(ev->window)))
- unmanage(c->swallowing, 1);
- else if ((c = wintosystrayicon(ev->window))) {
- removesystrayicon(c);
- resizebarwin(selmon);
- updatesystray();
- }
-}
-
-void detach(Client *c) {
- Client **tc;
-
- for (tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next)
- ;
- *tc = c->next;
-}
-
-void detachstack(Client *c) {
- Client **tc, *t;
-
- for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext)
- ;
- *tc = c->snext;
-
- if (c == c->mon->sel) {
- for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext)
- ;
- c->mon->sel = t;
- }
-}
-
-Monitor *dirtomon(int dir) {
- Monitor *m = NULL;
-
- if (dir > 0) {
- if (!(m = selmon->next))
- m = mons;
- } else if (selmon == mons)
- for (m = mons; m->next; m = m->next)
- ;
- else
- for (m = mons; m->next != selmon; m = m->next)
- ;
- return m;
-}
-
-void resetfntlist(Fnt *orighead, Fnt *curhead) {
- if (orighead != curhead) {
- Fnt *f;
- for (f = orighead; f->next; f = f->next)
- ;
- f->next = curhead;
- for (f = f->next; f->next != orighead; f = f->next)
- ;
- f->next = NULL;
- }
-}
-
-enum SgrFlags { REVERSE = 1 << 0, UNDERLINE = 1 << 1, STRIKETHROUGH = 1 << 2, OVERLINE = 1 << 3 };
-
-void drawbar(Monitor *m) {
- int x, w, tw = 0, stw = 0;
- int boxs = drw->fonts->h / 9;
- int boxw = drw->fonts->h / 6 + 2;
- unsigned int i, occ = 0, urg = 0;
- Client *c;
-
- if (!m->showbar)
- return;
-
- if (showsystray && m == systraytomon(m) && !systrayonleft)
- stw = getsystraywidth();
-
- /* draw status first so it can be overdrawn by tags later */
- if (m == selmon) { /* status is only drawn on selected monitor */
- char buffer[sizeof(stext)];
- Clr scm[3];
- int wr, rd;
- int pw;
- int fg = 7;
- int bg = 0;
- int fmt = 0;
- int lp = lrpad / 2 - 2;
- Fnt *fset = drw->fonts;
-
- memcpy(scm, scheme[SchemeNorm], sizeof(scm));
-
- drw_setscheme(drw, scm);
-
- /* Handling for font-changing SGR sequences */
- for (tw = 0, wr = 0, rd = 0; stext[rd]; rd++) {
- if (stext[rd] == '' && stext[rd + 1] == '[') {
- size_t alen = strspn(stext + rd + 2, "0123456789;");
- if (stext[rd + alen + 2] == 'm') {
- buffer[wr] = '\0';
- tw += TEXTW(buffer) - lrpad;
- wr = 0;
-
- char *ep = stext + rd + 1;
- while (*ep != 'm') {
- unsigned v = strtoul(ep + 1, &ep, 10);
- if (v == 0 || (v >= 10 && v <= 19)) {
- int fi = v % 10;
- Fnt *f;
- Fnt *p;
- resetfntlist(fset, drw->fonts);
- for (p = NULL, f = fset; f && fi--; p = f, f = f->next)
- ;
- if (f) {
- if (p) {
- p->next = NULL;
- for (p = f; p->next; p = p->next)
- ;
- p->next = fset;
- }
- drw_setfontset(drw, f);
- } else {
- drw_setfontset(drw, fset);
- }
- }
- }
-
- rd += alen + 2;
- continue;
- }
- }
- buffer[wr++] = stext[rd];
- }
- buffer[wr] = '\0';
-
- tw += TEXTW(buffer) - lrpad / 2 + 2;
- x = m->ww - tw - stw;
-
- resetfntlist(fset, drw->fonts);
- drw_setfontset(drw, fset);
-
- /* Handling of other escapes */
- for (wr = 0, rd = 0; stext[rd]; rd++) {
- if (stext[rd] == '' && stext[rd + 1] == '[') {
- size_t alen = strspn(stext + rd + 2, "0123456789;");
- if (stext[rd + alen + 2] == 'm') {
- buffer[wr] = '\0';
- pw = TEXTW(buffer) - lrpad;
- drw_text(drw, x, 0, pw + lp, bh, lp, buffer, fmt & REVERSE);
- if (fmt & UNDERLINE)
- drw_rect(drw, x, (bh + drw->fonts->h) / 2, pw, 1, 1, fmt & REVERSE);
- if (fmt & STRIKETHROUGH)
- drw_rect(drw, x, bh / 2, pw, 1, 1, fmt & REVERSE);
- if (fmt & OVERLINE)
- drw_rect(drw, x, (bh - drw->fonts->h) / 2, pw, 1, 1, fmt & REVERSE);
- x += pw + lp;
- lp = 0;
-
- char *ep = stext + rd + 1;
- while (*ep != 'm') {
- unsigned v = strtoul(ep + 1, &ep, 10);
- if (v == 0) {
- memcpy(scm, scheme[SchemeNorm], sizeof(scm));
- fg = 7;
- bg = 0;
- fmt = 0;
- resetfntlist(fset, drw->fonts);
- drw_setfontset(drw, fset);
- } else if (v == 1) {
- fg |= 8;
- scm[0] = barclrs[fg];
- } else if (v == 4) {
- fmt |= UNDERLINE;
- } else if (v == 7) {
- fmt |= REVERSE;
- } else if (v == 9) {
- fmt |= STRIKETHROUGH;
- } else if (v >= 10 && v <= 19) {
- int fi = v % 10;
- Fnt *f;
- Fnt *p;
- resetfntlist(fset, drw->fonts);
- for (p = NULL, f = fset; f && fi--; p = f, f = f->next)
- ;
- if (f) {
- if (p) {
- p->next = NULL;
- for (p = f; p->next; p = p->next)
- ;
- p->next = fset;
- }
- drw_setfontset(drw, f);
- } else {
- drw_setfontset(drw, fset);
- }
- } else if (v == 22) {
- fg &= ~8;
- scm[0] = barclrs[fg];
- } else if (v == 24) {
- fmt &= ~UNDERLINE;
- } else if (v == 27) {
- fmt &= ~REVERSE;
- } else if (v == 29) {
- fmt &= ~STRIKETHROUGH;
- } else if (v >= 30 && v <= 37) {
- fg = v % 10 | (fg & 8);
- scm[0] = barclrs[fg];
- } else if (v >= 40 && v <= 47) {
- bg = v % 10;
- scm[1] = barclrs[bg];
- } else if (v == 53) {
- fmt |= OVERLINE;
- } else if (v == 55) {
- fmt &= ~OVERLINE;
- }
- }
-
- rd += alen + 2;
- wr = 0;
-
- drw_setscheme(drw, scm);
- continue;
- }
- }
- buffer[wr++] = stext[rd];
- }
-
- buffer[wr] = '\0';
- pw = TEXTW(buffer) - lrpad;
- drw_text(drw, x, 0, pw + lp, bh, lp, buffer, fmt & REVERSE);
- if (fmt & UNDERLINE)
- drw_rect(drw, x, (bh + drw->fonts->h) / 2, pw, 1, 1, fmt & REVERSE);
- if (fmt & STRIKETHROUGH)
- drw_rect(drw, x, bh / 2, pw, 1, 1, fmt & REVERSE);
- if (fmt & OVERLINE)
- drw_rect(drw, x, (bh - drw->fonts->h) / 2, pw, 1, 1, fmt & REVERSE);
-
- drw_setscheme(drw, scheme[SchemeStatus]);
- }
-
- resizebarwin(m);
- for (c = m->clients; c; c = c->next) {
- occ |= c->tags;
- if (c->isurgent)
- urg |= c->tags;
- }
- x = 0;
- for (i = 0; i < LENGTH(tags); i++) {
- /* Do not draw vacant tags */
- if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
- continue;
- w = TEXTW(tags[i]);
- drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]);
- drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
- x += w;
- }
- w = TEXTW(m->ltsymbol);
- drw_setscheme(drw, scheme[SchemeTagsNorm]);
- x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
-
- if ((w = m->ww - tw - stw - x) > bh) {
- if (m->sel) {
- drw_setscheme(drw, scheme[m == selmon ? SchemeInfoSel : SchemeInfoNorm]);
- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
- if (m->sel->isfloating)
- drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
- } else {
- drw_setscheme(drw, scheme[SchemeNorm]);
- drw_rect(drw, x, 0, w, bh, 1, 1);
- }
- }
- drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
-}
-
-void drawbars(void) {
- Monitor *m;
-
- for (m = mons; m; m = m->next)
- drawbar(m);
-}
-
-void enternotify(XEvent *e) {
- Client *c;
- Monitor *m;
- XCrossingEvent *ev = &e->xcrossing;
-
- if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
- return;
- c = wintoclient(ev->window);
- m = c ? c->mon : wintomon(ev->window);
- if (m != selmon) {
- unfocus(selmon->sel, 1);
- selmon = m;
- } else if (!c || c == selmon->sel)
- return;
- focus(c);
-}
-
-void expose(XEvent *e) {
- Monitor *m;
- XExposeEvent *ev = &e->xexpose;
-
- if (ev->count == 0 && (m = wintomon(ev->window))) {
- drawbar(m);
- if (m == selmon)
- updatesystray();
- }
-}
-
-void focus(Client *c) {
- if (!c || !ISVISIBLE(c))
- for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext)
- ;
- if (selmon->sel && selmon->sel != c)
- unfocus(selmon->sel, 0);
- if (c) {
- if (c->mon != selmon)
- selmon = c->mon;
- if (c->isurgent)
- seturgent(c, 0);
- detachstack(c);
- attachstack(c);
- grabbuttons(c, 1);
- XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
- setfocus(c);
- } else {
- XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
- XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
- }
- selmon->sel = c;
- drawbars();
-}
-
-/* there are some broken focus acquiring clients needing extra handling */
-void focusin(XEvent *e) {
- XFocusChangeEvent *ev = &e->xfocus;
-
- if (selmon->sel && ev->window != selmon->sel->win)
- setfocus(selmon->sel);
-}
-
-void focusmon(const Arg *arg) {
- Monitor *m;
-
- if (!mons->next)
- return;
- if ((m = dirtomon(arg->i)) == selmon)
- return;
- unfocus(selmon->sel, 0);
- selmon = m;
- focus(NULL);
-}
-
-void focusstack(const Arg *arg) {
- // Client *c = NULL, *i;
- int i = stackpos(arg);
- Client *c, *p;
-
- if (i < 0 || (selmon->sel->isfullscreen && lockfullscreen))
- return;
-
- for (p = NULL, c = selmon->clients; c && (i || !ISVISIBLE(c));
- i -= ISVISIBLE(c) ? 1 : 0, p = c, c = c->next)
- ;
- focus(c ? c : p);
- restack(selmon);
-}
-
-void gaplessgrid(Monitor *m) {
- unsigned int n, cols, rows, cn, rn, i, cx, cy, cw, ch;
- Client *c;
-
- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
- ;
- if (n == 0)
- return;
-
- /* grid dimensions */
- for (cols = 0; cols <= n / 2; cols++)
- if (cols * cols >= n)
- break;
- if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
- cols = 2;
- rows = n / cols;
-
- /* window geometries */
- cw = cols ? m->ww / cols : m->ww;
- cn = 0; /* current column number */
- rn = 0; /* current row number */
- for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
- if (i / rows + 1 > cols - n % cols)
- rows = n / cols + 1;
- ch = rows ? m->wh / rows : m->wh;
- cx = m->wx + cn * cw;
- cy = m->wy + rn * ch;
- resize(c, cx, cy, cw - 2 * c->bw, ch - 2 * c->bw, False);
- rn++;
- if (rn >= rows) {
- rn = 0;
- cn++;
- }
- }
-}
-
-Atom getatomprop(Client *c, Atom prop) {
- int di;
- unsigned long dl;
- unsigned char *p = NULL;
- Atom da, atom = None;
-
- /* FIXME getatomprop should return the number of items and a pointer to
- * the stored data instead of this workaround */
- Atom req = XA_ATOM;
- if (prop == xatom[XembedInfo])
- req = xatom[XembedInfo];
-
- if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req, &da, &di, &dl, &dl,
- &p) == Success &&
- p) {
- atom = *(Atom *)p;
- if (da == xatom[XembedInfo] && dl == 2)
- atom = ((Atom *)p)[1];
- XFree(p);
- }
- return atom;
-}
-
-unsigned int getsystraywidth(void) {
- unsigned int w = 0;
- Client *i;
- if (showsystray)
- for (i = systray->icons; i; w += i->w + systrayspacing, i = i->next)
- ;
- return w ? w + systrayspacing : 1;
-}
-
-int getrootptr(int *x, int *y) {
- int di;
- unsigned int dui;
- Window dummy;
-
- return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
-}
-
-long getstate(Window w) {
- int format;
- long result = -1;
- unsigned char *p = NULL;
- unsigned long n, extra;
- Atom real;
-
- if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], &real, &format,
- &n, &extra, (unsigned char **)&p) != Success)
- return -1;
- if (n != 0)
- result = *p;
- XFree(p);
- return result;
-}
-
-int gettextprop(Window w, Atom atom, char *text, unsigned int size) {
- char **list = NULL;
- int n;
- XTextProperty name;
-
- if (!text || size == 0)
- return 0;
- text[0] = '\0';
- if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems)
- return 0;
- if (name.encoding == XA_STRING) {
- strncpy(text, (char *)name.value, size - 1);
- } else if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {
- strncpy(text, *list, size - 1);
- XFreeStringList(list);
- }
- text[size - 1] = '\0';
- XFree(name.value);
- return 1;
-}
-
-void grabbuttons(Client *c, int focused) {
- updatenumlockmask();
- {
- unsigned int i, j;
- unsigned int modifiers[] = {0, LockMask, numlockmask, numlockmask | LockMask};
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
- if (!focused)
- XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, GrabModeSync,
- GrabModeSync, None, None);
- for (i = 0; i < LENGTH(buttons); i++)
- if (buttons[i].click == ClkClientWin)
- for (j = 0; j < LENGTH(modifiers); j++)
- XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win,
- False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
- }
-}
-
-void grabkeys(void) {
- updatenumlockmask();
- {
- unsigned int i, j, k;
- unsigned int modifiers[] = {0, LockMask, numlockmask, numlockmask | LockMask};
- int start, end, skip;
- KeySym *syms;
-
- XUngrabKey(dpy, AnyKey, AnyModifier, root);
- XDisplayKeycodes(dpy, &start, &end);
- syms = XGetKeyboardMapping(dpy, start, end - start + 1, &skip);
- if (!syms)
- return;
- for (k = start; k <= end; k++)
- for (i = 0; i < LENGTH(keys); i++)
- /* skip modifier codes, we do that ourselves */
- if (keys[i].keysym == syms[(k - start) * skip])
- for (j = 0; j < LENGTH(modifiers); j++)
- XGrabKey(dpy, k, keys[i].mod | modifiers[j], root, True, GrabModeAsync,
- GrabModeAsync);
- XFree(syms);
- }
-}
-
-void incnmaster(const Arg *arg) {
- selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] =
- MAX(selmon->nmaster + arg->i, 0);
- arrange(selmon);
-}
-
-#ifdef XINERAMA
-static int isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) {
- while (n--)
- if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org &&
- unique[n].width == info->width && unique[n].height == info->height)
- return 0;
- return 1;
-}
-#endif /* XINERAMA */
-
-void keypress(XEvent *e) {
- unsigned int i;
- KeySym keysym;
- XKeyEvent *ev;
-
- ev = &e->xkey;
- keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
- for (i = 0; i < LENGTH(keys); i++)
- if (keysym == keys[i].keysym && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) &&
- keys[i].func)
- keys[i].func(&(keys[i].arg));
-}
-
-void killclient(const Arg *arg) {
- if (!selmon->sel)
- return;
-
- if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime,
- 0, 0, 0)) {
- XGrabServer(dpy);
- XSetErrorHandler(xerrordummy);
- XSetCloseDownMode(dpy, DestroyAll);
- XKillClient(dpy, selmon->sel->win);
- XSync(dpy, False);
- XSetErrorHandler(xerror);
- XUngrabServer(dpy);
- }
-}
-
-void manage(Window w, XWindowAttributes *wa) {
- Client *c, *t = NULL, *term = NULL;
- Window trans = None;
- XWindowChanges wc;
-
- c = ecalloc(1, sizeof(Client));
- c->win = w;
- c->pid = winpid(w);
- /* geometry */
- c->x = c->oldx = wa->x;
- c->y = c->oldy = wa->y;
- c->w = c->oldw = wa->width;
- c->h = c->oldh = wa->height;
- c->oldbw = wa->border_width;
-
- updatetitle(c);
- if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
- c->mon = t->mon;
- c->tags = t->tags;
- } else {
- c->mon = selmon;
- applyrules(c);
- term = termforwin(c);
- }
-
- if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
- c->x = c->mon->wx + c->mon->ww - WIDTH(c);
- if (c->y + HEIGHT(c) > c->mon->wy + c->mon->wh)
- c->y = c->mon->wy + c->mon->wh - HEIGHT(c);
- c->x = MAX(c->x, c->mon->wx);
- c->y = MAX(c->y, c->mon->wy);
- c->bw = borderpx;
-
- wc.border_width = c->bw;
- XConfigureWindow(dpy, w, CWBorderWidth, &wc);
- XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
- configure(c); /* propagates border_width, if size doesn't change */
- updatewindowtype(c);
- updatesizehints(c);
- updatewmhints(c);
- XSelectInput(dpy, w,
- EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);
- grabbuttons(c, 0);
- if (!c->isfloating)
- c->isfloating = c->oldstate = trans != None || c->isfixed;
- if (c->isfloating)
- XRaiseWindow(dpy, c->win);
- attachtop(c);
- attachstack(c);
- XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
- (unsigned char *)&(c->win), 1);
- XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
- setclientstate(c, NormalState);
- if (c->mon == selmon)
- unfocus(selmon->sel, 0);
- c->mon->sel = c;
- arrange(c->mon);
- XMapWindow(dpy, c->win);
- if (term)
- swallow(term, c);
- focus(NULL);
-}
-
-void mappingnotify(XEvent *e) {
- XMappingEvent *ev = &e->xmapping;
-
- XRefreshKeyboardMapping(ev);
- if (ev->request == MappingKeyboard)
- grabkeys();
-}
-
-void maprequest(XEvent *e) {
- static XWindowAttributes wa;
- XMapRequestEvent *ev = &e->xmaprequest;
-
- Client *i;
- if ((i = wintosystrayicon(ev->window))) {
- sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE,
- 0, systray->win, XEMBED_EMBEDDED_VERSION);
- resizebarwin(selmon);
- updatesystray();
- }
-
- if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
- return;
- if (!wintoclient(ev->window))
- manage(ev->window, &wa);
-}
-
-int matchrules(Client *c) {
- const char *class, *instance;
- unsigned int ri;
- const Rule *r;
- XClassHint ch = {NULL, NULL};
- XGetClassHint(dpy, c->win, &ch);
- class = ch.res_class ? ch.res_class : broken;
- instance = ch.res_name ? ch.res_name : broken;
- for (ri = 0; ri < LENGTH(rules); ri++) {
- r = &rules[ri];
- if ((!r->title || strstr(c->name, r->title)) && (!r->class || strstr(class, r->class)) &&
- (!r->instance || strstr(instance, r->instance))) {
- if (ch.res_class)
- XFree(ch.res_class);
- if (ch.res_name)
- XFree(ch.res_name);
- return ri;
- }
- }
- if (ch.res_class)
- XFree(ch.res_class);
- if (ch.res_name)
- XFree(ch.res_name);
- return False;
-}
-
-void monocle(Monitor *m) {
- unsigned int n = 0;
- Client *c;
-
- for (c = m->clients; c; c = c->next)
- if (ISVISIBLE(c))
- n++;
- if (n > 0) /* override layout symbol */
- snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
- for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
- resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
-}
-
-void motionnotify(XEvent *e) {
- static Monitor *mon = NULL;
- Monitor *m;
- XMotionEvent *ev = &e->xmotion;
-
- if (ev->window != root)
- return;
- if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
- unfocus(selmon->sel, 1);
- selmon = m;
- focus(NULL);
- }
- mon = m;
-}
-
-void movemouse(const Arg *arg) {
- int x, y, ocx, ocy, nx, ny;
- Client *c;
- Monitor *m;
- XEvent ev;
- Time lasttime = 0;
-
- if (!(c = selmon->sel))
- return;
- if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
- return;
- restack(selmon);
- ocx = c->x;
- ocy = c->y;
- if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None,
- cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
- return;
- if (!getrootptr(&x, &y))
- return;
- do {
- XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
- switch (ev.type) {
- case ConfigureRequest:
- case Expose:
- case MapRequest:
- handler[ev.type](&ev);
- break;
- case MotionNotify:
- if ((ev.xmotion.time - lasttime) <= (1000 / 60))
- continue;
- lasttime = ev.xmotion.time;
-
- nx = ocx + (ev.xmotion.x - x);
- ny = ocy + (ev.xmotion.y - y);
- if (abs(selmon->wx - nx) < snap)
- nx = selmon->wx;
- else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
- nx = selmon->wx + selmon->ww - WIDTH(c);
- if (abs(selmon->wy - ny) < snap)
- ny = selmon->wy;
- else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
- ny = selmon->wy + selmon->wh - HEIGHT(c);
- if (!c->isfloating && selmon->lt[selmon->sellt]->arrange &&
- (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
- togglefloating(NULL);
- if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
- resize(c, nx, ny, c->w, c->h, 1);
- break;
- }
- } while (ev.type != ButtonRelease);
- XUngrabPointer(dpy, CurrentTime);
- if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
- sendmon(c, m);
- selmon = m;
- focus(NULL);
- }
-}
-
-Client *nexttiled(Client *c) {
- for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next)
- ;
- return c;
-}
-
-void pop(Client *c) {
- detach(c);
- attach(c);
- focus(c);
- arrange(c->mon);
-}
-
-void propertynotify(XEvent *e) {
- Client *c;
- Window trans;
- XPropertyEvent *ev = &e->xproperty;
-
- if ((c = wintosystrayicon(ev->window))) {
- if (ev->atom == XA_WM_NORMAL_HINTS) {
- updatesizehints(c);
- updatesystrayicongeom(c, c->w, c->h);
- } else
- updatesystrayiconstate(c, ev);
- resizebarwin(selmon);
- updatesystray();
- }
-
- if ((ev->window == root) && (ev->atom == XA_WM_NAME))
- updatestatus();
- else if (ev->state == PropertyDelete)
- return; /* ignore */
- else if ((c = wintoclient(ev->window))) {
- switch (ev->atom) {
- default:
- break;
- case XA_WM_TRANSIENT_FOR:
- if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
- (c->isfloating = (wintoclient(trans)) != NULL))
- arrange(c->mon);
- break;
- case XA_WM_NORMAL_HINTS:
- c->hintsvalid = 0;
- break;
- case XA_WM_HINTS:
- updatewmhints(c);
- drawbars();
- break;
- }
- if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
- updatetitle(c);
- if (c == c->mon->sel)
- drawbar(c->mon);
- }
- if (ev->atom == netatom[NetWMWindowType])
- updatewindowtype(c);
- }
-}
-
-void pushstack(const Arg *arg) {
- int i = stackpos(arg);
- Client *sel = selmon->sel, *c, *p;
-
- if (i < 0)
- return;
- else if (i == 0) {
- detach(sel);
- attach(sel);
- } else {
- for (p = NULL, c = selmon->clients; c; p = c, c = c->next)
- if (!(i -= (ISVISIBLE(c) && c != sel)))
- break;
- c = c ? c : p;
- detach(sel);
- sel->next = c->next;
- c->next = sel;
- }
- arrange(selmon);
-}
-
-void quit(const Arg *arg) {
- if (arg->i)
- restart = 1;
- running = 0;
-}
-
-Monitor *recttomon(int x, int y, int w, int h) {
- Monitor *m, *r = selmon;
- int a, area = 0;
-
- for (m = mons; m; m = m->next)
- if ((a = INTERSECT(x, y, w, h, m)) > area) {
- area = a;
- r = m;
- }
- return r;
-}
-
-void removesystrayicon(Client *i) {
- Client **ii;
-
- if (!showsystray || !i)
- return;
- for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next)
- ;
- if (ii)
- *ii = i->next;
- free(i);
-}
-
-void resetnmaster(const Arg *arg) {
- selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = 1;
- arrange(selmon);
-}
-
-void resize(Client *c, int x, int y, int w, int h, int interact) {
- if (applysizehints(c, &x, &y, &w, &h, interact))
- resizeclient(c, x, y, w, h);
-}
-
-void resizebarwin(Monitor *m) {
- unsigned int w = m->ww;
- if (showsystray && m == systraytomon(m) && !systrayonleft)
- w -= getsystraywidth();
- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
-}
-
-void resizeclient(Client *c, int x, int y, int w, int h) {
- XWindowChanges wc;
-
- c->oldx = c->x;
- c->x = wc.x = x;
- c->oldy = c->y;
- c->y = wc.y = y;
- c->oldw = c->w;
- c->w = wc.width = w;
- c->oldh = c->h;
- c->h = wc.height = h;
- if (c->isfloating && c->hasfloatbw && !c->isfullscreen)
- wc.border_width = c->floatborderpx;
- else
- wc.border_width = c->bw;
- XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
- configure(c);
- XSync(dpy, False);
-}
-
-void resizemouse(const Arg *arg) {
- int ocx, ocy, nw, nh;
- int ocx2, ocy2, nx, ny;
- Client *c;
- Monitor *m;
- XEvent ev;
- int horizcorner, vertcorner;
- int di;
- unsigned int dui;
- Window dummy;
- Time lasttime = 0;
-
- if (!(c = selmon->sel))
- return;
- if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
- return;
- restack(selmon);
- ocx = c->x;
- ocy = c->y;
- ocx2 = c->x + c->w;
- ocy2 = c->y + c->h;
- if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None,
- cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
- return;
- if (!XQueryPointer(dpy, c->win, &dummy, &dummy, &di, &di, &nx, &ny, &dui))
- return;
- horizcorner = nx < c->w / 2;
- vertcorner = ny < c->h / 2;
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, horizcorner ? (-c->bw) : (c->w + c->bw - 1),
- vertcorner ? (-c->bw) : (c->h + c->bw - 1));
- do {
- XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
- switch (ev.type) {
- case ConfigureRequest:
- case Expose:
- case MapRequest:
- handler[ev.type](&ev);
- break;
- case MotionNotify:
- if ((ev.xmotion.time - lasttime) <= (1000 / 60))
- continue;
- lasttime = ev.xmotion.time;
-
- nx = horizcorner ? ev.xmotion.x : c->x;
- ny = vertcorner ? ev.xmotion.y : c->y;
- nw = MAX(horizcorner ? (ocx2 - nx) : (ev.xmotion.x - ocx - 2 * c->bw + 1), 1);
- nh = MAX(vertcorner ? (ocy2 - ny) : (ev.xmotion.y - ocy - 2 * c->bw + 1), 1);
-
- if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww &&
- c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh) {
- if (!c->isfloating && selmon->lt[selmon->sellt]->arrange &&
- (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
- togglefloating(NULL);
- }
- if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
- resize(c, nx, ny, nw, nh, 1);
- break;
- }
- } while (ev.type != ButtonRelease);
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, horizcorner ? (-c->bw) : (c->w + c->bw - 1),
- vertcorner ? (-c->bw) : (c->h + c->bw - 1));
- XUngrabPointer(dpy, CurrentTime);
- while (XCheckMaskEvent(dpy, EnterWindowMask, &ev))
- ;
- if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
- sendmon(c, m);
- selmon = m;
- focus(NULL);
- }
-}
-
-void resizerequest(XEvent *e) {
- XResizeRequestEvent *ev = &e->xresizerequest;
- Client *i;
-
- if ((i = wintosystrayicon(ev->window))) {
- updatesystrayicongeom(i, ev->width, ev->height);
- resizebarwin(selmon);
- updatesystray();
- }
-}
-
-void restack(Monitor *m) {
- Client *c;
- XEvent ev;
- XWindowChanges wc;
-
- drawbar(m);
- if (!m->sel)
- return;
- if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
- XRaiseWindow(dpy, m->sel->win);
- if (m->lt[m->sellt]->arrange) {
- wc.stack_mode = Below;
- wc.sibling = m->barwin;
- for (c = m->stack; c; c = c->snext)
- if (!c->isfloating && ISVISIBLE(c)) {
- XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
- wc.sibling = c->win;
- }
- }
- XSync(dpy, False);
- while (XCheckMaskEvent(dpy, EnterWindowMask, &ev))
- ;
-}
-
-void run(void) {
- XEvent ev;
- /* main event loop */
- XSync(dpy, False);
- while (running && !XNextEvent(dpy, &ev))
- if (handler[ev.type])
- handler[ev.type](&ev); /* call handler */
-}
-
-void scan(void) {
- unsigned int i, num;
- Window d1, d2, *wins = NULL;
- XWindowAttributes wa;
-
- if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
- for (i = 0; i < num; i++) {
- if (!XGetWindowAttributes(dpy, wins[i], &wa) || wa.override_redirect ||
- XGetTransientForHint(dpy, wins[i], &d1))
- continue;
- if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
- manage(wins[i], &wa);
- }
- for (i = 0; i < num; i++) { /* now the transients */
- if (!XGetWindowAttributes(dpy, wins[i], &wa))
- continue;
- if (XGetTransientForHint(dpy, wins[i], &d1) &&
- (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
- manage(wins[i], &wa);
- }
- if (wins)
- XFree(wins);
- }
-}
-
-void sendmon(Client *c, Monitor *m) {
- if (c->mon == m)
- return;
- unfocus(c, 1);
- detach(c);
- detachstack(c);
- c->mon = m;
- c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
- attachtop(c);
- attachstack(c);
- focus(NULL);
- arrange(NULL);
-}
-
-void setclientstate(Client *c, long state) {
- long data[] = {state, None};
-
- XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, PropModeReplace,
- (unsigned char *)data, 2);
-}
-
-int sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4) {
- int n;
- Atom *protocols, mt;
- int exists = 0;
- XEvent ev;
-
- if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
- mt = wmatom[WMProtocols];
- if (XGetWMProtocols(dpy, w, &protocols, &n)) {
- while (!exists && n--)
- exists = protocols[n] == proto;
- XFree(protocols);
- }
- } else {
- exists = True;
- mt = proto;
- }
- if (exists) {
- ev.type = ClientMessage;
- ev.xclient.window = w;
- ev.xclient.message_type = mt;
- ev.xclient.format = 32;
- ev.xclient.data.l[0] = d0;
- ev.xclient.data.l[1] = d1;
- ev.xclient.data.l[2] = d2;
- ev.xclient.data.l[3] = d3;
- ev.xclient.data.l[4] = d4;
- XSendEvent(dpy, w, False, mask, &ev);
- }
- return exists;
-}
-
-void setfocus(Client *c) {
- if (!c->neverfocus) {
- XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32, PropModeReplace,
- (unsigned char *)&(c->win), 1);
- }
- sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
-}
-
-void setfullscreen(Client *c, int fullscreen) {
- if (fullscreen && !c->isfullscreen) {
- XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, PropModeReplace,
- (unsigned char *)&netatom[NetWMFullscreen], 1);
- c->isfullscreen = 1;
- c->oldstate = c->isfloating;
- c->oldbw = c->bw;
- c->bw = 0;
- c->isfloating = 1;
- resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
- XRaiseWindow(dpy, c->win);
- } else if (!fullscreen && c->isfullscreen) {
- XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, PropModeReplace,
- (unsigned char *)0, 0);
- c->isfullscreen = 0;
- c->isfloating = c->oldstate;
- c->bw = c->oldbw;
- c->x = c->oldx;
- c->y = c->oldy;
- c->w = c->oldw;
- c->h = c->oldh;
- resizeclient(c, c->x, c->y, c->w, c->h);
- arrange(c->mon);
- }
-}
-
-void setlayout(const Arg *arg) {
- if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
- selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
- if (arg && arg->v)
- selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] =
- (Layout *)arg->v;
- strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
- if (selmon->sel)
- arrange(selmon);
- else
- drawbar(selmon);
-}
-
-/* arg > 1.0 will set mfact absolutely */
-void setmfact(const Arg *arg) {
- float f;
-
- if (!arg || !selmon->lt[selmon->sellt]->arrange)
- return;
- f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
- if (f < 0.05 || f > 0.95)
- return;
- selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
- arrange(selmon);
-}
-
-void setup(void) {
- int i;
- XSetWindowAttributes wa;
- Atom utf8string;
- struct sigaction sa;
-
- /* do not transform children into zombies when they terminate */
- sigemptyset(&sa.sa_mask);
- sa.sa_flags = SA_NOCLDSTOP | SA_NOCLDWAIT | SA_RESTART;
- sa.sa_handler = SIG_IGN;
- sigaction(SIGCHLD, &sa, NULL);
-
- /* clean up any zombies (inherited from .xinitrc etc) immediately */
- while (waitpid(-1, NULL, WNOHANG) > 0)
- ;
-
- signal(SIGHUP, sighup);
- signal(SIGTERM, sigterm);
-
- /* init screen */
- screen = DefaultScreen(dpy);
- sw = DisplayWidth(dpy, screen);
- sh = DisplayHeight(dpy, screen);
- root = RootWindow(dpy, screen);
- drw = drw_create(dpy, screen, root, sw, sh);
- if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
- die("no fonts could be loaded.");
- lrpad = drw->fonts->h;
- bh = drw->fonts->h + 2;
- updategeom();
- /* init atoms */
- utf8string = XInternAtom(dpy, "UTF8_STRING", False);
- wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
- wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
- wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
- wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
- netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
- netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
- netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
- netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
- netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False);
- netatom[NetSystemTrayOrientationHorz] =
- XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False);
- netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
- netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
- netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
- netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
- netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
- netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
- netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
- xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
- xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
- xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
- /* init cursors */
- cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
- cursor[CurResize] = drw_cur_create(drw, XC_sizing);
- cursor[CurMove] = drw_cur_create(drw, XC_fleur);
- /* init appearance */
- scheme = ecalloc(LENGTH(barschemes), sizeof(Clr *));
- for (i = 0; i < LENGTH(barschemes); i++)
- scheme[i] = drw_scm_create(drw, barschemes[i], 3);
-
- barclrs = ecalloc(LENGTH(colors), sizeof(Clr));
- for (i = 0; i < 16; i++)
- drw_clr_create(drw, &barclrs[i], colors[i]);
-
- /* init system tray */
- updatesystray();
- /* init bars */
- updatebars();
- updatestatus();
- /* supporting window for NetWMCheck */
- wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0);
- XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32, PropModeReplace,
- (unsigned char *)&wmcheckwin, 1);
- XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8, PropModeReplace,
- (unsigned char *)"dwm", 3);
- XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32, PropModeReplace,
- (unsigned char *)&wmcheckwin, 1);
- /* EWMH support per view */
- XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, PropModeReplace,
- (unsigned char *)netatom, NetLast);
- XDeleteProperty(dpy, root, netatom[NetClientList]);
- /* select events */
- wa.cursor = cursor[CurNormal]->cursor;
- wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | ButtonPressMask |
- PointerMotionMask | EnterWindowMask | LeaveWindowMask | StructureNotifyMask |
- PropertyChangeMask;
- XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
- XSelectInput(dpy, root, wa.event_mask);
- grabkeys();
- focus(NULL);
-}
-
-void seturgent(Client *c, int urg) {
- XWMHints *wmh;
-
- c->isurgent = urg;
- if (!(wmh = XGetWMHints(dpy, c->win)))
- return;
- wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint);
- XSetWMHints(dpy, c->win, wmh);
- XFree(wmh);
-}
-
-void showhide(Client *c) {
- if (!c)
- return;
- if (ISVISIBLE(c)) {
- /* show clients top down */
- XMoveWindow(dpy, c->win, c->x, c->y);
- if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
- resize(c, c->x, c->y, c->w, c->h, 0);
- showhide(c->snext);
- } else {
- /* hide clients bottom up */
- showhide(c->snext);
- XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
- }
-}
-
-void sighup(int unused) {
- Arg a = {.i = 1};
- quit(&a);
-}
-
-void sigterm(int unused) {
- Arg a = {.i = 0};
- quit(&a);
-}
-
-void spawn(const Arg *arg) {
- if (fork() == 0) {
- if (dpy)
- close(ConnectionNumber(dpy));
- setsid();
- execvp(((char **)arg->v)[0], (char **)arg->v);
- die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]);
- }
-}
-
-void spawnscratch(const Arg *arg) {
- if (fork() == 0) {
- if (dpy)
- close(ConnectionNumber(dpy));
- setsid();
- execvp(((char **)arg->v)[1], ((char **)arg->v) + 1);
- fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[1]);
- perror(" failed");
- exit(EXIT_SUCCESS);
- }
-}
-
-int stackpos(const Arg *arg) {
- int n, i;
- Client *c, *l;
-
- if (!selmon->clients)
- return -1;
-
- if (arg->i == PREVSEL) {
- for (l = selmon->stack; l && (!ISVISIBLE(l) || l == selmon->sel); l = l->snext)
- ;
- if (!l)
- return -1;
- for (i = 0, c = selmon->clients; c != l; i += ISVISIBLE(c) ? 1 : 0, c = c->next)
- ;
- return i;
- } else if (ISINC(arg->i)) {
- if (!selmon->sel)
- return -1;
- for (i = 0, c = selmon->clients; c != selmon->sel; i += ISVISIBLE(c) ? 1 : 0, c = c->next)
- ;
- for (n = i; c; n += ISVISIBLE(c) ? 1 : 0, c = c->next)
- ;
- return MOD(i + GETINC(arg->i), n);
- } else if (arg->i < 0) {
- for (i = 0, c = selmon->clients; c; i += ISVISIBLE(c) ? 1 : 0, c = c->next)
- ;
- return MAX(i + arg->i, 0);
- } else
- return arg->i;
-}
-
-void tag(const Arg *arg) {
- if (selmon->sel && arg->ui & TAGMASK) {
- selmon->sel->tags = arg->ui & TAGMASK;
- focus(NULL);
- arrange(selmon);
- }
-}
-
-void tagmon(const Arg *arg) {
- if (!selmon->sel || !mons->next)
- return;
- sendmon(selmon->sel, dirtomon(arg->i));
-}
-
-void tile(Monitor *m) {
- unsigned int i, n, h, mw, my, ty;
- Client *c;
-
- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
- ;
- if (n == 0)
- return;
-
- if (n > m->nmaster)
- mw = m->nmaster ? m->ww * m->mfact : 0;
- else
- mw = m->ww;
- for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
- if (i < m->nmaster) {
- h = (m->wh - my) / (MIN(n, m->nmaster) - i);
- resize(c, m->wx, m->wy + my, mw - (2 * c->bw), h - (2 * c->bw), 0);
- if (my + HEIGHT(c) < m->wh)
- my += HEIGHT(c);
- } else {
- h = (m->wh - ty) / (n - i);
- resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2 * c->bw), h - (2 * c->bw), 0);
- if (ty + HEIGHT(c) < m->wh)
- ty += HEIGHT(c);
- }
-}
-
-void togglebar(const Arg *arg) {
- selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
- updatebarpos(selmon);
- resizebarwin(selmon);
- if (showsystray) {
- XWindowChanges wc;
- if (!selmon->showbar)
- wc.y = -bh;
- else if (selmon->showbar) {
- wc.y = 0;
- if (!selmon->topbar)
- wc.y = selmon->mh - bh;
- }
- XConfigureWindow(dpy, systray->win, CWY, &wc);
- }
- arrange(selmon);
-}
-
-void togglefloating(const Arg *arg) {
- if (!selmon->sel)
- return;
- if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
- return;
- selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
- if (selmon->sel->isfloating)
- resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h, 0);
- arrange(selmon);
-}
-
-void togglefullscr(const Arg *arg) {
- if (selmon->sel)
- setfullscreen(selmon->sel, !selmon->sel->isfullscreen);
-}
-
-void togglescratch(const Arg *arg) {
- Client *c;
- unsigned int found = 0;
-
- for (c = selmon->clients; c && !(found = c->scratchkey == ((char **)arg->v)[0][0]); c = c->next)
- ;
- if (found) {
- c->tags = ISVISIBLE(c) ? 0 : selmon->tagset[selmon->seltags];
- focus(NULL);
- arrange(selmon);
-
- if (ISVISIBLE(c)) {
- focus(c);
- restack(selmon);
- }
-
- } else {
- spawnscratch(arg);
- }
-}
-
-void toggletag(const Arg *arg) {
- unsigned int newtags;
-
- if (!selmon->sel)
- return;
- newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
- if (newtags) {
- selmon->sel->tags = newtags;
- focus(NULL);
- arrange(selmon);
- }
-}
-
-void toggleview(const Arg *arg) {
- unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
- int i;
-
- if (newtagset) {
- selmon->tagset[selmon->seltags] = newtagset;
-
- if (newtagset == ~0) {
- selmon->pertag->prevtag = selmon->pertag->curtag;
- selmon->pertag->curtag = 0;
- }
-
- /* test if the user did not select the same tag */
- if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
- selmon->pertag->prevtag = selmon->pertag->curtag;
- for (i = 0; !(newtagset & 1 << i); i++)
- ;
- selmon->pertag->curtag = i + 1;
- }
-
- /* apply settings for this view */
- selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
- selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
- selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
- selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
- selmon->lt[selmon->sellt ^ 1] =
- selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt ^ 1];
-
- if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
- togglebar(NULL);
-
- focus(NULL);
- arrange(selmon);
- }
-}
-
-void unfocus(Client *c, int setfocus) {
- if (!c)
- return;
- grabbuttons(c, 0);
- XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
- if (setfocus) {
- XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
- XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
- }
-}
-
-void unmanage(Client *c, int destroyed) {
- Monitor *m = c->mon;
- XWindowChanges wc;
-
- if (c->swallowing) {
- unswallow(c);
- return;
- }
-
- Client *s = swallowingclient(c->win);
- if (s) {
- free(s->swallowing);
- s->swallowing = NULL;
- arrange(m);
- focus(NULL);
- return;
- }
-
- detach(c);
- detachstack(c);
- if (!destroyed) {
- wc.border_width = c->oldbw;
- XGrabServer(dpy); /* avoid race conditions */
- XSetErrorHandler(xerrordummy);
- XSelectInput(dpy, c->win, NoEventMask);
- XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
- setclientstate(c, WithdrawnState);
- XSync(dpy, False);
- XSetErrorHandler(xerror);
- XUngrabServer(dpy);
- }
- free(c);
- if (!s) {
- arrange(m);
- focus(NULL);
- updateclientlist();
- }
-}
-
-void unmapnotify(XEvent *e) {
- Client *c;
- XUnmapEvent *ev = &e->xunmap;
-
- if ((c = wintoclient(ev->window))) {
- if (ev->send_event)
- setclientstate(c, WithdrawnState);
- else
- unmanage(c, 0);
- } else if ((c = wintosystrayicon(ev->window))) {
- /* KLUDGE! sometimes icons occasionally unmap their windows, but do
- * _not_ destroy them. We map those windows back */
- XMapRaised(dpy, c->win);
- updatesystray();
- }
-}
-
-void updatebars(void) {
- unsigned int w;
- Monitor *m;
- XSetWindowAttributes wa = {.override_redirect = True,
- .background_pixmap = ParentRelative,
- .event_mask = ButtonPressMask | ExposureMask};
- XClassHint ch = {"dwm", "dwm"};
- for (m = mons; m; m = m->next) {
- if (m->barwin)
- continue;
- w = m->ww;
- if (showsystray && m == systraytomon(m))
- w -= getsystraywidth();
- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen),
- CopyFromParent, DefaultVisual(dpy, screen),
- CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
- if (showsystray && m == systraytomon(m))
- XMapRaised(dpy, systray->win);
- XMapRaised(dpy, m->barwin);
- XSetClassHint(dpy, m->barwin, &ch);
- }
-}
-
-void updatebarpos(Monitor *m) {
- m->wy = m->my;
- m->wh = m->mh;
- if (m->showbar) {
- m->wh -= bh;
- m->by = m->topbar ? m->wy : m->wy + m->wh;
- m->wy = m->topbar ? m->wy + bh : m->wy;
- } else
- m->by = -bh;
-}
-
-void updateclientlist(void) {
- Client *c;
- Monitor *m;
-
- XDeleteProperty(dpy, root, netatom[NetClientList]);
- for (m = mons; m; m = m->next)
- for (c = m->clients; c; c = c->next)
- XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
- (unsigned char *)&(c->win), 1);
-}
-
-int updategeom(void) {
- int dirty = 0;
-
-#ifdef XINERAMA
- if (XineramaIsActive(dpy)) {
- int i, j, n, nn;
- Client *c;
- Monitor *m;
- XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
- XineramaScreenInfo *unique = NULL;
-
- for (n = 0, m = mons; m; m = m->next, n++)
- ;
- /* only consider unique geometries as separate screens */
- unique = ecalloc(nn, sizeof(XineramaScreenInfo));
- for (i = 0, j = 0; i < nn; i++)
- if (isuniquegeom(unique, j, &info[i]))
- memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
- XFree(info);
- nn = j;
-
- /* new monitors if nn > n */
- for (i = n; i < nn; i++) {
- for (m = mons; m && m->next; m = m->next)
- ;
- if (m)
- m->next = createmon();
- else
- mons = createmon();
- }
- for (i = 0, m = mons; i < nn && m; m = m->next, i++)
- if (i >= n || unique[i].x_org != m->mx || unique[i].y_org != m->my ||
- unique[i].width != m->mw || unique[i].height != m->mh) {
- dirty = 1;
- m->num = i;
- m->mx = m->wx = unique[i].x_org;
- m->my = m->wy = unique[i].y_org;
- m->mw = m->ww = unique[i].width;
- m->mh = m->wh = unique[i].height;
- updatebarpos(m);
- }
- /* removed monitors if n > nn */
- for (i = nn; i < n; i++) {
- for (m = mons; m && m->next; m = m->next)
- ;
- while ((c = m->clients)) {
- dirty = 1;
- m->clients = c->next;
- detachstack(c);
- c->mon = mons;
- attachtop(c);
- attachstack(c);
- }
- if (m == selmon)
- selmon = mons;
- cleanupmon(m);
- }
- free(unique);
- } else
-#endif /* XINERAMA */
- { /* default monitor setup */
- if (!mons)
- mons = createmon();
- if (mons->mw != sw || mons->mh != sh) {
- dirty = 1;
- mons->mw = mons->ww = sw;
- mons->mh = mons->wh = sh;
- updatebarpos(mons);
- }
- }
- if (dirty) {
- selmon = mons;
- selmon = wintomon(root);
- }
- return dirty;
-}
-
-void updatenumlockmask(void) {
- unsigned int i, j;
- XModifierKeymap *modmap;
-
- numlockmask = 0;
- modmap = XGetModifierMapping(dpy);
- for (i = 0; i < 8; i++)
- for (j = 0; j < modmap->max_keypermod; j++)
- if (modmap->modifiermap[i * modmap->max_keypermod + j] ==
- XKeysymToKeycode(dpy, XK_Num_Lock))
- numlockmask = (1 << i);
- XFreeModifiermap(modmap);
-}
-
-void updatesizehints(Client *c) {
- long msize;
- XSizeHints size;
-
- if (!XGetWMNormalHints(dpy, c->win, &size, &msize))
- /* size is uninitialized, ensure that size.flags aren't used */
- size.flags = PSize;
- if (size.flags & PBaseSize) {
- c->basew = size.base_width;
- c->baseh = size.base_height;
- } else if (size.flags & PMinSize) {
- c->basew = size.min_width;
- c->baseh = size.min_height;
- } else
- c->basew = c->baseh = 0;
- if (size.flags & PResizeInc) {
- c->incw = size.width_inc;
- c->inch = size.height_inc;
- } else
- c->incw = c->inch = 0;
- if (size.flags & PMaxSize) {
- c->maxw = size.max_width;
- c->maxh = size.max_height;
- } else
- c->maxw = c->maxh = 0;
- if (size.flags & PMinSize) {
- c->minw = size.min_width;
- c->minh = size.min_height;
- } else if (size.flags & PBaseSize) {
- c->minw = size.base_width;
- c->minh = size.base_height;
- } else
- c->minw = c->minh = 0;
- if (size.flags & PAspect) {
- c->mina = (float)size.min_aspect.y / size.min_aspect.x;
- c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
- } else
- c->maxa = c->mina = 0.0;
- c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh);
- c->hintsvalid = 1;
-}
-
-void updatestatus(void) {
- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
- strcpy(stext, "dwm-" VERSION);
- drawbar(selmon);
- updatesystray();
-}
-
-void updatesystrayicongeom(Client *i, int w, int h) {
- if (i) {
- i->h = bh;
- if (w == h)
- i->w = bh;
- else if (h == bh)
- i->w = w;
- else
- i->w = (int)((float)bh * ((float)w / (float)h));
- applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);
- /* force icons into the systray dimensions if they don't want to */
- if (i->h > bh) {
- if (i->w == i->h)
- i->w = bh;
- else
- i->w = (int)((float)bh * ((float)i->w / (float)i->h));
- i->h = bh;
- }
- }
-}
-
-void updatesystrayiconstate(Client *i, XPropertyEvent *ev) {
- long flags;
- int code = 0;
-
- if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
- !(flags = getatomprop(i, xatom[XembedInfo])))
- return;
-
- if (flags & XEMBED_MAPPED && !i->tags) {
- i->tags = 1;
- code = XEMBED_WINDOW_ACTIVATE;
- XMapRaised(dpy, i->win);
- setclientstate(i, NormalState);
- } else if (!(flags & XEMBED_MAPPED) && i->tags) {
- i->tags = 0;
- code = XEMBED_WINDOW_DEACTIVATE;
- XUnmapWindow(dpy, i->win);
- setclientstate(i, WithdrawnState);
- } else
- return;
- sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0, systray->win,
- XEMBED_EMBEDDED_VERSION);
-}
-
-void updatesystray(void) {
- XSetWindowAttributes wa;
- XWindowChanges wc;
- Client *i;
- Monitor *m = systraytomon(NULL);
- unsigned int x = m->mx + m->mw;
- unsigned int sw = TEXTW(stext) - lrpad + systrayspacing;
- unsigned int w = 1;
-
- if (!showsystray)
- return;
- if (systrayonleft)
- x -= sw + lrpad / 2;
- if (!systray) {
- /* init systray */
- if (!(systray = (Systray *)calloc(1, sizeof(Systray))))
- die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
- systray->win =
- XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel);
- wa.event_mask = ButtonPressMask | ExposureMask;
- wa.override_redirect = True;
- wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
- XSelectInput(dpy, systray->win, SubstructureNotifyMask);
- XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
- PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz],
- 1);
- XChangeWindowAttributes(dpy, systray->win, CWEventMask | CWOverrideRedirect | CWBackPixel,
- &wa);
- XMapRaised(dpy, systray->win);
- XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime);
- if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
- sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime,
- netatom[NetSystemTray], systray->win, 0, 0);
- XSync(dpy, False);
- } else {
- fprintf(stderr, "dwm: unable to obtain system tray.\n");
- free(systray);
- systray = NULL;
- return;
- }
- }
- for (w = 0, i = systray->icons; i; i = i->next) {
- /* make sure the background color stays the same */
- wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
- XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
- XMapRaised(dpy, i->win);
- w += systrayspacing;
- i->x = w;
- XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
- w += i->w;
- if (i->mon != m)
- i->mon = m;
- }
- w = w ? w + systrayspacing : 1;
- x -= w;
- XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh);
- wc.x = x;
- wc.y = m->by;
- wc.width = w;
- wc.height = bh;
- wc.stack_mode = Above;
- wc.sibling = m->barwin;
- XConfigureWindow(dpy, systray->win, CWX | CWY | CWWidth | CWHeight | CWSibling | CWStackMode,
- &wc);
- XMapWindow(dpy, systray->win);
- XMapSubwindows(dpy, systray->win);
- /* redraw background */
- XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
- XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
- XSync(dpy, False);
-}
-
-void updatetitle(Client *c) {
- if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
- gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
- if (c->name[0] == '\0') /* hack to mark broken clients */
- strcpy(c->name, broken);
-}
-
-void updatewindowtype(Client *c) {
- Atom state = getatomprop(c, netatom[NetWMState]);
- Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
-
- if (state == netatom[NetWMFullscreen])
- setfullscreen(c, 1);
- if (wtype == netatom[NetWMWindowTypeDialog])
- c->isfloating = 1;
-}
-
-void updatewmhints(Client *c) {
- XWMHints *wmh;
-
- if ((wmh = XGetWMHints(dpy, c->win))) {
- if (c == selmon->sel && wmh->flags & XUrgencyHint) {
- wmh->flags &= ~XUrgencyHint;
- XSetWMHints(dpy, c->win, wmh);
- } else
- c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
- if (wmh->flags & InputHint)
- c->neverfocus = !wmh->input;
- else
- c->neverfocus = 0;
- XFree(wmh);
- }
-}
-
-void view(const Arg *arg) {
- int i;
- unsigned int tmptag;
-
- if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
- return;
- selmon->seltags ^= 1; /* toggle sel tagset */
- if (arg->ui & TAGMASK) {
- selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
- selmon->pertag->prevtag = selmon->pertag->curtag;
-
- if (arg->ui == ~0)
- selmon->pertag->curtag = 0;
- else {
- for (i = 0; !(arg->ui & 1 << i); i++)
- ;
- selmon->pertag->curtag = i + 1;
- }
- } else {
- tmptag = selmon->pertag->prevtag;
- selmon->pertag->prevtag = selmon->pertag->curtag;
- selmon->pertag->curtag = tmptag;
- }
-
- selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
- selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
- selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
- selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
- selmon->lt[selmon->sellt ^ 1] =
- selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt ^ 1];
-
- if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
- togglebar(NULL);
-
- focus(NULL);
- arrange(selmon);
-}
-
-pid_t winpid(Window w) {
-
- pid_t result = 0;
-
-#ifdef __linux__
- xcb_res_client_id_spec_t spec = {0};
- spec.client = w;
- spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
-
- xcb_generic_error_t *e = NULL;
- xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec);
- xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e);
-
- if (!r)
- return (pid_t)0;
-
- xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r);
- for (; i.rem; xcb_res_client_id_value_next(&i)) {
- spec = i.data->spec;
- if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) {
- uint32_t *t = xcb_res_client_id_value_value(i.data);
- result = *t;
- break;
- }
- }
-
- free(r);
-
- if (result == (pid_t)-1)
- result = 0;
-
-#endif /* __linux__ */
-
-#ifdef __OpenBSD__
- Atom type;
- int format;
- unsigned long len, bytes;
- unsigned char *prop;
- pid_t ret;
-
- if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 0), 0, 1, False, AnyPropertyType,
- &type, &format, &len, &bytes, &prop) != Success ||
- !prop)
- return 0;
-
- ret = *(pid_t *)prop;
- XFree(prop);
- result = ret;
-
-#endif /* __OpenBSD__ */
- return result;
-}
-
-pid_t getparentprocess(pid_t p) {
- unsigned int v = 0;
-
-#ifdef __linux__
- FILE *f;
- char buf[256];
- snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p);
-
- if (!(f = fopen(buf, "r")))
- return 0;
-
- fscanf(f, "%*u %*s %*c %u", &v);
- fclose(f);
-#endif /* __linux__*/
-
-#ifdef __OpenBSD__
- int n;
- kvm_t *kd;
- struct kinfo_proc *kp;
-
- kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL);
- if (!kd)
- return 0;
-
- kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n);
- v = kp->p_ppid;
-#endif /* __OpenBSD__ */
-
- return (pid_t)v;
-}
-
-int isdescprocess(pid_t p, pid_t c) {
- while (p != c && c != 0)
- c = getparentprocess(c);
-
- return (int)c;
-}
-
-Client *termforwin(const Client *w) {
- Client *c;
- Monitor *m;
-
- if (!w->pid || w->isterminal)
- return NULL;
-
- for (m = mons; m; m = m->next) {
- for (c = m->clients; c; c = c->next) {
- if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid))
- return c;
- }
- }
-
- return NULL;
-}
-
-Client *swallowingclient(Window w) {
- Client *c;
- Monitor *m;
-
- for (m = mons; m; m = m->next) {
- for (c = m->clients; c; c = c->next) {
- if (c->swallowing && c->swallowing->win == w)
- return c;
- }
- }
-
- return NULL;
-}
-
-Client *wintoclient(Window w) {
- Client *c;
- Monitor *m;
-
- for (m = mons; m; m = m->next)
- for (c = m->clients; c; c = c->next)
- if (c->win == w)
- return c;
- return NULL;
-}
-
-Monitor *wintomon(Window w) {
- int x, y;
- Client *c;
- Monitor *m;
-
- if (w == root && getrootptr(&x, &y))
- return recttomon(x, y, 1, 1);
- for (m = mons; m; m = m->next)
- if (w == m->barwin)
- return m;
- if ((c = wintoclient(w)))
- return c->mon;
- return selmon;
-}
-
-Client *wintosystrayicon(Window w) {
- Client *i = NULL;
-
- if (!showsystray || !w)
- return i;
- for (i = systray->icons; i && i->win != w; i = i->next)
- ;
- return i;
-}
-
-/* There's no way to check accesses to destroyed windows, thus those cases are
- * ignored (especially on UnmapNotify's). Other types of errors call Xlibs
- * default error handler, which may call exit. */
-int xerror(Display *dpy, XErrorEvent *ee) {
- if (ee->error_code == BadWindow ||
- (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch) ||
- (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable) ||
- (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable) ||
- (ee->request_code == X_PolySegment && ee->error_code == BadDrawable) ||
- (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch) ||
- (ee->request_code == X_GrabButton && ee->error_code == BadAccess) ||
- (ee->request_code == X_GrabKey && ee->error_code == BadAccess) ||
- (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
- return 0;
- fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", ee->request_code,
- ee->error_code);
- return xerrorxlib(dpy, ee); /* may call exit */
-}
-
-int xerrordummy(Display *dpy, XErrorEvent *ee) { return 0; }
-
-/* Startup Error handler to check if another window manager
- * is already running. */
-int xerrorstart(Display *dpy, XErrorEvent *ee) {
- die("dwm: another window manager is already running");
- return -1;
-}
-
-Monitor *systraytomon(Monitor *m) {
- Monitor *t;
- int i, n;
- if (!systraypinning) {
- if (!m)
- return selmon;
- return m == selmon ? m : NULL;
- }
- for (n = 1, t = mons; t && t->next; n++, t = t->next)
- ;
- for (i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next)
- ;
- if (systraypinningfailfirst && n < systraypinning)
- return mons;
- return t;
-}
-
-void zoom(const Arg *arg) {
- Client *c = selmon->sel;
-
- if (!selmon->lt[selmon->sellt]->arrange || !c || c->isfloating)
- return;
- if (c == nexttiled(selmon->clients) && !(c = nexttiled(c->next)))
- return;
- pop(c);
-}
-
-int main(int argc, char *argv[]) {
- if (argc == 2 && !strcmp("-v", argv[1]))
- die("dwm-" VERSION);
- else if (argc != 1)
- die("usage: dwm [-v]");
- if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
- fputs("warning: no locale support\n", stderr);
- if (!(dpy = XOpenDisplay(NULL)))
- die("dwm: cannot open display");
- if (!(xcon = XGetXCBConnection(dpy)))
- die("dwm: cannot get xcb connection\n");
- checkotherwm();
- setup();
-#ifdef __OpenBSD__
- if (pledge("stdio rpath proc exec ps", NULL) == -1)
- die("pledge");
-#endif /* __OpenBSD__ */
- scan();
- run();
- if (restart)
- execvp(argv[0], argv);
- cleanup();
- XCloseDisplay(dpy);
- return EXIT_SUCCESS;
-}
diff --git a/flexipatch-finalizer b/flexipatch-finalizer
new file mode 160000
index 0000000..7c66a3d
--- /dev/null
+++ b/flexipatch-finalizer
@@ -0,0 +1 @@
+Subproject commit 7c66a3d0560d33d9d49b3e856859ef8a0af1fd6a
diff --git a/patches.h b/patches.h
new file mode 100644
index 0000000..d732315
--- /dev/null
+++ b/patches.h
@@ -0,0 +1,1494 @@
+/*
+ * This file contains patch control flags.
+ *
+ * In principle you should be able to mix and match any patches
+ * you may want. In cases where patches are logically incompatible
+ * one patch may take precedence over the other as noted in the
+ * relevant descriptions.
+ *
+ * Although layouts typically come as patches they are differentiated
+ * here for grouping purposes.
+ */
+
+/**
+ * Bar modules
+ */
+
+/* Enhanced taskbar that shows the titles of all visible windows in the status bar
+ * and allows focus / hiding / unhiding of windows by clicking on the status bar.
+ * Awesomebar takes precedence over fancybar.
+ * https://dwm.suckless.org/patches/awesomebar/
+ */
+#define BAR_AWESOMEBAR_PATCH 0
+
+/* This patch depends on statuscmd patch and adds integration with a (patched)
+ * dwmblocks instance to give a clickable status bar. One must not necessarily
+ * have to use dwmblocks for this feature, any status updater that has support
+ * for real-time signals (SIGRTMIN) can be used.
+ *
+ * dwmblocks: https://github.com/torrinfail/dwmblocks
+ * https://dwm.suckless.org/patches/statuscmd/
+ */
+#define BAR_DWMBLOCKS_PATCH 1
+
+/* Originally the dwmblocks + statuscmd patch used a user defined signal (SIGUSR1)
+ * for communicating with dwmblocks to indicate update signal and what button was
+ * pressed. The signalling was later changed to SIGRTMIN instead.
+ *
+ * Ultimately this makes dwmblocks instances that were patched with the old patch
+ * are incompatible with the new dwm patch and vice versa.
+ *
+ * This is a compatibility patch that makes dwm use SIGUSR1 instead of SIGRTMIN so
+ * if button clicks are not working then you may want to try enabling this.
+ *
+ * If dwmblocks happen to die like this when clicking on a status
+ *
+ * [1] 54355 user-defined signal 1 dwmblocks
+ *
+ * then it suggests that dwmblocks does not support user defined signals and this
+ * patch should be left disabled.
+ *
+ * Patch: https://gist.github.com/danbyl/54f7c1d57fc6507242a95b71c3d8fdea
+ * https://dwm.suckless.org/patches/statuscmd/
+ */
+#define BAR_DWMBLOCKS_SIGUSR1_PATCH 0
+
+/* This patch shows the titles of all visible windows in the status bar
+ * (as opposed to showing only the selected one).
+ * Awesomebar takes precedence over fancybar. Fancybar takes precedence over
+ * the centeredwindowname patch.
+ * https://dwm.suckless.org/patches/fancybar/
+ */
+#define BAR_FANCYBAR_PATCH 0
+
+/* Being an evolution of the bartabgroups patch the flexwintitle patch specifically
+ * taps into the many layout options that flextile-deluxe offers to produce a window
+ * title section in the bar that is representative of what is shown on screen.
+ */
+#define BAR_FLEXWINTITLE_PATCH 0
+
+/* This patch adds a context menu for layout switching.
+ * - xmenu needs to be installed.
+ * - Edit layoutmenu.sh with the installed layouts and with correct indexes.
+ * - Place layoutmenu.sh in PATH.
+ * - The text of the menu items is for display only. Name them however you want.
+ * https://dwm.suckless.org/patches/layoutmenu/
+ */
+#define BAR_LAYOUTMENU_PATCH 1
+
+/* Show layout symbol in bar */
+#define BAR_LTSYMBOL_PATCH 1
+
+/* Adds powerline arrows for the status.
+ * This uses statuscolors logic for choosing colors for the powerline. As these markers
+ * are also control characters there is no explicit statuscmd support for this patch.
+ *
+ * Powerline separators are defined as:
+ * |\xXX (creates a hard edge)
+ * <\xXX (creates a less than arrow)
+ * /\xXX (creates a diagonal line)
+ *
+ * Examples:
+ * xsetroot -name "$(echo -e '<\x01a<\x02b<\x03c')"
+ * xsetroot -name "$(echo -e '/\x01d/\x02e/\x03f')"
+ *
+ * https://gitlab.com/udiboy1209-suckless/dwm/-/commit/071f5063e8ac4280666828179f92788d893eea40#4b1a539194be7467cefbda22f675a3b7c19ceca7
+ * https://dwm.suckless.org/patches/statuscolors/
+ */
+#define BAR_POWERLINE_STATUS_PATCH 0
+
+/* Adds powerline arrows for the tags.
+ * https://gitlab.com/udiboy1209-suckless/dwm/-/commit/071f5063e8ac4280666828179f92788d893eea40#4b1a539194be7467cefbda22f675a3b7c19ceca7
+ */
+#define BAR_POWERLINE_TAGS_PATCH 0
+
+/* Alters the tags powerline to use forward slash instead of arrows */
+#define BAR_POWERLINE_TAGS_SLASH_PATCH 0
+
+/* This patch turns the titlebar area into a mfact-respecting tabbar showing each client's title.
+ * https://dwm.suckless.org/patches/bartabgroups/
+ */
+#define BAR_TABGROUPS_PATCH 0
+
+/* This patch adds an option to place tags in rows like in many other window managers.
+ * https://dwm.suckless.org/patches/taggrid/
+ */
+#define BAR_TAGGRID_PATCH 0
+
+/* Hover tag icons to see a preview of the windows on that tag.
+ *
+ * The patch depends on Imlib2 for icon scaling.
+ * You need to uncomment the corresponding line in config.mk to use the -lImlib2 library
+ *
+ * Arch Linux:
+ * sudo pacman -S imlib2
+ * Debian:
+ * sudo apt install libimlib2-dev
+ *
+ * As with the winicon patch you may want to consider adding the compiler flags of -O3 and
+ * -march=native to enable auto loop vectorize for better performance.
+ *
+ * https://dwm.suckless.org/patches/tag-previews/
+ */
+#define BAR_TAGPREVIEW_PATCH 0
+
+/* Show status in bar */
+#define BAR_STATUS_PATCH 1
+
+/* This patch adds a clickable button to the left hand side of the statusbar.
+ * https://dwm.suckless.org/patches/statusbutton/
+ */
+#define BAR_STATUSBUTTON_PATCH 0
+
+/* This patch adds the ability to execute shell commands based on the mouse button and position
+ * when clicking the status bar. Refer to the website for usage.
+ * https://dwm.suckless.org/patches/statuscmd/
+ */
+#define BAR_STATUSCMD_PATCH 1
+
+/* Status2d allows colors and rectangle drawing in your dwm status bar.
+ * This patch is incompatible with the statuscolors patch which takes precedence.
+ * This patch is incompatible with the extrabar patch.
+ * https://dwm.suckless.org/patches/status2d/
+ */
+#define BAR_STATUS2D_PATCH 0
+
+/* Supplementary patch should you want to disable alpha for the status2d section */
+#define BAR_STATUS2D_NO_ALPHA_PATCH 0
+
+/* Addition to the status2d patch that allows the use of terminal colors (color0 through color15)
+ * from xrdb in the status, allowing programs like pywal to change statusbar colors.
+ * This adds the C and B codes to use terminal foreground and background colors respectively.
+ * E.g. ^B5^ would use color5 as the background color.
+ * https://dwm.suckless.org/patches/status2d/
+ */
+#define BAR_STATUS2D_XRDB_TERMCOLORS_PATCH 0
+
+/* The systray patch adds systray for the status bar.
+ * https://dwm.suckless.org/patches/systray/
+ */
+#define BAR_SYSTRAY_PATCH 1
+
+/* Show tag symbols in the bar. */
+#define BAR_TAGS_PATCH 1
+
+/* Show tag symbols + class of master window in the bar.
+ * https://dwm.suckless.org/patches/taglabels/
+ */
+#define BAR_TAGLABELS_PATCH 0
+
+/* This patch underlines the selected tag, or optionally all tags.
+ * https://dwm.suckless.org/patches/underlinetags/
+ */
+#define BAR_UNDERLINETAGS_PATCH 0
+
+/* This patch adds the window icon next to the window title in the bar.
+ *
+ * The patch depends on Imlib2 for icon scaling.
+ * You need to uncomment the corresponding line in config.mk to use the -lImlib2 library
+ *
+ * Arch Linux:
+ * sudo pacman -S imlib2
+ * Debian:
+ * sudo apt install libimlib2-dev
+ *
+ * The author recommends adding the compiler flags of -O3 and -march=native to enable auto loop
+ * vectorize for better performance.
+ *
+ * https://github.com/AdamYuan/dwm-winicon
+ * https://dwm.suckless.org/patches/winicon
+ */
+#define BAR_WINICON_PATCH 0
+
+/* Show window title in bar */
+#define BAR_WINTITLE_PATCH 1
+
+/* Shows window titles in the bar, but only for floating clients.
+ * This depends on code from the flexwintitle patch.
+ * Note that the configuration in config.def.h for this is merely an example. If combined
+ * with the corresponding hidden patch then these two will overlap unless the width of the
+ * modules are controlled.
+ */
+#define BAR_WINTITLE_FLOATING_PATCH 0
+
+/* Shows window titles in the bar, but only for floating clients.
+ * This depends on code from the flexwintitle patch.
+ * Note that the configuration in config.def.h for this is merely an example. If combined
+ * with the corresponding floating patch then these two will overlap unless the width of the
+ * modules are controlled.
+ */
+#define BAR_WINTITLE_HIDDEN_PATCH 0
+
+/* Title bar modules such as wintitle (default), fancybar and awesomebar
+ * do not by default add left and/or right padding as they take up the
+ * remaining space. These options allow you explicitly add padding should
+ * you need it.
+ */
+#define BAR_TITLE_RIGHT_PAD_PATCH 0
+#define BAR_TITLE_LEFT_PAD_PATCH 0
+
+/**
+ * Bar options
+ */
+
+/* This patch changes the rectangle indicating if a tag is used by a client into a bar
+ * above the tag name for better visibility.
+ * Set the tagindicatortype variable in config.h to INDICATOR_TOP_BAR to enable this.
+ * https://dwm.suckless.org/patches/activetagindicatorbar/
+ */
+#define BAR_ACTIVETAGINDICATORBAR_PATCH N/A
+
+/* Alternative patch to the activetagindicatorbar patch, adds the bar below the tag
+ * icon rather than above.
+ * Set the tagindicatortype variable in config.h to INDICATOR_BOTTOM_BAR to enable this.
+ */
+#define BAR_ACTIVETAGINDICATORBAR_ALT1_PATCH N/A
+
+/* The alpha patch adds transparency for the status bar.
+ * You need to uncomment the corresponding line in config.mk to use the -lXrender library
+ * when including this patch.
+ * https://dwm.suckless.org/patches/alpha/
+ */
+#define BAR_ALPHA_PATCH 1
+
+/* This patch introduces alternative tags which can be switched on the fly for the
+ * sole purpose of providing visual aid.
+ * https://dwm.suckless.org/patches/alternativetags/
+ */
+#define BAR_ALTERNATIVE_TAGS_PATCH 0
+
+/* This patches provides the ability to use alternative text for tags which contain at
+ * least one window.
+ * https://dwm.suckless.org/patches/alttagsdecoration/
+ */
+#define BAR_ALTTAGSDECORATION_PATCH 0
+
+/* This patch enables dwm to manage external status bars such as lemonbar and polybar.
+ * dwm treats the external bar as it would its own, so all regular dwm commands such as
+ * togglebar affect the external bar in the same way.
+ *
+ * NB: Unless you want both anybar + dwm bar(s) then the recommendation is to disable all
+ * bar modules and have { -2 } in the barrules.
+ *
+ * https://dwm.suckless.org/patches/anybar/
+ */
+#define BAR_ANYBAR_PATCH 0
+
+/* Anybar option to place the next bar depending on previous bar's position (top or bottom) */
+#define BAR_ANYBAR_TOP_AND_BOTTOM_BARS_PATCH 0
+
+/* Anybar option to let dwm manage the width of the bar */
+#define BAR_ANYBAR_MANAGE_WIDTH_PATCH 0
+
+/* This patch adds a border around the status bar(s) just like the border of client windows.
+ * https://codemadness.org/paste/dwm-border-bar.patch
+ */
+#define BAR_BORDER_PATCH 0
+
+/* This patch centers the WM_NAME of the currently selected window on the status bar.
+ * This is compatible with the wintitle, bartabgroups, flexwintitle and awesomebar bar
+ * modules.
+ * https://dwm.suckless.org/patches/centeredwindowname/
+ */
+#define BAR_CENTEREDWINDOWNAME_PATCH 0
+
+/* Draws a dot indicator overlayed on each tag icon for each client. The selected client
+ * is drawn as a larger horizontal line.
+ * Set the tagindicatortype variable in config.h to INDICATOR_CLIENT_DOTS to enable this.
+ * https://dwm.suckless.org/patches/clientindicators/
+ */
+#define BAR_CLIENTINDICATOR_PATCH N/A
+
+/* Updates the position of dmenu to match that of the bar. I.e. if topbar is 0 then dmenu
+ * will appear at the bottom and if 1 then dmenu will appear at the top.
+ * https://dwm.suckless.org/patches/dmenumatchtop
+ */
+#define BAR_DMENUMATCHTOP_PATCH 1
+
+/* Originally this was the extrabar patch, but as the handling of extra bars is now built-in
+ * only the splitting of the status by a designated separator remains. As such this has been
+ * renamed to more accurately reflect what it does - creating an extra status.
+ * https://dwm.suckless.org/patches/extrabar/
+ */
+#define BAR_EXTRASTATUS_PATCH 0
+
+/* Adds EWMH support for _NET_NUMBER_OF_DESKTOPS, _NET_CURRENT_DESKTOP, _NET_DESKTOP_NAMES
+ * and _NET_DESKTOP_VIEWPORT, which allows for compatibility with other bars and programs
+ * that request workspace information. For example polybar's xworkspaces module.
+ *
+ * This patch also includes support for adding the _IS_FLOATING property for floating windows
+ * allowing for compositors to treat floating windows differently to tiled windows.
+ *
+ * E.g. this setting makes picom only render shadows for floating windows:
+ *
+ * shadow-exclude = [ "! _IS_FLOATING@:32c = 1" ];
+ *
+ * https://github.com/bakkeby/dwm-flexipatch/issues/50 (_IS_FLOATING patch)
+ * https://dwm.suckless.org/patches/ewmhtags/
+ */
+#define BAR_EWMHTAGS_PATCH 1
+
+/* Allows the bar height to be explicitly set rather than being derived from font.
+ * https://dwm.suckless.org/patches/bar_height/
+ */
+#define BAR_HEIGHT_PATCH 0
+
+/* This patch prevents dwm from drawing tags with no clients (i.e. vacant) on the bar.
+ * https://dwm.suckless.org/patches/hide_vacant_tags/
+ */
+#define BAR_HIDEVACANTTAGS_PATCH 1
+
+/* With this patch dwm's built-in status bar is only shown when HOLDKEY is pressed
+ * and the bar will now overlay the display.
+ * http://dwm.suckless.org/patches/holdbar/
+ */
+#define BAR_HOLDBAR_PATCH 0
+
+/* Sometimes dwm crashes when it cannot render some glyphs in window titles (usually emoji).
+ * This patch is essentially a hack to ignore any errors when drawing text on the status bar.
+ * https://groups.google.com/forum/m/#!topic/wmii/7bncCahYIww
+ * https://docs.google.com/viewer?a=v&pid=forums&srcid=MDAwODA2MTg0MDQyMjE0OTgzMzMBMDQ3ODQzODkyMTU3NTAyMTMxNTYBX2RUMVNtOUtDQUFKATAuMQEBdjI&authuser=0
+ */
+#define BAR_IGNORE_XFT_ERRORS_WHEN_DRAWING_TEXT_PATCH 0
+
+/* This patch adds back in the workaround for a BadLength error in the Xft library when color
+ * glyphs are used. This is for systems that do not have an updated version of the Xft library
+ * (or generally prefer monochrome fonts).
+ */
+#define BAR_NO_COLOR_EMOJI_PATCH 0
+
+/* This patch adds vertical and horizontal space between the statusbar and the edge of the screen.
+ * https://dwm.suckless.org/patches/barpadding/
+ */
+#define BAR_PADDING_PATCH 0
+
+/* Same as barpadding patch but specifically tailored for the vanitygaps patch in that the outer
+ * bar padding is derived from the vanitygaps settings. In addition to this the bar padding is
+ * toggled in unison when vanitygaps are toggled. Increasing or decreasing gaps during runtime
+ * will not affect the bar padding.
+ */
+#define BAR_PADDING_VANITYGAPS_PATCH 0
+
+/* This patch adds simple markup for status messages using pango markup.
+ * This depends on the pango library v1.44 or greater.
+ * You need to uncomment the corresponding lines in config.mk to use the pango libraries
+ * when including this patch.
+ *
+ * Note that the pango patch does not protect against the BadLength error from Xft
+ * when color glyphs are used, which means that dwm will crash if color emoji is used.
+ *
+ * If you need color emoji then you may want to install this patched library from the AUR:
+ * https://aur.archlinux.org/packages/libxft-bgra/
+ *
+ * A long term fix for the libXft library is pending approval of this pull request:
+ * https://gitlab.freedesktop.org/xorg/lib/libxft/-/merge_requests/1
+ *
+ * Also see:
+ * https://developer.gnome.org/pygtk/stable/pango-markup-language.html
+ * https://lists.suckless.org/hackers/2004/17285.html
+ * https://dwm.suckless.org/patches/pango/
+ */
+#define BAR_PANGO_PATCH 1
+
+/* This patch allows the status text to be fixed to the bar on a specific
+ * monitor rather than being drawn on the focused monitor.
+ * The statusallmons patch takes precedence over this patch.
+ * https://dwm.suckless.org/patches/staticstatus/
+ */
+#define BAR_STATICSTATUS_PATCH 0
+
+/* This patch draws and updates the statusbar on all monitors.
+ * https://dwm.suckless.org/patches/statusallmons/
+ */
+#define BAR_STATUSALLMONS_PATCH 0
+
+/* This patch enables colored text in the status bar. It changes the way colors are defined
+ * in config.h allowing multiple color combinations for use in the status script.
+ * This patch is incompatible with and takes precedence over the status2d patch.
+ *
+ * This patch is compatible with the statuscmd patch with the caveat that the first 16 markers
+ * are reserved for status colors restricting block signals to 17 through 31.
+ *
+ * https://dwm.suckless.org/patches/statuscolors/
+ */
+#define BAR_STATUSCOLORS_PATCH 0
+
+/* This patch adds configuration options for horizontal and vertical padding in the status bar.
+ * https://dwm.suckless.org/patches/statuspadding/
+ */
+#define BAR_STATUSPADDING_PATCH 0
+
+/* This patch adds the ability for dwm to read colors from the linux virtual console.
+ * /sys/module/vt/parameters/default_{red,grn,blu}
+ * Essentially this way the colors you use in your regular tty is "mirrored" to dwm.
+ * https://dwm.suckless.org/patches/vtcolors/
+ */
+#define BAR_VTCOLORS_PATCH 0
+
+/* This patch allows client windows to be hidden. This code was originally part of awesomebar,
+ * but has been separated out so that other bar modules can take advantage of it.
+ * Both awesomebar and bartabgroups patches depend on this patch and it will be auto-enabled
+ * during compile time if it is needed. Note that if using flexipatch-finalizer this must be
+ * explicitly enabled.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-barmodules-wintitleactions-6.2.diff
+ */
+#define BAR_WINTITLEACTIONS_PATCH BAR_AWESOMEBAR_PATCH || BAR_TABGROUPS_PATCH || BAR_FLEXWINTITLE_PATCH
+
+/***
+ * Other patches
+ */
+
+/* Adds a window task switcher toggled using alt-tab.
+ * https://dwm.suckless.org/patches/alt-tab/
+ */
+#define ALT_TAB_PATCH 0
+
+/* All floating windows are centered, like the center patch, but without a rule.
+ * The center patch takes precedence over this patch.
+ * This patch interferes with the center transient windows patches.
+ * https://dwm.suckless.org/patches/alwayscenter/
+ */
+#define ALWAYSCENTER_PATCH 0
+
+/* This patch allows windows to be resized with its aspect ratio remaining constant.
+ * https://dwm.suckless.org/patches/aspectresize/
+ */
+#define ASPECTRESIZE_PATCH 0
+
+/* This patch adds new clients above the selected client, instead of always
+ * becoming the new master. This behaviour is known from Xmonad.
+ * This patch takes precedence over ATTACHASIDE_PATCH.
+ * https://dwm.suckless.org/patches/attachabove/
+ */
+#define ATTACHABOVE_PATCH 0
+
+/* This patch adds new clients on top of the stack.
+ * This patch takes precedence over ATTACHBELOW_PATCH.
+ * https://dwm.suckless.org/patches/attachaside/
+ */
+#define ATTACHASIDE_PATCH 0
+
+/* This patch adds new clients below the selected client.
+ * This patch takes precedence over ATTACHBOTTOM_PATCH.
+ * https://dwm.suckless.org/patches/attachbelow/
+ */
+#define ATTACHBELOW_PATCH 1
+
+/* This patch adds new clients at the bottom of the stack.
+ * https://dwm.suckless.org/patches/attachbottom/
+ */
+#define ATTACHBOTTOM_PATCH 0
+
+/* This patch will make dwm run "~/.local/share/dwm/autostart_blocking.sh" and
+ * "~/.local/share/dwm/autostart.sh &" before entering the handler loop. One or
+ * both of these files can be ommited. Note the path inside .local/share rather
+ * than the original ~/.dwm folder.
+ * https://dwm.suckless.org/patches/autostart/
+ */
+#define AUTOSTART_PATCH 0
+
+/* By default, windows that are not visible when requesting a resize/move will not
+ * get resized/moved. With this patch, they will.
+ * https://dwm.suckless.org/patches/autoresize/
+ */
+#define AUTORESIZE_PATCH 0
+
+/* This patch adds proper support for Right-To-Left languages. (such as Farsi, Arabic or Hebrew).
+ *
+ * You need to uncomment the corresponding lines in config.mk to use the -lfribidi library
+ * when including this patch.
+ *
+ * This patch depends on the following additional library:
+ * - fribidi
+ *
+ * https://dwm.suckless.org/patches/bidi/
+ */
+#define BIDI_PATCH 0
+
+/* This patch adds an iscentered rule to automatically center clients on the current monitor.
+ * This patch takes precedence over centeredwindowname, alwayscenter and fancybar patches.
+ * https://dwm.suckless.org/patches/center/
+ */
+#define CENTER_PATCH 0
+
+/* A transient window is one that is meant to be short lived and is usually raised by a
+ * parent window. Such windows are typically dialog boxes and the like.
+ * It should be noted that in dwm transient windows are not subject to normal client rules
+ * and they are always floating by default.
+ * This patch centers transient windows on the screen like the center patch does. Note that
+ * the 6.2 center patch piggy-backed on the updatewindowtype function to ensure that all
+ * dialog boxes were centered, transient or not. This function was removed in relation to
+ * adding wintype as a client rule filter, hence this no longer works out of the box. This
+ * patch restores previous behaviour with the center patch.
+ */
+#define CENTER_TRANSIENT_WINDOWS_PATCH 1
+
+/* As above, except that the transient window is centered within the position of the parent
+ * window, rather than at the center of the screen. This takes precedence over the above patch.
+ */
+#define CENTER_TRANSIENT_WINDOWS_BY_PARENT_PATCH 1
+
+/* This patch provides the ability to assign different weights to clients in their
+ * respective stack in tiled layout.
+ * https://dwm.suckless.org/patches/cfacts/
+ */
+#define CFACTS_PATCH 1
+
+/* This patch allows color attributes to be set through the command line.
+ * https://dwm.suckless.org/patches/cmdcustomize/
+ */
+#define CMDCUSTOMIZE_PATCH 0
+
+/* This patch tweaks the tagging interface so that you can select multiple tags for tag
+ * or view by pressing all the right keys as a combo. For example to view tags 1 and 3,
+ * hold MOD and then press and hold 1 and 3 together.
+ * https://dwm.suckless.org/patches/combo/
+ */
+#define COMBO_PATCH 0
+
+/* Allow dwm to execute commands from autostart array in your config.h file. When dwm exits
+ * then all processes from autostart array will be killed.
+ * https://dwm.suckless.org/patches/cool_autostart/
+ */
+#define COOL_AUTOSTART_PATCH 1
+
+/* The cyclelayouts patch lets you cycle through all your layouts.
+ * https://dwm.suckless.org/patches/cyclelayouts/
+ */
+#define CYCLELAYOUTS_PATCH 1
+
+/* Make dwm respect _MOTIF_WM_HINTS property, and not draw borders around windows requesting
+ * for it. Some applications use this property to notify window managers to not draw window
+ * decorations.
+ * Not respecting this property leads to issues with applications that draw their own borders,
+ * like chromium (with "Use system title bar and borders" turned off) or vlc in fullscreen mode.
+ * https://dwm.suckless.org/patches/decoration_hints/
+ */
+#define DECORATION_HINTS_PATCH 1
+
+/* This feature distributes all clients on the current monitor evenly across all tags.
+ * It is a variant of the reorganizetags patch.
+ * https://dwm.suckless.org/patches/reorganizetags/
+ */
+#define DISTRIBUTETAGS_PATCH 0
+
+/* By default dwm will terminate on color allocation failure and the behaviour is intended to
+ * catch and inform the user of color configuration issues.
+ *
+ * Some patches like status2d and xresources / xrdb can change colours during runtime, which
+ * means that if a color can't be allocated at this time then the window manager will abruptly
+ * terminate.
+ *
+ * This patch will ignore color allocation failures and continue on as normal. The effect of
+ * this is that the existing color, that was supposed to be replaced, will remain as-is.
+ */
+#define DO_NOT_DIE_ON_COLOR_ALLOCATION_FAILURE_PATCH 1
+
+/* Similarly to the dragmfact patch this allows you to click and drag clients to change the
+ * cfact to adjust the client's size in the stack. This patch depends on the cfacts patch.
+ */
+#define DRAGCFACT_PATCH 0
+
+/* This patch lets you resize the split in the tile layout (i.e. modify mfact) by holding
+ * the modkey and dragging the mouse.
+ * This patch can be a bit wonky with other layouts, but generally works.
+ * https://dwm.suckless.org/patches/dragmfact/
+ */
+#define DRAGMFACT_PATCH 0
+
+/* Simple dwmc client using a fork of fsignal to communicate with dwm.
+ * To use this either copy the patch/dwmc shell script to somewhere in your path or
+ * uncomment the following line in Makefile:
+ * #cp -f patch/dwmc ${DESTDIR}${PREFIX}/bin
+ * http://dwm.suckless.org/patches/dwmc/
+ */
+#define DWMC_PATCH 0
+
+/* This patch allows no tag at all to be selected. The result is that dwm will start with
+ * no tag selected and when you start a client with no tag rule and no tag selected then
+ * it will be opened on the first tag.
+ * https://dwm.suckless.org/patches/emptyview/
+ */
+#define EMPTYVIEW_PATCH 0
+
+/* This patch allows the user to change size and placement of floating windows using only the
+ * keyboard. It also allows for temporary vertical and horizontal extension of windows similar
+ * to other WMs fill command.
+ * https://dwm.suckless.org/patches/exresize/
+ */
+#define EXRESIZE_PATCH 0
+
+/* Only allow clients to "fullscreen" into the space currently given to them.
+ * As an example, this will allow you to view a fullscreen video in your browser on
+ * one half of the screen, while having the other half available for other tasks.
+ * This patch takes precedence over the fakefullscreen client patch below.
+ * https://dwm.suckless.org/patches/fakefullscreen/
+ */
+#define FAKEFULLSCREEN_PATCH 0
+
+/* Similarly to the fakefullscreen patch this patch only allows clients to "fullscreen" into
+ * the space currently given to them.
+ * The "twist" with this patch is that fake fullscreen can be toggled on a per client basis
+ * rather than applying to all clients globally.
+ * Also see the selectivefakefullscreen option that adds a rule option to enabled this on client
+ * startup.
+ */
+#define FAKEFULLSCREEN_CLIENT_PATCH 0
+
+/* This patch adds a float rule allowing the size and position of floating windows to be specified
+ * It also allows the size and position of floating windows to be controlled similar to the
+ * exresize, moveresize, and moveplace patches.
+ * The size and position can be specified using absolute, relative or fixed co-ordinates and
+ * https://github.com/bakkeby/patches/wiki/floatpos/
+ */
+#define FLOATPOS_PATCH 1
+
+/* Add-on functionality for the above: make the float positions respect outer (vanity)gaps. */
+#define FLOATPOS_RESPECT_GAPS_PATCH 0
+
+/* This patch provides the ability to focus the tag on the immediate left or right of the
+ * currently focused tag. It also allows to send the focused window either on the left or
+ * the right tag.
+ * http://dwm.suckless.org/patches/focusadjacenttag/
+ */
+#define FOCUSADJACENTTAG_PATCH 0
+
+/* Allows focusing on clients based on direction (up, down, left, right) instead of client order.
+ * https://github.com/bakkeby/patches/wiki/focusdir/
+ */
+#define FOCUSDIR_PATCH 0
+
+/* When changing tags, closing windows or moving clients out of view then focus will revert to the
+ * client window that remains under the mouse cursor rather than the most recently focused window.
+ * https://github.com/bakkeby/patches/wiki/focusfollowmouse
+ */
+#define FOCUSFOLLOWMOUSE_PATCH 0
+
+/* A simple patch that just puts focus back to the master client.
+ * https://dwm.suckless.org/patches/focusmaster/
+ */
+#define FOCUSMASTER_PATCH 0
+
+/* A variant of the focusmaster patch that additionally allows the focus to be returned to the
+ * previously focused client
+ * https://dwm.suckless.org/patches/focusmaster/
+ */
+#define FOCUSMASTER_RETURN_PATCH 0
+
+/* Switch focus only by mouse click and not sloppy (focus follows mouse pointer).
+ * https://dwm.suckless.org/patches/focusonclick/
+ */
+#define FOCUSONCLICK_PATCH 1
+
+/* Selects the next window having the urgent flag regardless of the tag it is on.
+ * The urgent flag can be artificially set with the following xdotool command on any window:
+ * xdotool selectwindow -- set_window --urgency 1
+ * https://dwm.suckless.org/patches/focusurgent/
+ */
+#define FOCUSURGENT_PATCH 0
+
+/* By default, dwm responds to _NET_ACTIVE_WINDOW client messages by setting
+ * the urgency bit on the named window. This patch activates the window instead.
+ * https://dwm.suckless.org/patches/focusonnetactive/
+ */
+#define FOCUSONNETACTIVE_PATCH 0
+
+/* Send "fake signals" to dwm for handling, using xsetroot. This will not conflict with the
+ * status bar, which also is managed using xsetroot.
+ * Also see the dwmc patch, which takes precedence over this patch.
+ * https://dwm.suckless.org/patches/fsignal/
+ */
+#define FSIGNAL_PATCH 0
+
+/* Applies the monocle layout with the focused client on top and hides the bar. When pressed
+ * again it shows the bar and restores the layout that was active before going fullscreen.
+ * https://dwm.suckless.org/patches/fullscreen/
+ */
+#define FULLSCREEN_PATCH 0
+
+/* This patch provides a keybinding to rotate all clients in the currently selected
+ * area (master or stack) without affecting the other area.
+ * https://dwm.suckless.org/patches/inplacerotate/
+ */
+#define INPLACEROTATE_PATCH 0
+
+/* This patch lets you define custom insets from each edge of the screen. One use case would be
+ * to arrange space for an external bar.
+ * https://dwm.suckless.org/patches/insets/
+ */
+#define INSETS_PATCH 0
+
+/* This patch (v1.5.7) implements inter-process communication through a UNIX socket for dwm. This
+ * allows for the window manager to be queried for information, e.g. listen for events such as tag
+ * or layout changes, as well as send commands to control the window manager via other programs.
+ *
+ * You need to uncomment the corresponding lines in config.mk to use the -lyajl library
+ * when including this patch.
+ * This patch depends on the following additional library:
+ * - yajl
+ *
+ * https://github.com/mihirlad55/dwm-ipc
+ * https://dwm.suckless.org/patches/ipc/
+ */
+#define IPC_PATCH 0
+
+/* Adds rule option for clients to avoid accidental termination by killclient for sticky windows.
+ * https://dwm.suckless.org/patches/ispermanent/
+ */
+#define ISPERMANENT_PATCH 0
+
+/* This patch adds key modes (like in vim or emacs) where chains of keyboard shortcuts
+ * can be performed.
+ * https://dwm.suckless.org/patches/keymodes/
+ */
+#define KEYMODES_PATCH 0
+
+/* This patch adds a keybinding to kills all visible clients that are not selected.
+ * https://dwm.suckless.org/patches/killunsel/
+ */
+#define KILLUNSEL_PATCH 0
+
+/* This changes the window manager name to LG3d instead of dwm as a workaround for Java
+ * applications that assume that the window manager is using window reparenting.
+ * Refer to the ISSUES secton of the dwm man page for more details.
+ */
+#define LG3D_PATCH 0
+
+/* By default in dwm it is possible to make an application fullscreen, then use
+ * the focusstack keybindings to focus on other windows beneath the current window.
+ * It is also possible to spawn new windows (e.g. a terminal) that end up getting
+ * focus while the previous window remains in fullscreen. This patch ensures that
+ * in such scenarios the previous window loses fullscreen.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-losefullscreen-6.2.diff
+ */
+#define LOSEFULLSCREEN_PATCH 1
+
+/* This patch adds helper functions for maximizing, horizontally and vertically, floating
+ * windows using keybindings.
+ * https://dwm.suckless.org/patches/maximize/
+ */
+#define MAXIMIZE_PATCH 0
+
+/* Control Music Player Daemon via keybinds.
+ * You need to uncomment the corresponding line in config.mk to use the -lmpdclient library
+ * when including this patch.
+ * This patch depends on the following additional library:
+ * - libmpdclient
+ * https://dwm.suckless.org/patches/mpdcontrol/
+ */
+#define MPDCONTROL_PATCH 0
+
+/* Adds rules per monitor, e.g. have default layouts per monitor.
+ * The use case for this is if the second monitor is vertical (i.e. rotated) then
+ * you may want to use a different default layout for this monitor than what is
+ * used for the main monitor. E.g. normal vertical split for main monitor and
+ * horizontal split for the second.
+ */
+#define MONITOR_RULES_PATCH 0
+
+/* Always display the the monocle-symbol as defined in config.h if the monocle-layout
+ * is activated. Do not display the number of open clients in the current tag.
+ * https://dwm.suckless.org/patches/monoclesymbol/
+ */
+#define MONOCLESYMBOL_PATCH 0
+
+/* Makes a window floating and 1/3rd the height and 1/3rd the width of the screen and is
+ * positioned in either the center or one of the 8 cardinal directions depending on which
+ * key is pressed.
+ * https://dwm.suckless.org/patches/moveplace/
+ */
+#define MOVEPLACE_PATCH 0
+
+/* This patch allows you to move and resize dwm's clients using keyboard bindings.
+ * https://dwm.suckless.org/patches/moveresize/
+ */
+#define MOVERESIZE_PATCH 0
+
+/* This patch allows you to move clients around in the stack and swap them with the master.
+ * https://dwm.suckless.org/patches/movestack/
+ */
+#define MOVESTACK_PATCH 0
+
+/* This patch allows you to change the names of tags during runtime.
+ *
+ * This is a bespoke version implemented specifically in relation to tagicons, which is integrated
+ * into dwm-flexipatch. By default it uses dmenu to retrieve the new name, but this can be
+ * customised via config along with the maximum text length and the format string.
+ *
+ * Special behaviour:
+ * - if more than one tag is selected then the name change applies to all selected tags
+ * - if tagicons is configured to have unique tags per monitor then the change only applies
+ * for the current monitor
+ * - the name change applies to the tag set that is active for the current tag:
+ * * if used in combination with BAR_ALTTAGSDECORATION_PATCH and there are clients on the
+ * given tag then the name change only applies to the ALT_TAGS_DECORATION tag set
+ * * if used in combination with the BAR_ALTERNATIVE_TAGS_PATCH and alternative tags are
+ * shown then the name change only applies to the ALTERNATIVE_TAGS tag set
+ * * if used in combination with both then BAR_ALTTAGSDECORATION_PATCH takes precedence
+ * * otherwise the name change applies to the DEFAULT_TAGS tag set
+ *
+ * https://dwm.suckless.org/patches/nametag/
+ */
+#define NAMETAG_PATCH 0
+
+/* Variant of the above which prepends the tag number to the given string.
+ * The toggle does nothing on its own and need to be enabled in combination with the above. */
+#define NAMETAG_PREPEND_PATCH 0
+
+/* Adds support for the _NET_CLIENT_LIST_STACKING atom, needed by certain applications like the
+ * Zoom video conferencing application.
+ * https://github.com/bakkeby/patches/wiki/netclientliststacking/
+ */
+#define NET_CLIENT_LIST_STACKING_PATCH 1
+
+/* Removes the border when there is only one window visible.
+ * https://dwm.suckless.org/patches/noborder/
+ */
+#define NOBORDER_PATCH 0
+
+/* Enable modifying or removing dmenu in config.def.h which resulted previously in a
+ * compilation error because two lines of code hardcode dmenu into dwm.
+ * https://dwm.suckless.org/patches/nodmenu/
+ */
+#define NODMENU_PATCH 0
+
+/* This patch allows for toggleable client button bindings that have no modifiers.
+ * This can, for example, allow you to move or resize using the mouse alone without holding
+ * down a modifier key. This can be practical if you have extra buttons on your mouse.
+ * While you can use button bindings with no modifiers without this patch in a bare dwm,
+ * those buttons are then unavailable for use within the application itself so being able to
+ * toggle these on and off can be necessary in certain situations (e.g. being able to use
+ * back and forward buttons in a browser).
+
+ * Example bindings:
+ * { ClkClientWin, 0, Button8, movemouse, {0} },
+ * { ClkClientWin, 0, Button9, resizemouse, {0} },
+ */
+#define NO_MOD_BUTTONS_PATCH 0
+
+/* When terminals have transparency then their borders also become transparent.
+ * This patch ensures that borders have no transparency. Note that this patch is
+ * only relevant if you are not using the alpha patch.
+ * https://github.com/szatanjl/dwm/commit/1529909466206016f2101457bbf37c67195714c8
+ * https://dwm.suckless.org/patches/alpha/dwm-fixborders-6.2.diff
+ */
+#define NO_TRANSPARENT_BORDERS_PATCH 0
+
+/* Port of InstantWM's on_empty_keys functionality allowing keybindings that apply only when
+ * a tag is empty. An example use case is being able to launch applications with first hand
+ * keys like "f" to launch firefox.
+ *
+ * https://github.com/instantOS/instantWM/
+ * https://github.com/bakkeby/dwm-flexipatch/issues/51
+ */
+#define ON_EMPTY_KEYS_PATCH 0
+
+/* Minor patch that prevents more than one rule being matched for a given client. */
+#define ONLY_ONE_RULE_MATCH_PATCH 0
+
+/* This patch makes it so dwm will only exit via quit() if no windows are open.
+ * This is to prevent you accidentally losing all your work.
+ * https://dwm.suckless.org/patches/onlyquitonempty/
+ */
+#define ONLYQUITONEMPTY_PATCH 0
+
+/* The pertag patch adds nmaster, mfacts and layouts per tag rather than per
+ * monitor (default).
+ * https://dwm.suckless.org/patches/pertag/
+ */
+#define PERTAG_PATCH 1
+
+/* Option to enable gaps on a per tag basis rather than globally.
+ * Depends on both pertag and vanitygaps patches being enabled.
+ */
+#define PERTAG_VANITYGAPS_PATCH 0
+
+/* This controls whether or not to also store bar position on a per
+ * tag basis, or leave it as one bar per monitor.
+ */
+#define PERTAGBAR_PATCH 0
+
+/* This patch lets you change the position of a client in the stack using the mouse.
+ * https://github.com/bakkeby/patches/wiki/placemouse
+ */
+#define PLACEMOUSE_PATCH 0
+
+/* This patch provides a way to move clients up and down inside the client list.
+ * https://dwm.suckless.org/patches/push/
+ */
+#define PUSH_PATCH 0
+
+/* This patch provides a way to move clients up and down inside the client list,
+ * but does not push up or down into the master area (except that it does not take
+ * nmaster into account).
+ * This takes precedence over the push patch above.
+ * https://dwm.suckless.org/patches/push/
+ */
+#define PUSH_NO_MASTER_PATCH 0
+
+/* Variant of the named scratchpads patch allowing scratch keys to be added or removed
+ * on demand, allowing multiple scratchpad windows to be toggled into and out of view
+ * in unison, as well as including multi-monitor support.
+ *
+ * https://github.com/bakkeby/patches/wiki/renamedscratchpads
+ */
+#define RENAMED_SCRATCHPADS_PATCH 1
+
+/* Renamed scratchpads option to auto-hide scratchpads when moving to a different tag.
+ * This behaviour is similar to that of the (multiple) scratchpads patch. */
+#define RENAMED_SCRATCHPADS_AUTO_HIDE_PATCH 1
+
+/* Shifts all clients per tag to leftmost unoccupied tags.
+ *
+ * For example, if clients A, B, C are tagged on tags 1, 5, 9 respectively, when
+ * this function is called, they will now be on 1, 2, and 3. The focused client
+ * will also remain focused.
+ *
+ * Clients on multiple tags will be treated as if they only were only on their
+ * leftmost tag, and will be reduced to one tag after the operation is complete.
+ * https://dwm.suckless.org/patches/reorganizetags/
+ */
+#define REORGANIZETAGS_PATCH 0
+
+/* By default, windows only resize from the bottom right corner. With this
+ * patch the mouse is warped to the nearest corner and you resize from there.
+ * https://dwm.suckless.org/patches/resizecorners/
+ */
+#define RESIZECORNERS_PATCH 0
+
+/* Practically the same as resizecorners, but the cursor does not warp to corners.
+ * This takes precedence over the resizecorners patch.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-resizepoint-6.2.diff
+ */
+#define RESIZEPOINT_PATCH 1
+
+/* Adds a keyboard shortcut to restart dwm or alternatively by using kill -HUP dwmpid.
+ * Additionally dwm can quit cleanly by using kill -TERM dwmpid.
+ * https://dwm.suckless.org/patches/restartsig/
+ */
+#define RESTARTSIG_PATCH 1
+
+/* Adds rio-like drawing to resize the selected client.
+ * This depends on an external tool slop being installed.
+ * This patch was backported from instantWM.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-riodraw-6.2.diff
+ */
+#define RIODRAW_PATCH 0
+
+/* This patch let's you rotate through the stack using keyboard shortcuts.
+ * https://dwm.suckless.org/patches/rotatestack/
+ */
+#define ROTATESTACK_PATCH 0
+
+/* This patch adds rounded corners to client windows in dwm.
+ * You need to uncomment the corresponding line in config.mk to use the -lXext library
+ * when including this patch. You will also want to set "borderpx = 0;" in your config.h.
+ * https://github.com/mitchweaver/suckless/blob/master/dwm/patches/mitch-06-rounded_corners-f04cac6d6e39cd9e3fc4fae526e3d1e8df5e34b2.patch
+ */
+#define ROUNDED_CORNERS_PATCH 0
+
+/* This patch saves size and position of every floating window before it is forced
+ * into tiled mode. If the window is made floating again then the old dimensions
+ * will be restored.
+ * https://dwm.suckless.org/patches/save_floats/
+ */
+#define SAVEFLOATS_PATCH 1
+
+/* The scratchpad patch allows you to spawn or restore floating terminal windows.
+ * It is typically useful when one need to do some short typing.
+ *
+ * Note that this patch changes TAGMASK to make room for special scratchpad tags,
+ * so ~0 does more than select all tags with this patch. Code that relies on ~0 to
+ * represent all tags should use ~SPTAGMASK instead.
+ *
+ * Upgraded to Christian Tenllado's multiple scratchpad version.
+ * https://lists.suckless.org/hackers/2004/17205.html
+ * https://dwm.suckless.org/patches/scratchpads/
+ */
+#define SCRATCHPADS_PATCH 0
+
+/* Minor alteration of the above allowing clients to keep their size and position when shown */
+#define SCRATCHPADS_KEEP_POSITION_AND_SIZE_PATCH 0
+
+/* This alternative patch enables a scratchpad feature in dwm similar to the scratchpad
+ * feature in i3wm.
+ * https://github.com/GasparVardanyan/dwm-scratchpad
+ */
+#define SCRATCHPAD_ALT_1_PATCH 0
+
+/* This patch persists some settings across window manager restarts. These include but are not
+ * limited to:
+ * - client's assigned tag(s) on which monitor
+ * - the order of clients
+ * - nmaster
+ * - selected layout
+ * - plus various additions depending on what other patches are used
+ *
+ * The above is not persisted across reboots, however.
+ */
+#define SEAMLESS_RESTART_PATCH 1
+
+/* As opposed to the original patch this only adds a rule option allowing fake fullscreen
+ * to be enabled for applications when they start. This is intended to be used in combination
+ * with the fakefullscreenclient patch and offers no practical functionality without it.
+ * https://dwm.suckless.org/patches/selectivefakefullscreen/
+ */
+#define SELECTIVEFAKEFULLSCREEN_PATCH 0
+
+/* Allows restarting dwm without the dependency of an external script.
+ * https://dwm.suckless.org/patches/selfrestart/
+ */
+#define SELFRESTART_PATCH 0
+
+/* Floating windows being sent to another monitor will be centered.
+ * https://dwm.suckless.org/patches/sendmoncenter/
+ */
+#define SENDMON_CENTER_PATCH 0
+
+/* This patch allow clients to keep focus when being sent to another monitor.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-sendmon_keepfocus-6.2.diff
+ */
+#define SENDMON_KEEPFOCUS_PATCH 1
+
+/* This patch allows border pixels to be changed during runtime.
+ * https://dwm.suckless.org/patches/setborderpx/
+ */
+#define SETBORDERPX_PATCH 0
+
+/* Combines shifttag and shiftview. Basically moves the window to the next/prev tag and follows it.
+ * Also see the focusadjacenttag patch.
+ * https://dwm.suckless.org/patches/shift-tools/
+ */
+#define SHIFTBOTH_PATCH 0
+
+/* Swaps all the clients on the current tag with all the client on the next/prev tag.
+ * Depends on the swaptags patch.
+ * https://dwm.suckless.org/patches/shift-tools/
+ */
+#define SHIFTSWAPTAGS_PATCH 0
+
+/* Moves the current selected client to the adjacent tag.
+ * Also see the focusadjacenttag patch.
+ * https://dwm.suckless.org/patches/shift-tools/
+ */
+#define SHIFTTAG_PATCH 0
+
+/* Moves the current selected client to the adjacent tag that has at least one client, if none
+ * then it acts as shifttag.
+ * https://dwm.suckless.org/patches/shift-tools/
+ */
+#define SHIFTTAGCLIENTS_PATCH 0
+
+/* This patch adds keybindings for left and right circular shift through tags.
+ * https://github.com/chau-bao-long/dotfiles/blob/master/suckless/dwm/shiftview.diff
+ */
+#define SHIFTVIEW_PATCH 0
+
+/* This variant of the shiftview patch adds left and right circular shift through tags,
+ * but skips tags where there are no clients.
+ */
+#define SHIFTVIEW_CLIENTS_PATCH 0
+
+/* This patch makes dwm obey even "soft" sizehints for new clients. Any window
+ * that requests a specific initial size will be floated and set to that size.
+ * Unlike with "fixed size" windows, you are able to resize and/or unfloat these
+ * windows freely - only the initial state is affected.
+ * This version of the patch is honestly of limited utility since there are many
+ * clients that will abuse it.
+ * https://dwm.suckless.org/patches/sizehints/
+ */
+#define SIZEHINTS_PATCH 0
+
+/* This patch makes dwm obey even "soft" sizehints for new clients. This ruled
+ * version is essentially the same patch except it obeys the "isfloating" rule
+ * if it is available in config.h for the given client.
+ * https://dwm.suckless.org/patches/sizehints/
+ */
+#define SIZEHINTS_RULED_PATCH 0
+
+/* This patch makes dwm obey even "soft" sizehints for new clients. The isfreesize
+ * version is similar to the sizehints ruled patch except it allows you to specify
+ * via client rules which clients this should apply to. Soft sizehints applies by
+ * default to clients that are not ruled, and will be disabled by default for clients
+ * that are.
+ *
+ * Example client rule enabling soft sizehints:
+ * - RULE(.wintype = WTYPE "DIALOG", .isfloating = 1, .isfreesize = 1)
+ *
+ * https://dwm.suckless.org/patches/sizehints/
+ */
+#define SIZEHINTS_ISFREESIZE_PATCH 1
+
+/* In a multi-head setup monitor 0 is by default the primary screen, with the left and right
+ * screen being monitor 1 and 2 respectively. This patch sorts screens left to right (or
+ * top to bottom in a vertical layout) which aims to address some inconsistencies when it
+ * comes to focusmon, tagmon and similar functionality.
+ * https://www.mail-archive.com/hackers@suckless.org/msg09400.html
+ */
+#define SORTSCREENS_PATCH 0
+
+/* Spawns programs from currently focused client's working directory.
+ * https://dwm.suckless.org/patches/spawn_cwd/
+ */
+#define SPAWNCMD_PATCH 0
+
+/* This patch provides comprehensive utilities for managing the client stack, providing
+ * keyboard shortcuts for focusing or placing a client at specific positions in the stack.
+ * Note that the default keybindings for this patch have been changed in dwm-flexipatch
+ * due to the many conflicts with other patches. As it provides similar functionality to the
+ * swapfocus patch it also uses the MOD+s shortcut to focus the previously selected client,
+ * thus note a conflict between these two patches.
+ * https://dwm.suckless.org/patches/stacker/
+ */
+#define STACKER_PATCH 1
+
+/* Steam, and steam windows (games), trigger a ConfigureNotify request every time the window
+ * gets focus. More so, the configure event passed along from Steam tends to have the wrong
+ * x and y co-ordinates which can make the window, if floating, jump around the screen.
+ *
+ * This patch works around this age-old issue by ignoring the x and y co-ordinates for
+ * ConfigureNotify requests relating to Steam windows.
+ *
+ * https://github.com/bakkeby/patches/wiki/steam
+ */
+#define STEAM_PATCH 0
+
+/* Adds toggleable keyboard shortcut to make a client 'sticky', i.e. visible on all tags.
+ * https://dwm.suckless.org/patches/sticky/
+ */
+#define STICKY_PATCH 0
+
+/* This patch adds "window swallowing" to dwm as known from Plan 9's windowing system rio.
+ * Clients marked with isterminal in config.h swallow a window opened by any child process,
+ * e.g. running xclock in a terminal. Closing the xclock window restores the terminal window
+ * in the current position.
+ *
+ * This patch depends on the following additional libraries:
+ * - libxcb
+ * - Xlib-libxcb
+ * - xcb-res
+ *
+ * You need to uncomment the corresponding line in config.mk to use the above libraries when
+ * including this patch.
+ *
+ * https://dwm.suckless.org/patches/swallow/
+ */
+#define SWALLOW_PATCH 1
+
+/* This patch depends on the pertag patch and makes it possible to switch focus with a single
+ * shortcut (MOD+s) instead of having to think if you should use mod-j or mod-k for reaching
+ * the previously used window.
+ * https://dwm.suckless.org/patches/swapfocus/
+ */
+#define SWAPFOCUS_PATCH 0
+
+/* This patch allows swapping the contents of the currently selected tag with another tag using
+ * keyboard shortcuts.
+ * https://dwm.suckless.org/patches/swaptags/
+ */
+#define SWAPTAGS_PATCH 0
+
+/* Switch focus between the master and stack columns using a single keybinding.
+ * https://dwm.suckless.org/patches/switchcol/
+ */
+#define SWITCHCOL_PATCH 0
+
+/* By default dwm allow you to set application specific rules so that you can have your browser,
+ * for example, start up on tag 9 optionally on a given monitor when you open your browser it is
+ * then automatically moved to the configured tag, but you have to manually enable the tag to see
+ * the newly opened application.
+ * This patch adds an extra configuration option for individual rules where:
+ * 0 is default behaviour
+ * 1 automatically moves you to the tag of the newly opened application and
+ * 2 enables the tag of the newly opened application in addition to your existing enabled tags
+ * 3 as 1, but closing that window reverts the view back to what it was previously (*)
+ * 4 as 2, but closing that window reverts the view back to what it was previously (*)
+ *
+ * (*) except if the client has been moved between tags or to another monitor
+ *
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-switchtag-6.2.diff
+ * Also see https://dwm.suckless.org/patches/switchtotag
+ */
+#define SWITCHTAG_PATCH 0
+
+/* This patch transforms the monocle layout into a "tabbed" layout if more than one window is
+ * present on the monocle view. This patch has been added for demonstration purposes only and has
+ * limited compatibility with other patches. It will conflict space-wise with a second bar.
+ * Note that fancybar, awesomebar, bartabgroups and similar patches make the tab patch redundant.
+ * https://dwm.suckless.org/patches/tab/
+ */
+#define TAB_PATCH 0
+
+/* Adds keyboard shortcuts to move all (or only floating) windows from one tag to another.
+ * https://dwm.suckless.org/patches/tagall/
+ */
+#define TAGALL_PATCH 0
+
+/* This patch allows you to move all visible windows on a monitor to an adjacent monitor.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-tagallmon-6.2.diff
+ */
+#define TAGALLMON_PATCH 0
+
+/* This patch makes new clients attach into the stack area when you toggle a new tag into
+ * view. This means your master area will remain unchanged when toggling views.
+ * The allmaster patch will cause all clients in the master area to be left alone. This patch
+ * takes precedence over the onemaster tagintostack patch.
+ * https://dwm.suckless.org/patches/tagintostack/
+ */
+#define TAGINTOSTACK_ALLMASTER_PATCH 0
+
+/* This patch makes new clients attach into the stack area when you toggle a new tag into
+ * view. This means your master area will remain unchanged when toggling views.
+ * The onemaster patch will cause the first client in the master area to be left alone.
+ * https://dwm.suckless.org/patches/tagintostack/
+ */
+#define TAGINTOSTACK_ONEMASTER_PATCH 0
+
+/* If you try to send a fullscreen window to an adjacent monitor using tagmon then
+ * the window is moved behind the scenes, but it remains in fullscreen on the original
+ * monitor until you exit fullscreen view (at which point it will appear on the adjacent
+ * monitor). This patch allows a fullscreen window to be moved to an adjacent monitor
+ * while remaining in fullscreen.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-tagmonfixfs-6.2.diff
+ */
+#define TAGMONFIXFS_PATCH 1
+
+/* Add functions and keybindings to tag a window to a desired tag on the next (right)
+ * or previous (left) monitor from the currently selected monitor.
+ * https://dwm.suckless.org/patches/tagothermonitor/
+ */
+#define TAGOTHERMONITOR_PATCH 0
+
+/* This patch allows you to swap all visible windows on one monitor with those of an
+ * adjacent monitor.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-tagswapmon-6.2.diff
+ */
+#define TAGSWAPMON_PATCH 0
+
+/* Sync tag actions across all monitors.
+ * This is comparable to a sort of pseudo-desktop environment.
+ * Also refer to the desktop patch:
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-desktop-6.3.diff
+ */
+#define TAGSYNC_PATCH 0
+
+/* This patch can be useful to the touchpad users because it allows to
+ * resize windows using Mod + two-finger scroll. It is useful when
+ * two-finger scrolling is configured in libinput.
+ * https://dwm.suckless.org/patches/tapresize/
+ */
+#define TAPRESIZE_PATCH 0
+
+/* This patch allows you to toggle fullscreen on and off using a single shortcut key.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-togglefullscreen-6.2.diff
+ */
+#define TOGGLEFULLSCREEN_PATCH 1
+
+/* This patch allows for the bar position (top or bottom) to be toggled during runtime.
+ * https://dwm.suckless.org/patches/toggletopbar/
+ */
+#define TOGGLETOPBAR_PATCH 0
+
+/* Minor patch that lets you use the same keyboard shortcut to toggle to the previous layout if the
+ * designated layout is already active.
+ *
+ * This allows you to use e.g. MOD+m to change to the monocle layout and use the same keybinding to
+ * toggle back to what it was previously. The default behaviour in dwm forces you to use either
+ * MOD+space or MOD+t to change back to tiled layout.
+ *
+ * https://github.com/bakkeby/patches/wiki/togglelayout
+ */
+
+#define TOGGLELAYOUT_PATCH 1
+
+/* Minor patch that lets you use the same keyboard shortcut to toggle to the previous tag if the
+ * designated tag is already active.
+ *
+ * This allows you to use e.g. MOD+4 to quickly view the 4th tag and use the same keybinding to
+ * toggle back to what it was previously. The default behaviour in dwm forces you to use either
+ * MOD+tab or MOD+1 to change back to the previous tag.
+ *
+ * Idea ref.
+ * https://www.reddit.com/r/suckless/comments/ik27vd/key_toggle_between_next_and_previous_tag_dwm/
+ * https://github.com/bakkeby/patches/wiki/toggletag
+ */
+#define TOGGLETAG_PATCH 1
+
+/* Lets you transfer the currently focused client between the master and stack area
+ * while increasing or decreasing the master area (nmaster) accordingly.
+ * https://dwm.suckless.org/patches/transfer/
+ */
+#define TRANSFER_PATCH 0
+
+/* Lets you transfer all clients between the master and stack area
+ * while increasing or decreasing the master area (nmaster) accordingly.
+ * https://dwm.suckless.org/patches/transfer/
+ */
+#define TRANSFER_ALL_PATCH 0
+
+/* This patch resets isfloating on any visible windows that have it set.
+ * Optionally also applies a layout.
+ * https://dwm.suckless.org/patches/unfloatvisible/
+ */
+#define UNFLOATVISIBLE_PATCH 0
+
+/* This patch adds a client rule that allows for windows that do not specify the override-redirect
+ * to not be managed by the window manager. This can be useful for external bars, widgets,
+ * launchers, docks, desktop icons and more.
+ * https://github.com/bakkeby/patches/wiki/unmanaged
+ */
+#define UNMANAGED_PATCH 0
+
+/* This patch adds configurable gaps between windows differentiating between outer, inner,
+ * horizontal and vertical gaps.
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-vanitygaps-6.2.diff
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-cfacts-vanitygaps-6.2.diff
+ */
+#define VANITYGAPS_PATCH 0
+
+/* This patch adds outer gaps for the monocle layout.
+ * Most gaps patches tries to avoid gaps on the monocle layout, as it is often used as a
+ * fullscreen mode, hence this is enabled separately from the main vanitygaps patch.
+ */
+#define VANITYGAPS_MONOCLE_PATCH 0
+
+/* By default MOD+Tab will take the user back to the previous tag only. If the user keeps
+ * using MOD+Tab then the view will switch back and forth between the current and previous tag.
+ * This patch allows dwm to keep a longer history of previous tag changes such that MOD+Tab can
+ * be pressed multiple times to go further back to earlier tag selections.
+ *
+ * The number of history elements is defined by the NUMVIEWHIST macro in dwm.c and defaults to
+ * the number of tags in the system.
+ */
+#define VIEW_HISTORY_PATCH 0
+
+/* Follow a window to the tag it is being moved to.
+ * https://dwm.suckless.org/patches/viewontag/
+ */
+#define VIEWONTAG_PATCH 0
+
+/* This patch warps the mouse cursor to the center of the currently focused window or screen
+ * when the mouse cursor is (a) on a different screen or (b) on top of a different window.
+ * https://dwm.suckless.org/patches/warp/
+ */
+#define WARP_PATCH 1
+
+/* Sometimes a single application opens different windows depending on the task
+ * at hand and this is often reflected in the WM_WINDOW_ROLE(STRING) x property.
+ * This patch adds the role field to the rule configuration so that one can
+ * differentiate between, say, Firefox "browser" vs "Preferences" vs "Manager"
+ * or Google-chrome "browser" vs "pop-up".
+ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-windowrolerule-6.2.diff
+ */
+#define WINDOWROLERULE_PATCH 1
+
+/* The winview patch allows switching the view to that of a given client from the all-window
+ * view (Mod-0) using a keyboard shortcut.
+ * http://dwm.suckless.org/patches/winview/
+ */
+#define WINVIEW_PATCH 1
+
+/* Remember keyboard layout per client.
+ * It is recommended that you configure xkb before using this patch as described in
+ * https://www.x.org/archive/X11R7.5/doc/input/XKB-Config.html
+ * https://dwm.suckless.org/patches/xkb/
+ */
+#define XKB_PATCH 0
+
+/* Allows dwm to read colors from xrdb (.Xresources) during runtime. Compatible with
+ * the float border color, awesomebar, urgentborder and titlecolor patches.
+ * https://dwm.suckless.org/patches/xrdb/
+ */
+#define XRDB_PATCH 1
+
+/* Simple patch that allows floating windows to be zoomed into the master stack position.
+ * https://www.reddit.com/r/suckless/comments/ie5fe3/zoomfloating_my_own_simple_original_patch/
+ */
+#define ZOOMFLOATING_PATCH 0
+
+/* The zoomswap patch allows a master and a stack window to swap places
+ * rather than every window on the screen changing position.
+ * https://dwm.suckless.org/patches/zoomswap/
+ */
+#define ZOOMSWAP_PATCH 0
+
+/**
+ * Layouts
+ */
+
+/* Bottomstack layout.
+ * https://dwm.suckless.org/patches/bottomstack/
+ */
+#define BSTACK_LAYOUT 0
+
+/* Bottomstack horizontal layout.
+ * https://dwm.suckless.org/patches/bottomstack/
+ */
+#define BSTACKHORIZ_LAYOUT 0
+
+/* Centered master layout.
+ * https://dwm.suckless.org/patches/centeredmaster/
+ */
+#define CENTEREDMASTER_LAYOUT 0
+
+/* Centered floating master layout.
+ * https://dwm.suckless.org/patches/centeredmaster/
+ */
+#define CENTEREDFLOATINGMASTER_LAYOUT 0
+
+/* Same as the default tile layout except clients in the master area are arranged in
+ * columns (i.e. left to right).
+ * https://dwm.suckless.org/patches/columns/
+ */
+#define COLUMNS_LAYOUT 0
+
+/* Deck layout.
+ * https://dwm.suckless.org/patches/deck/
+ */
+#define DECK_LAYOUT 0
+
+/* Fibonacci dwindle layout.
+ * https://dwm.suckless.org/patches/fibonacci/
+ */
+#define FIBONACCI_DWINDLE_LAYOUT 0
+
+/* Fibonacci spiral layout.
+ * https://dwm.suckless.org/patches/fibonacci/
+ */
+#define FIBONACCI_SPIRAL_LAYOUT 0
+
+/* Flextile deluxe layout.
+ * A revamped, more flexible, and over-the-top version of the original flextile layout.
+ * https://dwm.suckless.org/patches/flextile/ (original)
+ */
+#define FLEXTILE_DELUXE_LAYOUT 1
+
+/* Gappless grid layout.
+ * https://dwm.suckless.org/patches/gaplessgrid/
+ */
+#define GAPPLESSGRID_LAYOUT 0
+
+/* Gridmode (grid) layout.
+ * https://dwm.suckless.org/patches/gridmode/
+ */
+#define GRIDMODE_LAYOUT 0
+
+/* Horizontal grid (horizgrid) layout.
+ * https://dwm.suckless.org/patches/horizgrid/
+ */
+#define HORIZGRID_LAYOUT 0
+
+/* Grid layout where nmaster controls the number of rows.
+ * https://dwm.suckless.org/patches/nrowgrid/
+ */
+#define NROWGRID_LAYOUT 0
+
+/* The default tile layout.
+ * This can be optionally disabled in favour of other layouts.
+ */
+#define TILE_LAYOUT 0
+
+/* Monocle layout (default).
+ * This can be optionally disabled in favour of other layouts.
+ */
+#define MONOCLE_LAYOUT 1
diff --git a/patches/dwm-actualfullscreen-20211013-cb3f58a.diff b/patches/dwm-actualfullscreen-20211013-cb3f58a.diff
deleted file mode 100644
index d3be230..0000000
--- a/patches/dwm-actualfullscreen-20211013-cb3f58a.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-From eea13010ffc3983392857ee1e3804e3aa1064d7a Mon Sep 17 00:00:00 2001
-From: Soenke Lambert <s.lambert@mittwald.de>
-Date: Wed, 13 Oct 2021 18:21:09 +0200
-Subject: [PATCH] Fullscreen current window with [Alt]+[Shift]+[f]
-
-This actually fullscreens a window, instead of just hiding the statusbar
-and applying the monocle layout.
----
- config.def.h | 1 +
- dwm.1 | 3 +++
- dwm.c | 8 ++++++++
- 3 files changed, 12 insertions(+)
-
-diff --git a/config.def.h b/config.def.h
-index 1c0b587..8cd3204 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -78,6 +78,7 @@ static Key keys[] = {
- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
- { MODKEY, XK_space, setlayout, {0} },
- { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
-+ { MODKEY|ShiftMask, XK_f, togglefullscr, {0} },
- { MODKEY, XK_0, view, {.ui = ~0 } },
- { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
- { MODKEY, XK_comma, focusmon, {.i = -1 } },
-diff --git a/dwm.1 b/dwm.1
-index 13b3729..a368d05 100644
---- a/dwm.1
-+++ b/dwm.1
-@@ -116,6 +116,9 @@ Zooms/cycles focused window to/from master area (tiled layouts only).
- .B Mod1\-Shift\-c
- Close focused window.
- .TP
-+.B Mod1\-Shift\-f
-+Toggle fullscreen for focused window.
-+.TP
- .B Mod1\-Shift\-space
- Toggle focused window between tiled and floating state.
- .TP
-diff --git a/dwm.c b/dwm.c
-index 4465af1..c1b899a 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -211,6 +211,7 @@ static void tagmon(const Arg *arg);
- static void tile(Monitor *);
- static void togglebar(const Arg *arg);
- static void togglefloating(const Arg *arg);
-+static void togglefullscr(const Arg *arg);
- static void toggletag(const Arg *arg);
- static void toggleview(const Arg *arg);
- static void unfocus(Client *c, int setfocus);
-@@ -1719,6 +1720,13 @@ togglefloating(const Arg *arg)
- arrange(selmon);
- }
-
-+void
-+togglefullscr(const Arg *arg)
-+{
-+ if(selmon->sel)
-+ setfullscreen(selmon->sel, !selmon->sel->isfullscreen);
-+}
-+
- void
- toggletag(const Arg *arg)
- {
---
-2.30.2
-
diff --git a/patches/dwm-attachtop-6.2.diff b/patches/dwm-attachtop-6.2.diff
deleted file mode 100644
index a3b959c..0000000
--- a/patches/dwm-attachtop-6.2.diff
+++ /dev/null
@@ -1,88 +0,0 @@
-From 17acbdcb56d0d2f39507a3f67ef329c14a213ef6 Mon Sep 17 00:00:00 2001
-From: MLquest8 <miskuzius@gmail.com>
-Date: Thu, 18 Jun 2020 15:34:18 +0400
-Subject: [PATCH] attachtop. Attaches new client below the last master/on top
- of the stack. In case of nmaster = 1 behaves like attachaside.
-
----
- dwm.c | 29 +++++++++++++++++++++++++----
- 1 file changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/dwm.c b/dwm.c
-index 9fd0286..7ced982 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -49,7 +49,8 @@
- #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
- #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
- * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
--#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
-+#define ISVISIBLEONTAG(C, T) ((C->tags & T))
-+#define ISVISIBLE(C) ISVISIBLEONTAG(C, C->mon->tagset[C->mon->seltags])
- #define LENGTH(X) (sizeof X / sizeof X[0])
- #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
- #define WIDTH(X) ((X)->w + 2 * (X)->bw)
-@@ -147,6 +148,7 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac
- static void arrange(Monitor *m);
- static void arrangemon(Monitor *m);
- static void attach(Client *c);
-+static void attachtop(Client *c);
- static void attachstack(Client *c);
- static void buttonpress(XEvent *e);
- static void checkotherwm(void);
-@@ -407,6 +409,25 @@ attach(Client *c)
- c->mon->clients = c;
- }
-
-+void
-+attachtop(Client *c)
-+{
-+ int n;
-+ Monitor *m = selmon;
-+ Client *below;
-+
-+ for (n = 1, below = c->mon->clients;
-+ below && below->next && (below->isfloating || !ISVISIBLEONTAG(below, c->tags) || n != m->nmaster);
-+ n = below->isfloating || !ISVISIBLEONTAG(below, c->tags) ? n + 0 : n + 1, below = below->next);
-+ c->next = NULL;
-+ if (below) {
-+ c->next = below->next;
-+ below->next = c;
-+ }
-+ else
-+ c->mon->clients = c;
-+}
-+
- void
- attachstack(Client *c)
- {
-@@ -1063,7 +1084,7 @@ manage(Window w, XWindowAttributes *wa)
- c->isfloating = c->oldstate = trans != None || c->isfixed;
- if (c->isfloating)
- XRaiseWindow(dpy, c->win);
-- attach(c);
-+ attachtop(c);
- attachstack(c);
- XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
- (unsigned char *) &(c->win), 1);
-@@ -1418,7 +1439,7 @@ sendmon(Client *c, Monitor *m)
- detachstack(c);
- c->mon = m;
- c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
-- attach(c);
-+ attachtop(c);
- attachstack(c);
- focus(NULL);
- arrange(NULL);
-@@ -1900,7 +1921,7 @@ updategeom(void)
- m->clients = c->next;
- detachstack(c);
- c->mon = mons;
-- attach(c);
-+ attachtop(c);
- attachstack(c);
- }
- if (m == selmon)
---
-2.26.2
-
diff --git a/patches/dwm-bottomstack-6.1.diff b/patches/dwm-bottomstack-6.1.diff
deleted file mode 100644
index 9fdffd5..0000000
--- a/patches/dwm-bottomstack-6.1.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 7054c06..554f1db 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -39,6 +39,8 @@ static const Layout layouts[] = {
- { "[]=", tile }, /* first entry is default */
- { "><>", NULL }, /* no layout function means floating behavior */
- { "[M]", monocle },
-+ { "TTT", bstack },
-+ { "===", bstackhoriz },
- };
-
- /* key definitions */
-@@ -74,6 +76,8 @@ static Key keys[] = {
- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
-+ { MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
-+ { MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
- { MODKEY, XK_space, setlayout, {0} },
- { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
- { MODKEY, XK_0, view, {.ui = ~0 } },
-diff --git a/dwm.c b/dwm.c
-index 0362114..c313b5e 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -233,6 +233,8 @@ static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
- static void zoom(const Arg *arg);
-+static void bstack(Monitor *m);
-+static void bstackhoriz(Monitor *m);
-
- /* variables */
- static const char broken[] = "broken";
-@@ -2139,3 +2141,65 @@ main(int argc, char *argv[])
- XCloseDisplay(dpy);
- return EXIT_SUCCESS;
- }
-+
-+static void
-+bstack(Monitor *m) {
-+ int w, h, mh, mx, tx, ty, tw;
-+ unsigned int i, n;
-+ Client *c;
-+
-+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-+ if (n == 0)
-+ return;
-+ if (n > m->nmaster) {
-+ mh = m->nmaster ? m->mfact * m->wh : 0;
-+ tw = m->ww / (n - m->nmaster);
-+ ty = m->wy + mh;
-+ } else {
-+ mh = m->wh;
-+ tw = m->ww;
-+ ty = m->wy;
-+ }
-+ for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
-+ if (i < m->nmaster) {
-+ w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
-+ resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
-+ mx += WIDTH(c);
-+ } else {
-+ h = m->wh - mh;
-+ resize(c, tx, ty, tw - (2 * c->bw), h - (2 * c->bw), 0);
-+ if (tw != m->ww)
-+ tx += WIDTH(c);
-+ }
-+ }
-+}
-+
-+static void
-+bstackhoriz(Monitor *m) {
-+ int w, mh, mx, tx, ty, th;
-+ unsigned int i, n;
-+ Client *c;
-+
-+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-+ if (n == 0)
-+ return;
-+ if (n > m->nmaster) {
-+ mh = m->nmaster ? m->mfact * m->wh : 0;
-+ th = (m->wh - mh) / (n - m->nmaster);
-+ ty = m->wy + mh;
-+ } else {
-+ th = mh = m->wh;
-+ ty = m->wy;
-+ }
-+ for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
-+ if (i < m->nmaster) {
-+ w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
-+ resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
-+ mx += WIDTH(c);
-+ } else {
-+ resize(c, tx, ty, m->ww - (2 * c->bw), th - (2 * c->bw), 0);
-+ if (th != m->wh)
-+ ty += HEIGHT(c);
-+ }
-+ }
-+}
diff --git a/patches/dwm-centeredmaster-6.1.diff b/patches/dwm-centeredmaster-6.1.diff
deleted file mode 100644
index 6926892..0000000
--- a/patches/dwm-centeredmaster-6.1.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 7054c06..527b214 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -39,6 +39,8 @@ static const Layout layouts[] = {
- { "[]=", tile }, /* first entry is default */
- { "><>", NULL }, /* no layout function means floating behavior */
- { "[M]", monocle },
-+ { "|M|", centeredmaster },
-+ { ">M>", centeredfloatingmaster },
- };
-
- /* key definitions */
-@@ -74,6 +76,8 @@ static Key keys[] = {
- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
-+ { MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
-+ { MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
- { MODKEY, XK_space, setlayout, {0} },
- { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
- { MODKEY, XK_0, view, {.ui = ~0 } },
-diff --git a/dwm.c b/dwm.c
-index 0362114..1e81412 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -233,6 +233,8 @@ static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
- static void zoom(const Arg *arg);
-+static void centeredmaster(Monitor *m);
-+static void centeredfloatingmaster(Monitor *m);
-
- /* variables */
- static const char broken[] = "broken";
-@@ -2139,3 +2141,106 @@ main(int argc, char *argv[])
- XCloseDisplay(dpy);
- return EXIT_SUCCESS;
- }
-+
-+void
-+centeredmaster(Monitor *m)
-+{
-+ unsigned int i, n, h, mw, mx, my, oty, ety, tw;
-+ Client *c;
-+
-+ /* count number of clients in the selected monitor */
-+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-+ if (n == 0)
-+ return;
-+
-+ /* initialize areas */
-+ mw = m->ww;
-+ mx = 0;
-+ my = 0;
-+ tw = mw;
-+
-+ if (n > m->nmaster) {
-+ /* go mfact box in the center if more than nmaster clients */
-+ mw = m->nmaster ? m->ww * m->mfact : 0;
-+ tw = m->ww - mw;
-+
-+ if (n - m->nmaster > 1) {
-+ /* only one client */
-+ mx = (m->ww - mw) / 2;
-+ tw = (m->ww - mw) / 2;
-+ }
-+ }
-+
-+ oty = 0;
-+ ety = 0;
-+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
-+ if (i < m->nmaster) {
-+ /* nmaster clients are stacked vertically, in the center
-+ * of the screen */
-+ h = (m->wh - my) / (MIN(n, m->nmaster) - i);
-+ resize(c, m->wx + mx, m->wy + my, mw - (2*c->bw),
-+ h - (2*c->bw), 0);
-+ my += HEIGHT(c);
-+ } else {
-+ /* stack clients are stacked vertically */
-+ if ((i - m->nmaster) % 2 ) {
-+ h = (m->wh - ety) / ( (1 + n - i) / 2);
-+ resize(c, m->wx, m->wy + ety, tw - (2*c->bw),
-+ h - (2*c->bw), 0);
-+ ety += HEIGHT(c);
-+ } else {
-+ h = (m->wh - oty) / ((1 + n - i) / 2);
-+ resize(c, m->wx + mx + mw, m->wy + oty,
-+ tw - (2*c->bw), h - (2*c->bw), 0);
-+ oty += HEIGHT(c);
-+ }
-+ }
-+}
-+
-+void
-+centeredfloatingmaster(Monitor *m)
-+{
-+ unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx;
-+ Client *c;
-+
-+ /* count number of clients in the selected monitor */
-+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-+ if (n == 0)
-+ return;
-+
-+ /* initialize nmaster area */
-+ if (n > m->nmaster) {
-+ /* go mfact box in the center if more than nmaster clients */
-+ if (m->ww > m->wh) {
-+ mw = m->nmaster ? m->ww * m->mfact : 0;
-+ mh = m->nmaster ? m->wh * 0.9 : 0;
-+ } else {
-+ mh = m->nmaster ? m->wh * m->mfact : 0;
-+ mw = m->nmaster ? m->ww * 0.9 : 0;
-+ }
-+ mx = mxo = (m->ww - mw) / 2;
-+ my = myo = (m->wh - mh) / 2;
-+ } else {
-+ /* go fullscreen if all clients are in the master area */
-+ mh = m->wh;
-+ mw = m->ww;
-+ mx = mxo = 0;
-+ my = myo = 0;
-+ }
-+
-+ for(i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
-+ if (i < m->nmaster) {
-+ /* nmaster clients are stacked horizontally, in the center
-+ * of the screen */
-+ w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i);
-+ resize(c, m->wx + mx, m->wy + my, w - (2*c->bw),
-+ mh - (2*c->bw), 0);
-+ mx += WIDTH(c);
-+ } else {
-+ /* stack clients are stacked horizontally */
-+ w = (m->ww - tx) / (n - i);
-+ resize(c, m->wx + tx, m->wy, w - (2*c->bw),
-+ m->wh - (2*c->bw), 0);
-+ tx += WIDTH(c);
-+ }
-+}
diff --git a/patches/dwm-colorbar-6.3.diff b/patches/dwm-colorbar-6.3.diff
deleted file mode 100644
index 384f6fa..0000000
--- a/patches/dwm-colorbar-6.3.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-From 647a2a56cf7cab6dea868f9800671770940ce3c3 Mon Sep 17 00:00:00 2001
-From: Alessandro Sisto <alessandro.sisto@studioform.net>
-Date: Sun, 5 Jun 2022 12:03:43 +0200
-Subject: [PATCH] colorbar
-
----
- config.def.h | 6 +++++-
- dwm.c | 12 ++++++------
- 2 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index a2ac963..56bc324 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -16,6 +16,11 @@ static const char *colors[][3] = {
- /* fg bg border */
- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
-+ [SchemeStatus] = { col_gray3, col_gray1, "#000000" }, // Statusbar right {text,background,not used but cannot be empty}
-+ [SchemeTagsSel] = { col_gray4, col_cyan, "#000000" }, // Tagbar left selected {text,background,not used but cannot be empty}
-+ [SchemeTagsNorm] = { col_gray3, col_gray1, "#000000" }, // Tagbar left unselected {text,background,not used but cannot be empty}
-+ [SchemeInfoSel] = { col_gray4, col_cyan, "#000000" }, // infobar middle selected {text,background,not used but cannot be empty}
-+ [SchemeInfoNorm] = { col_gray3, col_gray1, "#000000" }, // infobar middle unselected {text,background,not used but cannot be empty}
- };
-
- /* tagging */
-@@ -113,4 +118,3 @@ static Button buttons[] = {
- { ClkTagBar, MODKEY, Button1, tag, {0} },
- { ClkTagBar, MODKEY, Button3, toggletag, {0} },
- };
--
-diff --git a/dwm.c b/dwm.c
-index a96f33c..0eaa4cd 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -59,7 +59,7 @@
-
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
--enum { SchemeNorm, SchemeSel }; /* color schemes */
-+enum { SchemeNorm, SchemeSel, SchemeStatus, SchemeTagsSel, SchemeTagsNorm, SchemeInfoSel, SchemeInfoNorm }; /* color schemes */
- enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
- NetWMFullscreen, NetActiveWindow, NetWMWindowType,
- NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-@@ -707,7 +707,7 @@ drawbar(Monitor *m)
-
- /* draw status first so it can be overdrawn by tags later */
- if (m == selmon) { /* status is only drawn on selected monitor */
-- drw_setscheme(drw, scheme[SchemeNorm]);
-+ drw_setscheme(drw, scheme[SchemeStatus]);
- tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
- drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
- }
-@@ -720,7 +720,7 @@ drawbar(Monitor *m)
- x = 0;
- for (i = 0; i < LENGTH(tags); i++) {
- w = TEXTW(tags[i]);
-- drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
-+ drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]);
- drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
- if (occ & 1 << i)
- drw_rect(drw, x + boxs, boxs, boxw, boxw,
-@@ -729,17 +729,17 @@ drawbar(Monitor *m)
- x += w;
- }
- w = blw = TEXTW(m->ltsymbol);
-- drw_setscheme(drw, scheme[SchemeNorm]);
-+ drw_setscheme(drw, scheme[SchemeTagsNorm]);
- x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
-
- if ((w = m->ww - tw - x) > bh) {
- if (m->sel) {
-- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
-+ drw_setscheme(drw, scheme[m == selmon ? SchemeInfoSel : SchemeInfoNorm]);
- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
- if (m->sel->isfloating)
- drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
- } else {
-- drw_setscheme(drw, scheme[SchemeNorm]);
-+ drw_setscheme(drw, scheme[SchemeInfoNorm]);
- drw_rect(drw, x, 0, w, bh, 1, 1);
- }
- }
---
-2.36.1
-
diff --git a/patches/dwm-floatrules-20210801-138b405.diff b/patches/dwm-floatrules-20210801-138b405.diff
deleted file mode 100644
index 2bf943f..0000000
--- a/patches/dwm-floatrules-20210801-138b405.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index a2ac963..e8c0978 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -26,9 +26,9 @@ static const Rule rules[] = {
- * WM_CLASS(STRING) = instance, class
- * WM_NAME(STRING) = title
- */
-- /* class instance title tags mask isfloating monitor */
-- { "Gimp", NULL, NULL, 0, 1, -1 },
-- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
-+ /* class instance title tags mask isfloating monitor float x,y,w,h floatborderpx*/
-+ { "Gimp", NULL, NULL, 0, 1, -1, 50,50,500,500, 5 },
-+ { "Firefox", NULL, NULL, 1 << 8, 0, -1, 50,50,500,500, 5 },
- };
-
- /* layout(s) */
-diff --git a/dwm.c b/dwm.c
-index 5e4d494..a03ca15 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -93,6 +93,8 @@ struct Client {
- int bw, oldbw;
- unsigned int tags;
- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-+ int floatborderpx;
-+ int hasfloatbw;
- Client *next;
- Client *snext;
- Monitor *mon;
-@@ -139,6 +141,8 @@ typedef struct {
- unsigned int tags;
- int isfloating;
- int monitor;
-+ int floatx, floaty, floatw, floath;
-+ int floatborderpx;
- } Rule;
-
- /* function declarations */
-@@ -300,6 +304,16 @@ applyrules(Client *c)
- {
- c->isfloating = r->isfloating;
- c->tags |= r->tags;
-+ if (r->floatborderpx >= 0) {
-+ c->floatborderpx = r->floatborderpx;
-+ c->hasfloatbw = 1;
-+ }
-+ if (r->isfloating) {
-+ if (r->floatx >= 0) c->x = c->mon->mx + r->floatx;
-+ if (r->floaty >= 0) c->y = c->mon->my + r->floaty;
-+ if (r->floatw >= 0) c->w = r->floatw;
-+ if (r->floath >= 0) c->h = r->floath;
-+ }
- for (m = mons; m && m->num != r->monitor; m = m->next);
- if (m)
- c->mon = m;
-@@ -1282,7 +1296,10 @@ resizeclient(Client *c, int x, int y, int w, int h)
- c->oldy = c->y; c->y = wc.y = y;
- c->oldw = c->w; c->w = wc.width = w;
- c->oldh = c->h; c->h = wc.height = h;
-- wc.border_width = c->bw;
-+ if (c->isfloating && c->hasfloatbw && !c->isfullscreen)
-+ wc.border_width = c->floatborderpx;
-+ else
-+ wc.border_width = c->bw;
- XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
- configure(c);
- XSync(dpy, False);
---
-2.32.0
-
diff --git a/patches/dwm-gaplessgrid-20160731-56a31dc.diff b/patches/dwm-gaplessgrid-20160731-56a31dc.diff
deleted file mode 100644
index 4f3bb13..0000000
--- a/patches/dwm-gaplessgrid-20160731-56a31dc.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-URL: http://dwm.suckless.org/patches/gapless_grid
-Add gapless grid layout.
-
-Index: dwm/gaplessgrid.c
-===================================================================
---- /dev/null
-+++ dwm/gaplessgrid.c
-@@ -0,0 +1,35 @@
-+void
-+gaplessgrid(Monitor *m) {
-+ unsigned int n, cols, rows, cn, rn, i, cx, cy, cw, ch;
-+ Client *c;
-+
-+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) ;
-+ if(n == 0)
-+ return;
-+
-+ /* grid dimensions */
-+ for(cols = 0; cols <= n/2; cols++)
-+ if(cols*cols >= n)
-+ break;
-+ if(n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
-+ cols = 2;
-+ rows = n/cols;
-+
-+ /* window geometries */
-+ cw = cols ? m->ww / cols : m->ww;
-+ cn = 0; /* current column number */
-+ rn = 0; /* current row number */
-+ for(i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
-+ if(i/rows + 1 > cols - n%cols)
-+ rows = n/cols + 1;
-+ ch = rows ? m->wh / rows : m->wh;
-+ cx = m->wx + cn*cw;
-+ cy = m->wy + rn*ch;
-+ resize(c, cx, cy, cw - 2 * c->bw, ch - 2 * c->bw, False);
-+ rn++;
-+ if(rn >= rows) {
-+ rn = 0;
-+ cn++;
-+ }
-+ }
-+}
diff --git a/patches/dwm-hide_vacant_tags-6.3.diff b/patches/dwm-hide_vacant_tags-6.3.diff
deleted file mode 100644
index 0ccc7fc..0000000
--- a/patches/dwm-hide_vacant_tags-6.3.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index a96f33c..f2da729 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -432,9 +432,15 @@ buttonpress(XEvent *e)
- }
- if (ev->window == selmon->barwin) {
- i = x = 0;
-- do
-+ unsigned int occ = 0;
-+ for(c = m->clients; c; c=c->next)
-+ occ |= c->tags;
-+ do {
-+ /* Do not reserve space for vacant tags */
-+ if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-+ continue;
- x += TEXTW(tags[i]);
-- while (ev->x >= x && ++i < LENGTH(tags));
-+ } while (ev->x >= x && ++i < LENGTH(tags));
- if (i < LENGTH(tags)) {
- click = ClkTagBar;
- arg.ui = 1 << i;
-@@ -719,13 +725,12 @@ drawbar(Monitor *m)
- }
- x = 0;
- for (i = 0; i < LENGTH(tags); i++) {
-+ /* Do not draw vacant tags */
-+ if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-+ continue;
- w = TEXTW(tags[i]);
- drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
- drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
-- if (occ & 1 << i)
-- drw_rect(drw, x + boxs, boxs, boxw, boxw,
-- m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-- urg & 1 << i);
- x += w;
- }
- w = blw = TEXTW(m->ltsymbol);
diff --git a/patches/dwm-namedscratchpads-6.2.diff b/patches/dwm-namedscratchpads-6.2.diff
deleted file mode 100644
index d007118..0000000
--- a/patches/dwm-namedscratchpads-6.2.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-diff '--color=auto' -up dwm-6.2/config.def.h dwm-6.2-new/config.def.h
---- dwm-6.2/config.def.h 2019-02-02 12:55:28.000000000 +0000
-+++ dwm-6.2-new/config.def.h 2020-04-26 13:51:06.713332746 +0100
-@@ -26,9 +26,10 @@ static const Rule rules[] = {
- * WM_CLASS(STRING) = instance, class
- * WM_NAME(STRING) = title
- */
-- /* class instance title tags mask isfloating monitor */
-- { "Gimp", NULL, NULL, 0, 1, -1 },
-- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
-+ /* class instance title tags mask isfloating monitor scratch key */
-+ { "Gimp", NULL, NULL, 0, 1, -1, 0 },
-+ { "firefox", NULL, NULL, 1 << 8, 0, -1, 0 },
-+ { NULL, NULL, "scratchpad", 0, 1, -1, 's' },
- };
-
- /* layout(s) */
-@@ -59,10 +60,14 @@ static char dmenumon[2] = "0"; /* compon
- static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
- static const char *termcmd[] = { "st", NULL };
-
-+/*First arg only serves to match against key in rules*/
-+static const char *scratchpadcmd[] = {"s", "st", "-t", "scratchpad", NULL};
-+
- static Key keys[] = {
- /* modifier key function argument */
- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
-+ { MODKEY, XK_grave, togglescratch, {.v = scratchpadcmd } },
- { MODKEY, XK_b, togglebar, {0} },
- { MODKEY, XK_j, focusstack, {.i = +1 } },
- { MODKEY, XK_k, focusstack, {.i = -1 } },
-diff '--color=auto' -up dwm-6.2/dwm.c dwm-6.2-new/dwm.c
---- dwm-6.2/dwm.c 2019-02-02 12:55:28.000000000 +0000
-+++ dwm-6.2-new/dwm.c 2020-04-26 13:55:56.820584361 +0100
-@@ -93,6 +93,7 @@ struct Client {
- int bw, oldbw;
- unsigned int tags;
- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-+ char scratchkey;
- Client *next;
- Client *snext;
- Monitor *mon;
-@@ -139,6 +140,7 @@ typedef struct {
- unsigned int tags;
- int isfloating;
- int monitor;
-+ const char scratchkey;
- } Rule;
-
- /* function declarations */
-@@ -206,11 +208,13 @@ static void seturgent(Client *c, int urg
- static void showhide(Client *c);
- static void sigchld(int unused);
- static void spawn(const Arg *arg);
-+static void spawnscratch(const Arg *arg);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
- static void tile(Monitor *);
- static void togglebar(const Arg *arg);
- static void togglefloating(const Arg *arg);
-+static void togglescratch(const Arg *arg);
- static void toggletag(const Arg *arg);
- static void toggleview(const Arg *arg);
- static void unfocus(Client *c, int setfocus);
-@@ -287,6 +291,7 @@ applyrules(Client *c)
- /* rule matching */
- c->isfloating = 0;
- c->tags = 0;
-+ c->scratchkey = 0;
- XGetClassHint(dpy, c->win, &ch);
- class = ch.res_class ? ch.res_class : broken;
- instance = ch.res_name ? ch.res_name : broken;
-@@ -299,6 +304,7 @@ applyrules(Client *c)
- {
- c->isfloating = r->isfloating;
- c->tags |= r->tags;
-+ c->scratchkey = r->scratchkey;
- for (m = mons; m && m->num != r->monitor; m = m->next);
- if (m)
- c->mon = m;
-@@ -308,6 +314,7 @@ applyrules(Client *c)
- XFree(ch.res_class);
- if (ch.res_name)
- XFree(ch.res_name);
-+
- c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
- }
-
-@@ -1652,6 +1659,19 @@ spawn(const Arg *arg)
- }
- }
-
-+void spawnscratch(const Arg *arg)
-+{
-+ if (fork() == 0) {
-+ if (dpy)
-+ close(ConnectionNumber(dpy));
-+ setsid();
-+ execvp(((char **)arg->v)[1], ((char **)arg->v)+1);
-+ fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[1]);
-+ perror(" failed");
-+ exit(EXIT_SUCCESS);
-+ }
-+}
-+
- void
- tag(const Arg *arg)
- {
-@@ -1720,6 +1740,28 @@ togglefloating(const Arg *arg)
- }
-
- void
-+togglescratch(const Arg *arg)
-+{
-+ Client *c;
-+ unsigned int found = 0;
-+
-+ for (c = selmon->clients; c && !(found = c->scratchkey == ((char**)arg->v)[0][0]); c = c->next);
-+ if (found) {
-+ c->tags = ISVISIBLE(c) ? 0 : selmon->tagset[selmon->seltags];
-+ focus(NULL);
-+ arrange(selmon);
-+
-+ if (ISVISIBLE(c)) {
-+ focus(c);
-+ restack(selmon);
-+ }
-+
-+ } else{
-+ spawnscratch(arg);
-+ }
-+}
-+
-+void
- toggletag(const Arg *arg)
- {
- unsigned int newtags;
diff --git a/patches/dwm-pertag-20200914-61bb8b2.diff b/patches/dwm-pertag-20200914-61bb8b2.diff
deleted file mode 100644
index c8d7fbc..0000000
--- a/patches/dwm-pertag-20200914-61bb8b2.diff
+++ /dev/null
@@ -1,177 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index 664c527..ac8e4ec 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -111,6 +111,7 @@ typedef struct {
- void (*arrange)(Monitor *);
- } Layout;
-
-+typedef struct Pertag Pertag;
- struct Monitor {
- char ltsymbol[16];
- float mfact;
-@@ -130,6 +131,7 @@ struct Monitor {
- Monitor *next;
- Window barwin;
- const Layout *lt[2];
-+ Pertag *pertag;
- };
-
- typedef struct {
-@@ -272,6 +274,15 @@ static Window root, wmcheckwin;
- /* configuration, allows nested code to access above variables */
- #include "config.h"
-
-+struct Pertag {
-+ unsigned int curtag, prevtag; /* current and previous tag */
-+ int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
-+ float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
-+ unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */
-+ const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes */
-+ int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */
-+};
-+
- /* compile-time check if all tags fit into an unsigned int bit array. */
- struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
-
-@@ -632,6 +643,7 @@ Monitor *
- createmon(void)
- {
- Monitor *m;
-+ unsigned int i;
-
- m = ecalloc(1, sizeof(Monitor));
- m->tagset[0] = m->tagset[1] = 1;
-@@ -642,6 +654,20 @@ createmon(void)
- m->lt[0] = &layouts[0];
- m->lt[1] = &layouts[1 % LENGTH(layouts)];
- strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
-+ m->pertag = ecalloc(1, sizeof(Pertag));
-+ m->pertag->curtag = m->pertag->prevtag = 1;
-+
-+ for (i = 0; i <= LENGTH(tags); i++) {
-+ m->pertag->nmasters[i] = m->nmaster;
-+ m->pertag->mfacts[i] = m->mfact;
-+
-+ m->pertag->ltidxs[i][0] = m->lt[0];
-+ m->pertag->ltidxs[i][1] = m->lt[1];
-+ m->pertag->sellts[i] = m->sellt;
-+
-+ m->pertag->showbars[i] = m->showbar;
-+ }
-+
- return m;
- }
-
-@@ -967,7 +993,7 @@ grabkeys(void)
- void
- incnmaster(const Arg *arg)
- {
-- selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
-+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
- arrange(selmon);
- }
-
-@@ -1502,9 +1528,9 @@ void
- setlayout(const Arg *arg)
- {
- if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
-- selmon->sellt ^= 1;
-+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
- if (arg && arg->v)
-- selmon->lt[selmon->sellt] = (Layout *)arg->v;
-+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
- strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
- if (selmon->sel)
- arrange(selmon);
-@@ -1523,7 +1549,7 @@ setmfact(const Arg *arg)
- f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
- if (f < 0.05 || f > 0.95)
- return;
-- selmon->mfact = f;
-+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
- arrange(selmon);
- }
-
-@@ -1702,7 +1728,7 @@ tile(Monitor *m)
- void
- togglebar(const Arg *arg)
- {
-- selmon->showbar = !selmon->showbar;
-+ selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
- updatebarpos(selmon);
- XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
- arrange(selmon);
-@@ -1741,9 +1767,33 @@ void
- toggleview(const Arg *arg)
- {
- unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
-+ int i;
-
- if (newtagset) {
- selmon->tagset[selmon->seltags] = newtagset;
-+
-+ if (newtagset == ~0) {
-+ selmon->pertag->prevtag = selmon->pertag->curtag;
-+ selmon->pertag->curtag = 0;
-+ }
-+
-+ /* test if the user did not select the same tag */
-+ if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
-+ selmon->pertag->prevtag = selmon->pertag->curtag;
-+ for (i = 0; !(newtagset & 1 << i); i++) ;
-+ selmon->pertag->curtag = i + 1;
-+ }
-+
-+ /* apply settings for this view */
-+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
-+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
-+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
-+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
-+ selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
-+
-+ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
-+ togglebar(NULL);
-+
- focus(NULL);
- arrange(selmon);
- }
-@@ -2038,11 +2088,37 @@ updatewmhints(Client *c)
- void
- view(const Arg *arg)
- {
-+ int i;
-+ unsigned int tmptag;
-+
- if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
- return;
- selmon->seltags ^= 1; /* toggle sel tagset */
-- if (arg->ui & TAGMASK)
-+ if (arg->ui & TAGMASK) {
- selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-+ selmon->pertag->prevtag = selmon->pertag->curtag;
-+
-+ if (arg->ui == ~0)
-+ selmon->pertag->curtag = 0;
-+ else {
-+ for (i = 0; !(arg->ui & 1 << i); i++) ;
-+ selmon->pertag->curtag = i + 1;
-+ }
-+ } else {
-+ tmptag = selmon->pertag->prevtag;
-+ selmon->pertag->prevtag = selmon->pertag->curtag;
-+ selmon->pertag->curtag = tmptag;
-+ }
-+
-+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
-+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
-+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
-+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
-+ selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
-+
-+ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
-+ togglebar(NULL);
-+
- focus(NULL);
- arrange(selmon);
- }
diff --git a/patches/dwm-resetnmaster-pertag-6.3.diff b/patches/dwm-resetnmaster-pertag-6.3.diff
deleted file mode 100644
index a3d12c0..0000000
--- a/patches/dwm-resetnmaster-pertag-6.3.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -r -u a/config.def.h b/config.def.h
---- a/config.def.h 2022-01-07 06:42:18.000000000 -0500
-+++ b/config.def.h 2022-01-23 16:03:42.521951418 -0500
-@@ -69,6 +69,7 @@
- { MODKEY, XK_k, focusstack, {.i = -1 } },
- { MODKEY, XK_i, incnmaster, {.i = +1 } },
- { MODKEY, XK_d, incnmaster, {.i = -1 } },
-+ { MODKEY, XK_o, resetnmaster, {0} },
- { MODKEY, XK_h, setmfact, {.f = -0.05} },
- { MODKEY, XK_l, setmfact, {.f = +0.05} },
- { MODKEY, XK_Return, zoom, {0} },
-diff -r -u a/dwm.c b/dwm.c
---- a/dwm.c 2022-01-23 16:06:01.221948285 -0500
-+++ b/dwm.c 2022-01-23 16:05:35.949948855 -0500
-@@ -191,6 +191,7 @@
- static void propertynotify(XEvent *e);
- static void quit(const Arg *arg);
- static Monitor *recttomon(int x, int y, int w, int h);
-+static void resetnmaster(const Arg *arg);
- static void resize(Client *c, int x, int y, int w, int h, int interact);
- static void resizeclient(Client *c, int x, int y, int w, int h);
- static void resizemouse(const Arg *arg);
-@@ -1296,6 +1297,13 @@
- }
-
- void
-+resetnmaster(const Arg *arg)
-+{
-+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = 1;
-+ arrange(selmon);
-+}
-+
-+void
- resize(Client *c, int x, int y, int w, int h, int interact)
- {
- if (applysizehints(c, &x, &y, &w, &h, interact))
diff --git a/patches/dwm-resizecorners-6.2.diff b/patches/dwm-resizecorners-6.2.diff
deleted file mode 100644
index 016351c..0000000
--- a/patches/dwm-resizecorners-6.2.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -r -u a/dwm.c b/dwm.c
---- a/dwm.c 2019-02-02 07:55:28.000000000 -0500
-+++ b/dwm.c 2022-01-17 22:38:33.614493243 -0500
-@@ -1291,9 +1291,14 @@
- resizemouse(const Arg *arg)
- {
- int ocx, ocy, nw, nh;
-+ int ocx2, ocy2, nx, ny;
- Client *c;
- Monitor *m;
- XEvent ev;
-+ int horizcorner, vertcorner;
-+ int di;
-+ unsigned int dui;
-+ Window dummy;
- Time lasttime = 0;
-
- if (!(c = selmon->sel))
-@@ -1303,10 +1308,18 @@
- restack(selmon);
- ocx = c->x;
- ocy = c->y;
-+ ocx2 = c->x + c->w;
-+ ocy2 = c->y + c->h;
- if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
- return;
-- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-+ if (!XQueryPointer (dpy, c->win, &dummy, &dummy, &di, &di, &nx, &ny, &dui))
-+ return;
-+ horizcorner = nx < c->w / 2;
-+ vertcorner = ny < c->h / 2;
-+ XWarpPointer (dpy, None, c->win, 0, 0, 0, 0,
-+ horizcorner ? (-c->bw) : (c->w + c->bw -1),
-+ vertcorner ? (-c->bw) : (c->h + c->bw -1));
- do {
- XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
- switch(ev.type) {
-@@ -1320,8 +1333,11 @@
- continue;
- lasttime = ev.xmotion.time;
-
-- nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
-- nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
-+ nx = horizcorner ? ev.xmotion.x : c->x;
-+ ny = vertcorner ? ev.xmotion.y : c->y;
-+ nw = MAX(horizcorner ? (ocx2 - nx) : (ev.xmotion.x - ocx - 2 * c->bw + 1), 1);
-+ nh = MAX(vertcorner ? (ocy2 - ny) : (ev.xmotion.y - ocy - 2 * c->bw + 1), 1);
-+
- if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
- && c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
- {
-@@ -1330,11 +1346,13 @@
- togglefloating(NULL);
- }
- if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-- resize(c, c->x, c->y, nw, nh, 1);
-+ resize(c, nx, ny, nw, nh, 1);
- break;
- }
- } while (ev.type != ButtonRelease);
-- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
-+ horizcorner ? (-c->bw) : (c->w + c->bw - 1),
-+ vertcorner ? (-c->bw) : (c->h + c->bw - 1));
- XUngrabPointer(dpy, CurrentTime);
- while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
- if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
diff --git a/patches/dwm-restartsig-20180523-6.2.diff b/patches/dwm-restartsig-20180523-6.2.diff
deleted file mode 100644
index f1f8680..0000000
--- a/patches/dwm-restartsig-20180523-6.2.diff
+++ /dev/null
@@ -1,139 +0,0 @@
-From 2991f37f0aaf44b9f9b11e7893ff0af8eb88f649 Mon Sep 17 00:00:00 2001
-From: Christopher Drelich <cd@cdrakka.com>
-Date: Wed, 23 May 2018 22:50:38 -0400
-Subject: [PATCH] Modifies quit to handle restarts and adds SIGHUP and SIGTERM
- handlers.
-
-Modified quit() to restart if it receives arg .i = 1
-MOD+CTRL+SHIFT+Q was added to confid.def.h to do just that.
-
-Signal handlers were handled for SIGHUP and SIGTERM.
-If dwm receives these signals it calls quit() with
-arg .i = to 1 or 0, respectively.
-
-To restart dwm:
-MOD+CTRL+SHIFT+Q
-or
-kill -HUP dwmpid
-
-To quit dwm cleanly:
-MOD+SHIFT+Q
-or
-kill -TERM dwmpid
----
- config.def.h | 1 +
- dwm.1 | 10 ++++++++++
- dwm.c | 22 ++++++++++++++++++++++
- 3 files changed, 33 insertions(+)
-
-diff --git a/config.def.h b/config.def.h
-index a9ac303..e559429 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -94,6 +94,7 @@ static Key keys[] = {
- TAGKEYS( XK_8, 7)
- TAGKEYS( XK_9, 8)
- { MODKEY|ShiftMask, XK_q, quit, {0} },
-+ { MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
- };
-
- /* button definitions */
-diff --git a/dwm.1 b/dwm.1
-index 13b3729..36a331c 100644
---- a/dwm.1
-+++ b/dwm.1
-@@ -142,6 +142,9 @@ Add/remove all windows with nth tag to/from the view.
- .TP
- .B Mod1\-Shift\-q
- Quit dwm.
-+.TP
-+.B Mod1\-Control\-Shift\-q
-+Restart dwm.
- .SS Mouse commands
- .TP
- .B Mod1\-Button1
-@@ -155,6 +158,13 @@ Resize focused window while dragging. Tiled windows will be toggled to the float
- .SH CUSTOMIZATION
- dwm is customized by creating a custom config.h and (re)compiling the source
- code. This keeps it fast, secure and simple.
-+.SH SIGNALS
-+.TP
-+.B SIGHUP - 1
-+Restart the dwm process.
-+.TP
-+.B SIGTERM - 15
-+Cleanly terminate the dwm process.
- .SH SEE ALSO
- .BR dmenu (1),
- .BR st (1)
-diff --git a/dwm.c b/dwm.c
-index bb95e26..286eecd 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -205,6 +205,8 @@ static void setup(void);
- static void seturgent(Client *c, int urg);
- static void showhide(Client *c);
- static void sigchld(int unused);
-+static void sighup(int unused);
-+static void sigterm(int unused);
- static void spawn(const Arg *arg);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
-@@ -260,6 +262,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
- [UnmapNotify] = unmapnotify
- };
- static Atom wmatom[WMLast], netatom[NetLast];
-+static int restart = 0;
- static int running = 1;
- static Cur *cursor[CurLast];
- static Clr **scheme;
-@@ -1248,6 +1251,7 @@ propertynotify(XEvent *e)
- void
- quit(const Arg *arg)
- {
-+ if(arg->i) restart = 1;
- running = 0;
- }
-
-@@ -1536,6 +1540,9 @@ setup(void)
- /* clean up any zombies immediately */
- sigchld(0);
-
-+ signal(SIGHUP, sighup);
-+ signal(SIGTERM, sigterm);
-+
- /* init screen */
- screen = DefaultScreen(dpy);
- sw = DisplayWidth(dpy, screen);
-@@ -1637,6 +1644,20 @@ sigchld(int unused)
- }
-
- void
-+sighup(int unused)
-+{
-+ Arg a = {.i = 1};
-+ quit(&a);
-+}
-+
-+void
-+sigterm(int unused)
-+{
-+ Arg a = {.i = 0};
-+ quit(&a);
-+}
-+
-+void
- spawn(const Arg *arg)
- {
- if (arg->v == dmenucmd)
-@@ -2139,6 +2160,7 @@ main(int argc, char *argv[])
- setup();
- scan();
- run();
-+ if(restart) execvp(argv[0], argv);
- cleanup();
- XCloseDisplay(dpy);
- return EXIT_SUCCESS;
---
-2.7.4
-
diff --git a/patches/dwm-sgrstatus-20220223-6.3.diff b/patches/dwm-sgrstatus-20220223-6.3.diff
deleted file mode 100644
index c033ba4..0000000
--- a/patches/dwm-sgrstatus-20220223-6.3.diff
+++ /dev/null
@@ -1,265 +0,0 @@
-From dc83e43aad7b8070911e8210b58cc36bdc4214d5 Mon Sep 17 00:00:00 2001
-From: Santtu Lakkala <inz@inz.fi>
-Date: Wed, 23 Feb 2022 11:55:19 +0200
-Subject: [PATCH 1/2] Allow CSI SGR in status bar
-
----
- config.def.h | 19 ++++++
- dwm.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 198 insertions(+), 3 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index a2ac963..3dc34bd 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -18,6 +18,25 @@ static const char *colors[][3] = {
- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
- };
-
-+static const char *barcolors[] = {
-+ "#000000",
-+ "#7f0000",
-+ "#007f00",
-+ "#7f7f00",
-+ "#00007f",
-+ "#7f007f",
-+ "#007f7f",
-+ "#cccccc",
-+ "#333333",
-+ "#ff0000",
-+ "#00ff00",
-+ "#ffff00",
-+ "#0000ff",
-+ "#ff00ff",
-+ "#00ffff",
-+ "#ffffff",
-+};
-+
- /* tagging */
- static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-diff --git a/dwm.c b/dwm.c
-index a96f33c..cb9484a 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -237,7 +237,7 @@ static void zoom(const Arg *arg);
-
- /* variables */
- static const char broken[] = "broken";
--static char stext[256];
-+static char stext[512];
- static int screen;
- static int sw, sh; /* X display screen geometry width, height */
- static int bh, blw = 0; /* bar geometry */
-@@ -264,6 +264,7 @@ static Atom wmatom[WMLast], netatom[NetLast];
- static int running = 1;
- static Cur *cursor[CurLast];
- static Clr **scheme;
-+static Clr *barclrs;
- static Display *dpy;
- static Drw *drw;
- static Monitor *mons, *selmon;
-@@ -693,6 +694,25 @@ dirtomon(int dir)
- return m;
- }
-
-+void
-+resetfntlist(Fnt *orighead, Fnt *curhead)
-+{
-+ if (orighead != curhead) {
-+ Fnt *f;
-+ for (f = orighead; f->next; f = f->next);
-+ f->next = curhead;
-+ for (f = f->next; f->next != orighead; f = f->next);
-+ f->next = NULL;
-+ }
-+}
-+
-+enum SgrFlags {
-+ REVERSE = 1 << 0,
-+ UNDERLINE = 1 << 1,
-+ STRIKETHROUGH = 1 << 2,
-+ OVERLINE = 1 << 3
-+};
-+
- void
- drawbar(Monitor *m)
- {
-@@ -707,9 +727,160 @@ drawbar(Monitor *m)
-
- /* draw status first so it can be overdrawn by tags later */
- if (m == selmon) { /* status is only drawn on selected monitor */
-+ char buffer[sizeof(stext)];
-+ Clr scm[3];
-+ int wr, rd;
-+ int pw;
-+ int fg = 7;
-+ int bg = 0;
-+ int fmt = 0;
-+ int lp = lrpad / 2 - 2;
-+ Fnt *fset = drw->fonts;
-+
-+ memcpy(scm, scheme[SchemeNorm], sizeof(scm));
-+
-+ drw_setscheme(drw, scm);
-+
-+ for (tw = 0, wr = 0, rd = 0; stext[rd]; rd++) {
-+ if (stext[rd] == '' && stext[rd + 1] == '[') {
-+ size_t alen = strspn(stext + rd + 2,
-+ "0123456789;");
-+ if (stext[rd + alen + 2] == 'm') {
-+ buffer[wr] = '\0';
-+ tw += TEXTW(buffer) - lrpad;
-+ wr = 0;
-+
-+ char *ep = stext + rd + 1;
-+ while (*ep != 'm') {
-+ unsigned v = strtoul(ep + 1, &ep, 10);
-+ if (v == 0 || (v >= 10 && v <= 19)) {
-+ int fi = v % 10;
-+ Fnt *f;
-+ Fnt *p;
-+ resetfntlist(fset, drw->fonts);
-+ for (p = NULL, f = fset; f && fi--; p = f, f = f->next);
-+ if (f) {
-+ if (p) {
-+ p->next = NULL;
-+ for (p = f; p->next; p = p->next);
-+ p->next = fset;
-+ }
-+ drw_setfontset(drw, f);
-+ } else {
-+ drw_setfontset(drw, fset);
-+ }
-+ }
-+ }
-+
-+ rd += alen + 2;
-+ continue;
-+ }
-+ }
-+ buffer[wr++] = stext[rd];
-+ }
-+ buffer[wr] = '\0';
-+
-+ tw += TEXTW(buffer) - lrpad / 2 + 2;
-+ x = m->ww - tw;
-+
-+ resetfntlist(fset, drw->fonts);
-+ drw_setfontset(drw, fset);
-+
-+ for (wr = 0, rd = 0; stext[rd]; rd++) {
-+ if (stext[rd] == '' && stext[rd + 1] == '[') {
-+ size_t alen = strspn(stext + rd + 2,
-+ "0123456789;");
-+ if (stext[rd + alen + 2] == 'm') {
-+ buffer[wr] = '\0';
-+ pw = TEXTW(buffer) - lrpad;
-+ drw_text(drw, x, 0, pw + lp, bh, lp, buffer, fmt & REVERSE);
-+ if (fmt & UNDERLINE)
-+ drw_rect(drw, x, (bh + drw->fonts->h) / 2, pw, 1, 1, fmt & REVERSE);
-+ if (fmt & STRIKETHROUGH)
-+ drw_rect(drw, x, bh / 2, pw, 1, 1, fmt & REVERSE);
-+ if (fmt & OVERLINE)
-+ drw_rect(drw, x, (bh - drw->fonts->h) / 2, pw, 1, 1, fmt & REVERSE);
-+ x += pw + lp;
-+ lp = 0;
-+
-+ char *ep = stext + rd + 1;
-+ while (*ep != 'm') {
-+ unsigned v = strtoul(ep + 1, &ep, 10);
-+ if (v == 0) {
-+ memcpy(scm, scheme[SchemeNorm], sizeof(scm));
-+ fg = 7;
-+ bg = 0;
-+ fmt = 0;
-+ resetfntlist(fset, drw->fonts);
-+ drw_setfontset(drw, fset);
-+ } else if (v == 1) {
-+ fg |= 8;
-+ scm[0] = barclrs[fg];
-+ } else if (v == 4) {
-+ fmt |= UNDERLINE;
-+ } else if (v == 7) {
-+ fmt |= REVERSE;
-+ } else if (v == 9) {
-+ fmt |= STRIKETHROUGH;
-+ } else if (v >= 10 && v <= 19) {
-+ int fi = v % 10;
-+ Fnt *f;
-+ Fnt *p;
-+ resetfntlist(fset, drw->fonts);
-+ for (p = NULL, f = fset; f && fi--; p = f, f = f->next);
-+ if (f) {
-+ if (p) {
-+ p->next = NULL;
-+ for (p = f; p->next; p = p->next);
-+ p->next = fset;
-+ }
-+ drw_setfontset(drw, f);
-+ } else {
-+ drw_setfontset(drw, fset);
-+ }
-+ } else if (v == 22) {
-+ fg &= ~8;
-+ scm[0] = barclrs[fg];
-+ } else if (v == 24) {
-+ fmt &= ~UNDERLINE;
-+ } else if (v == 27) {
-+ fmt &= ~REVERSE;
-+ } else if (v == 29) {
-+ fmt &= ~STRIKETHROUGH;
-+ } else if (v >= 30 && v <= 37) {
-+ fg = v % 10 | (fg & 8);
-+ scm[0] = barclrs[fg];
-+ } else if (v >= 40 && v <= 47) {
-+ bg = v % 10;
-+ scm[1] = barclrs[bg];
-+ } else if (v == 53) {
-+ fmt |= OVERLINE;
-+ } else if (v == 55) {
-+ fmt &= ~OVERLINE;
-+ }
-+ }
-+
-+ rd += alen + 2;
-+ wr = 0;
-+
-+ drw_setscheme(drw, scm);
-+ continue;
-+ }
-+ }
-+ buffer[wr++] = stext[rd];
-+ }
-+
-+ buffer[wr] = '\0';
-+ pw = TEXTW(buffer) - lrpad;
-+ drw_text(drw, x, 0, pw + lp, bh, lp, buffer, fmt & REVERSE);
-+ if (fmt & UNDERLINE)
-+ drw_rect(drw, x, (bh + drw->fonts->h) / 2, pw, 1, 1, fmt & REVERSE);
-+ if (fmt & STRIKETHROUGH)
-+ drw_rect(drw, x, bh / 2, pw, 1, 1, fmt & REVERSE);
-+ if (fmt & OVERLINE)
-+ drw_rect(drw, x, (bh - drw->fonts->h) / 2, pw, 1, 1, fmt & REVERSE);
-+
- drw_setscheme(drw, scheme[SchemeNorm]);
-- tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
-- drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
- }
-
- for (c = m->clients; c; c = c->next) {
-@@ -1574,6 +1745,11 @@ setup(void)
- scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
- for (i = 0; i < LENGTH(colors); i++)
- scheme[i] = drw_scm_create(drw, colors[i], 3);
-+
-+ barclrs = ecalloc(LENGTH(barcolors), sizeof(Clr));
-+ for (i = 0; i < LENGTH(barcolors); i++)
-+ drw_clr_create(drw, &barclrs[i], barcolors[i]);
-+
- /* init bars */
- updatebars();
- updatestatus();
---
-2.32.0
-
diff --git a/patches/dwm-stacker-6.2.diff b/patches/dwm-stacker-6.2.diff
deleted file mode 100644
index 8fe3b80..0000000
--- a/patches/dwm-stacker-6.2.diff
+++ /dev/null
@@ -1,197 +0,0 @@
-From d04f2d00688c8b0969d4f10f460c980dd91dac37 Mon Sep 17 00:00:00 2001
-From: MLquest8 <miskuzius@gmail.com>
-Date: Fri, 12 Jun 2020 16:04:18 +0400
-Subject: [PATCH] stacker updated for version 6.2
-
----
- config.def.h | 14 +++++++--
- dwm.c | 88 ++++++++++++++++++++++++++++++++++++++++------------
- 2 files changed, 80 insertions(+), 22 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 1c0b587..d28f8fc 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -50,6 +50,14 @@ static const Layout layouts[] = {
- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
-+#define STACKKEYS(MOD,ACTION) \
-+ { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \
-+ { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \
-+ { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \
-+ { MOD, XK_q, ACTION##stack, {.i = 0 } }, \
-+ { MOD, XK_a, ACTION##stack, {.i = 1 } }, \
-+ { MOD, XK_z, ACTION##stack, {.i = 2 } }, \
-+ { MOD, XK_x, ACTION##stack, {.i = -1 } },
-
- /* helper for spawning shell commands in the pre dwm-5.0 fashion */
- #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-@@ -64,8 +72,8 @@ static Key keys[] = {
- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
- { MODKEY, XK_b, togglebar, {0} },
-- { MODKEY, XK_j, focusstack, {.i = +1 } },
-- { MODKEY, XK_k, focusstack, {.i = -1 } },
-+ STACKKEYS(MODKEY, focus)
-+ STACKKEYS(MODKEY|ShiftMask, push)
- { MODKEY, XK_i, incnmaster, {.i = +1 } },
- { MODKEY, XK_d, incnmaster, {.i = -1 } },
- { MODKEY, XK_h, setmfact, {.f = -0.05} },
-@@ -93,7 +101,7 @@ static Key keys[] = {
- TAGKEYS( XK_7, 6)
- TAGKEYS( XK_8, 7)
- TAGKEYS( XK_9, 8)
-- { MODKEY|ShiftMask, XK_q, quit, {0} },
-+ { MODKEY|ShiftMask, XK_BackSpace, quit, {0} },
- };
-
- /* button definitions */
-diff --git a/dwm.c b/dwm.c
-index 9fd0286..6c302c3 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -47,15 +47,21 @@
- /* macros */
- #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
- #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
-+#define GETINC(X) ((X) - 2000)
-+#define INC(X) ((X) + 2000)
- #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
- * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
-+#define ISINC(X) ((X) > 1000 && (X) < 3000)
- #define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
-+#define PREVSEL 3000
- #define LENGTH(X) (sizeof X / sizeof X[0])
-+#define MOD(N,M) ((N)%(M) < 0 ? (N)%(M) + (M) : (N)%(M))
- #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
- #define WIDTH(X) ((X)->w + 2 * (X)->bw)
- #define HEIGHT(X) ((X)->h + 2 * (X)->bw)
- #define TAGMASK ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
-+#define TRUNC(X,A,B) (MAX((A), MIN((X), (B))))
-
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-@@ -187,6 +193,7 @@ static void movemouse(const Arg *arg);
- static Client *nexttiled(Client *c);
- static void pop(Client *);
- static void propertynotify(XEvent *e);
-+static void pushstack(const Arg *arg);
- static void quit(const Arg *arg);
- static Monitor *recttomon(int x, int y, int w, int h);
- static void resize(Client *c, int x, int y, int w, int h, int interact);
-@@ -207,6 +214,7 @@ static void seturgent(Client *c, int urg);
- static void showhide(Client *c);
- static void sigchld(int unused);
- static void spawn(const Arg *arg);
-+static int stackpos(const Arg *arg);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
- static void tile(Monitor *);
-@@ -833,27 +841,16 @@ focusmon(const Arg *arg)
- void
- focusstack(const Arg *arg)
- {
-- Client *c = NULL, *i;
-+ int i = stackpos(arg);
-+ Client *c, *p;
-
-- if (!selmon->sel)
-+ if(i < 0)
- return;
-- if (arg->i > 0) {
-- for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
-- if (!c)
-- for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
-- } else {
-- for (i = selmon->clients; i != selmon->sel; i = i->next)
-- if (ISVISIBLE(i))
-- c = i;
-- if (!c)
-- for (; i; i = i->next)
-- if (ISVISIBLE(i))
-- c = i;
-- }
-- if (c) {
-- focus(c);
-- restack(selmon);
-- }
-+
-+ for(p = NULL, c = selmon->clients; c && (i || !ISVISIBLE(c));
-+ i -= ISVISIBLE(c) ? 1 : 0, p = c, c = c->next);
-+ focus(c ? c : p);
-+ restack(selmon);
- }
-
- Atom
-@@ -1246,6 +1243,29 @@ propertynotify(XEvent *e)
- }
- }
-
-+void
-+pushstack(const Arg *arg) {
-+ int i = stackpos(arg);
-+ Client *sel = selmon->sel, *c, *p;
-+
-+ if(i < 0)
-+ return;
-+ else if(i == 0) {
-+ detach(sel);
-+ attach(sel);
-+ }
-+ else {
-+ for(p = NULL, c = selmon->clients; c; p = c, c = c->next)
-+ if(!(i -= (ISVISIBLE(c) && c != sel)))
-+ break;
-+ c = c ? c : p;
-+ detach(sel);
-+ sel->next = c->next;
-+ c->next = sel;
-+ }
-+ arrange(selmon);
-+}
-+
- void
- quit(const Arg *arg)
- {
-@@ -1653,6 +1673,36 @@ spawn(const Arg *arg)
- }
- }
-
-+int
-+stackpos(const Arg *arg) {
-+ int n, i;
-+ Client *c, *l;
-+
-+ if(!selmon->clients)
-+ return -1;
-+
-+ if(arg->i == PREVSEL) {
-+ for(l = selmon->stack; l && (!ISVISIBLE(l) || l == selmon->sel); l = l->snext);
-+ if(!l)
-+ return -1;
-+ for(i = 0, c = selmon->clients; c != l; i += ISVISIBLE(c) ? 1 : 0, c = c->next);
-+ return i;
-+ }
-+ else if(ISINC(arg->i)) {
-+ if(!selmon->sel)
-+ return -1;
-+ for(i = 0, c = selmon->clients; c != selmon->sel; i += ISVISIBLE(c) ? 1 : 0, c = c->next);
-+ for(n = i; c; n += ISVISIBLE(c) ? 1 : 0, c = c->next);
-+ return MOD(i + GETINC(arg->i), n);
-+ }
-+ else if(arg->i < 0) {
-+ for(i = 0, c = selmon->clients; c; i += ISVISIBLE(c) ? 1 : 0, c = c->next);
-+ return MAX(i + arg->i, 0);
-+ }
-+ else
-+ return arg->i;
-+}
-+
- void
- tag(const Arg *arg)
- {
---
-2.26.2
-
diff --git a/patches/dwm-swallow-6.3.diff b/patches/dwm-swallow-6.3.diff
deleted file mode 100644
index 47586a0..0000000
--- a/patches/dwm-swallow-6.3.diff
+++ /dev/null
@@ -1,412 +0,0 @@
-From 0cf9a007511f7dfd7dd94171b172562ebac9b6d5 Mon Sep 17 00:00:00 2001
-From: Tom Schwindl <schwindl@posteo.de>
-Date: Sat, 10 Sep 2022 12:51:09 +0200
-Subject: [PATCH] 6.3 swallow patch
-
----
- config.def.h | 9 +-
- config.mk | 3 +-
- dwm.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++++--
- 3 files changed, 237 insertions(+), 10 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 061ad662f82a..0b2b8ffd30d5 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -3,6 +3,7 @@
- /* appearance */
- static const unsigned int borderpx = 1; /* border pixel of windows */
- static const unsigned int snap = 32; /* snap pixel */
-+static const int swallowfloating = 0; /* 1 means swallow floating windows by default */
- static const int showbar = 1; /* 0 means no bar */
- static const int topbar = 1; /* 0 means bottom bar */
- static const char *fonts[] = { "monospace:size=10" };
-@@ -26,9 +27,11 @@ static const Rule rules[] = {
- * WM_CLASS(STRING) = instance, class
- * WM_NAME(STRING) = title
- */
-- /* class instance title tags mask isfloating monitor */
-- { "Gimp", NULL, NULL, 0, 1, -1 },
-- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
-+ /* class instance title tags mask isfloating isterminal noswallow monitor */
-+ { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 },
-+ { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 },
-+ { "St", NULL, NULL, 0, 0, 1, 0, -1 },
-+ { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */
- };
-
- /* layout(s) */
-diff --git a/config.mk b/config.mk
-index 81c493ef4aff..52d1ebf30bec 100644
---- a/config.mk
-+++ b/config.mk
-@@ -20,10 +20,11 @@ FREETYPEINC = /usr/include/freetype2
- # OpenBSD (uncomment)
- #FREETYPEINC = ${X11INC}/freetype2
- #MANPREFIX = ${PREFIX}/man
-+#KVMLIB = -lkvm
-
- # includes and libs
- INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res ${KVMLIB}
-
- # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-diff --git a/dwm.c b/dwm.c
-index e5efb6a22806..e68294b6b679 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -40,6 +40,12 @@
- #include <X11/extensions/Xinerama.h>
- #endif /* XINERAMA */
- #include <X11/Xft/Xft.h>
-+#include <X11/Xlib-xcb.h>
-+#include <xcb/res.h>
-+#ifdef __OpenBSD__
-+#include <sys/sysctl.h>
-+#include <kvm.h>
-+#endif /* __OpenBSD */
-
- #include "drw.h"
- #include "util.h"
-@@ -92,9 +98,11 @@ struct Client {
- int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
- int bw, oldbw;
- unsigned int tags;
-- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-+ int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow;
-+ pid_t pid;
- Client *next;
- Client *snext;
-+ Client *swallowing;
- Monitor *mon;
- Window win;
- };
-@@ -138,6 +146,8 @@ typedef struct {
- const char *title;
- unsigned int tags;
- int isfloating;
-+ int isterminal;
-+ int noswallow;
- int monitor;
- } Rule;
-
-@@ -235,6 +245,12 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
- static void zoom(const Arg *arg);
-
-+static pid_t getparentprocess(pid_t p);
-+static int isdescprocess(pid_t p, pid_t c);
-+static Client *swallowingclient(Window w);
-+static Client *termforwin(const Client *c);
-+static pid_t winpid(Window w);
-+
- /* variables */
- static const char broken[] = "broken";
- static char stext[256];
-@@ -269,6 +285,8 @@ static Drw *drw;
- static Monitor *mons, *selmon;
- static Window root, wmcheckwin;
-
-+static xcb_connection_t *xcon;
-+
- /* configuration, allows nested code to access above variables */
- #include "config.h"
-
-@@ -298,6 +316,8 @@ applyrules(Client *c)
- && (!r->class || strstr(class, r->class))
- && (!r->instance || strstr(instance, r->instance)))
- {
-+ c->isterminal = r->isterminal;
-+ c->noswallow = r->noswallow;
- c->isfloating = r->isfloating;
- c->tags |= r->tags;
- for (m = mons; m && m->num != r->monitor; m = m->next);
-@@ -416,6 +436,53 @@ attachstack(Client *c)
- c->mon->stack = c;
- }
-
-+void
-+swallow(Client *p, Client *c)
-+{
-+
-+ if (c->noswallow || c->isterminal)
-+ return;
-+ if (c->noswallow && !swallowfloating && c->isfloating)
-+ return;
-+
-+ detach(c);
-+ detachstack(c);
-+
-+ setclientstate(c, WithdrawnState);
-+ XUnmapWindow(dpy, p->win);
-+
-+ p->swallowing = c;
-+ c->mon = p->mon;
-+
-+ Window w = p->win;
-+ p->win = c->win;
-+ c->win = w;
-+ updatetitle(p);
-+ XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
-+ arrange(p->mon);
-+ configure(p);
-+ updateclientlist();
-+}
-+
-+void
-+unswallow(Client *c)
-+{
-+ c->win = c->swallowing->win;
-+
-+ free(c->swallowing);
-+ c->swallowing = NULL;
-+
-+ /* unfullscreen the client */
-+ setfullscreen(c, 0);
-+ updatetitle(c);
-+ arrange(c->mon);
-+ XMapWindow(dpy, c->win);
-+ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-+ setclientstate(c, NormalState);
-+ focus(NULL);
-+ arrange(c->mon);
-+}
-+
- void
- buttonpress(XEvent *e)
- {
-@@ -656,6 +723,9 @@ destroynotify(XEvent *e)
-
- if ((c = wintoclient(ev->window)))
- unmanage(c, 1);
-+
-+ else if ((c = swallowingclient(ev->window)))
-+ unmanage(c->swallowing, 1);
- }
-
- void
-@@ -1022,12 +1092,13 @@ killclient(const Arg *arg)
- void
- manage(Window w, XWindowAttributes *wa)
- {
-- Client *c, *t = NULL;
-+ Client *c, *t = NULL, *term = NULL;
- Window trans = None;
- XWindowChanges wc;
-
- c = ecalloc(1, sizeof(Client));
- c->win = w;
-+ c->pid = winpid(w);
- /* geometry */
- c->x = c->oldx = wa->x;
- c->y = c->oldy = wa->y;
-@@ -1042,6 +1113,7 @@ manage(Window w, XWindowAttributes *wa)
- } else {
- c->mon = selmon;
- applyrules(c);
-+ term = termforwin(c);
- }
-
- if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
-@@ -1076,6 +1148,8 @@ manage(Window w, XWindowAttributes *wa)
- c->mon->sel = c;
- arrange(c->mon);
- XMapWindow(dpy, c->win);
-+ if (term)
-+ swallow(term, c);
- focus(NULL);
- }
-
-@@ -1763,6 +1837,20 @@ unmanage(Client *c, int destroyed)
- Monitor *m = c->mon;
- XWindowChanges wc;
-
-+ if (c->swallowing) {
-+ unswallow(c);
-+ return;
-+ }
-+
-+ Client *s = swallowingclient(c->win);
-+ if (s) {
-+ free(s->swallowing);
-+ s->swallowing = NULL;
-+ arrange(m);
-+ focus(NULL);
-+ return;
-+ }
-+
- detach(c);
- detachstack(c);
- if (!destroyed) {
-@@ -1778,9 +1866,12 @@ unmanage(Client *c, int destroyed)
- XUngrabServer(dpy);
- }
- free(c);
-- focus(NULL);
-- updateclientlist();
-- arrange(m);
-+
-+ if (!s) {
-+ arrange(m);
-+ focus(NULL);
-+ updateclientlist();
-+ }
- }
-
- void
-@@ -2044,6 +2135,136 @@ view(const Arg *arg)
- arrange(selmon);
- }
-
-+pid_t
-+winpid(Window w)
-+{
-+
-+ pid_t result = 0;
-+
-+#ifdef __linux__
-+ xcb_res_client_id_spec_t spec = {0};
-+ spec.client = w;
-+ spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
-+
-+ xcb_generic_error_t *e = NULL;
-+ xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec);
-+ xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e);
-+
-+ if (!r)
-+ return (pid_t)0;
-+
-+ xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r);
-+ for (; i.rem; xcb_res_client_id_value_next(&i)) {
-+ spec = i.data->spec;
-+ if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) {
-+ uint32_t *t = xcb_res_client_id_value_value(i.data);
-+ result = *t;
-+ break;
-+ }
-+ }
-+
-+ free(r);
-+
-+ if (result == (pid_t)-1)
-+ result = 0;
-+
-+#endif /* __linux__ */
-+
-+#ifdef __OpenBSD__
-+ Atom type;
-+ int format;
-+ unsigned long len, bytes;
-+ unsigned char *prop;
-+ pid_t ret;
-+
-+ if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 0), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop)
-+ return 0;
-+
-+ ret = *(pid_t*)prop;
-+ XFree(prop);
-+ result = ret;
-+
-+#endif /* __OpenBSD__ */
-+ return result;
-+}
-+
-+pid_t
-+getparentprocess(pid_t p)
-+{
-+ unsigned int v = 0;
-+
-+#ifdef __linux__
-+ FILE *f;
-+ char buf[256];
-+ snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p);
-+
-+ if (!(f = fopen(buf, "r")))
-+ return 0;
-+
-+ fscanf(f, "%*u %*s %*c %u", &v);
-+ fclose(f);
-+#endif /* __linux__*/
-+
-+#ifdef __OpenBSD__
-+ int n;
-+ kvm_t *kd;
-+ struct kinfo_proc *kp;
-+
-+ kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL);
-+ if (!kd)
-+ return 0;
-+
-+ kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n);
-+ v = kp->p_ppid;
-+#endif /* __OpenBSD__ */
-+
-+ return (pid_t)v;
-+}
-+
-+int
-+isdescprocess(pid_t p, pid_t c)
-+{
-+ while (p != c && c != 0)
-+ c = getparentprocess(c);
-+
-+ return (int)c;
-+}
-+
-+Client *
-+termforwin(const Client *w)
-+{
-+ Client *c;
-+ Monitor *m;
-+
-+ if (!w->pid || w->isterminal)
-+ return NULL;
-+
-+ for (m = mons; m; m = m->next) {
-+ for (c = m->clients; c; c = c->next) {
-+ if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid))
-+ return c;
-+ }
-+ }
-+
-+ return NULL;
-+}
-+
-+Client *
-+swallowingclient(Window w)
-+{
-+ Client *c;
-+ Monitor *m;
-+
-+ for (m = mons; m; m = m->next) {
-+ for (c = m->clients; c; c = c->next) {
-+ if (c->swallowing && c->swallowing->win == w)
-+ return c;
-+ }
-+ }
-+
-+ return NULL;
-+}
-+
- Client *
- wintoclient(Window w)
- {
-@@ -2133,10 +2354,12 @@ main(int argc, char *argv[])
- fputs("warning: no locale support\n", stderr);
- if (!(dpy = XOpenDisplay(NULL)))
- die("dwm: cannot open display");
-+ if (!(xcon = XGetXCBConnection(dpy)))
-+ die("dwm: cannot get xcb connection\n");
- checkotherwm();
- setup();
- #ifdef __OpenBSD__
-- if (pledge("stdio rpath proc exec", NULL) == -1)
-+ if (pledge("stdio rpath proc exec ps", NULL) == -1)
- die("pledge");
- #endif /* __OpenBSD__ */
- scan();
---
-2.37.2
-
diff --git a/patches/dwm-systray-6.4.diff b/patches/dwm-systray-6.4.diff
deleted file mode 100644
index 58e4a69..0000000
--- a/patches/dwm-systray-6.4.diff
+++ /dev/null
@@ -1,746 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 9efa774..750529d 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -3,6 +3,11 @@
- /* appearance */
- static const unsigned int borderpx = 1; /* border pixel of windows */
- static const unsigned int snap = 32; /* snap pixel */
-+static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
-+static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */
-+static const unsigned int systrayspacing = 2; /* systray spacing */
-+static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
-+static const int showsystray = 1; /* 0 means no systray */
- static const int showbar = 1; /* 0 means no bar */
- static const int topbar = 1; /* 0 means bottom bar */
- static const char *fonts[] = { "monospace:size=10" };
-@@ -101,8 +106,8 @@ static const Key keys[] = {
- /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
- static const Button buttons[] = {
- /* click event mask button function argument */
-- { ClkLtSymbol, 0, Button1, setlayout, {0} },
-- { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
-+ { ClkTagBar, MODKEY, Button1, tag, {0} },
-+ { ClkTagBar, MODKEY, Button3, toggletag, {0} },
- { ClkWinTitle, 0, Button2, zoom, {0} },
- { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
- { ClkClientWin, MODKEY, Button1, movemouse, {0} },
-diff --git a/dwm.c b/dwm.c
-index 03baf42..4611a03 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -57,12 +57,27 @@
- #define TAGMASK ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
-
-+#define SYSTEM_TRAY_REQUEST_DOCK 0
-+/* XEMBED messages */
-+#define XEMBED_EMBEDDED_NOTIFY 0
-+#define XEMBED_WINDOW_ACTIVATE 1
-+#define XEMBED_FOCUS_IN 4
-+#define XEMBED_MODALITY_ON 10
-+#define XEMBED_MAPPED (1 << 0)
-+#define XEMBED_WINDOW_ACTIVATE 1
-+#define XEMBED_WINDOW_DEACTIVATE 2
-+#define VERSION_MAJOR 0
-+#define VERSION_MINOR 0
-+#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
-+
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
- enum { SchemeNorm, SchemeSel }; /* color schemes */
- enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
-+ NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz,
- NetWMFullscreen, NetActiveWindow, NetWMWindowType,
- NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-+enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
- enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
- enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
- ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
-@@ -141,6 +156,12 @@ typedef struct {
- int monitor;
- } Rule;
-
-+typedef struct Systray Systray;
-+struct Systray {
-+ Window win;
-+ Client *icons;
-+};
-+
- /* function declarations */
- static void applyrules(Client *c);
- static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
-@@ -172,6 +193,7 @@ static void focusstack(const Arg *arg);
- static Atom getatomprop(Client *c, Atom prop);
- static int getrootptr(int *x, int *y);
- static long getstate(Window w);
-+static unsigned int getsystraywidth();
- static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
- static void grabbuttons(Client *c, int focused);
- static void grabkeys(void);
-@@ -189,13 +211,16 @@ static void pop(Client *c);
- static void propertynotify(XEvent *e);
- static void quit(const Arg *arg);
- static Monitor *recttomon(int x, int y, int w, int h);
-+static void removesystrayicon(Client *i);
- static void resize(Client *c, int x, int y, int w, int h, int interact);
-+static void resizebarwin(Monitor *m);
- static void resizeclient(Client *c, int x, int y, int w, int h);
- static void resizemouse(const Arg *arg);
-+static void resizerequest(XEvent *e);
- static void restack(Monitor *m);
- static void run(void);
- static void scan(void);
--static int sendevent(Client *c, Atom proto);
-+static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
- static void sendmon(Client *c, Monitor *m);
- static void setclientstate(Client *c, long state);
- static void setfocus(Client *c);
-@@ -207,6 +232,7 @@ static void seturgent(Client *c, int urg);
- static void showhide(Client *c);
- static void sigchld(int unused);
- static void spawn(const Arg *arg);
-+static Monitor *systraytomon(Monitor *m);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
- static void tile(Monitor *m);
-@@ -224,18 +250,23 @@ static int updategeom(void);
- static void updatenumlockmask(void);
- static void updatesizehints(Client *c);
- static void updatestatus(void);
-+static void updatesystray(void);
-+static void updatesystrayicongeom(Client *i, int w, int h);
-+static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
- static void updatetitle(Client *c);
- static void updatewindowtype(Client *c);
- static void updatewmhints(Client *c);
- static void view(const Arg *arg);
- static Client *wintoclient(Window w);
- static Monitor *wintomon(Window w);
-+static Client *wintosystrayicon(Window w);
- static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
- static void zoom(const Arg *arg);
-
- /* variables */
-+static Systray *systray = NULL;
- static const char broken[] = "broken";
- static char stext[256];
- static int screen;
-@@ -258,9 +289,10 @@ static void (*handler[LASTEvent]) (XEvent *) = {
- [MapRequest] = maprequest,
- [MotionNotify] = motionnotify,
- [PropertyNotify] = propertynotify,
-+ [ResizeRequest] = resizerequest,
- [UnmapNotify] = unmapnotify
- };
--static Atom wmatom[WMLast], netatom[NetLast];
-+static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
- static int running = 1;
- static Cur *cursor[CurLast];
- static Clr **scheme;
-@@ -442,7 +474,7 @@ buttonpress(XEvent *e)
- arg.ui = 1 << i;
- } else if (ev->x < x + TEXTW(selmon->ltsymbol))
- click = ClkLtSymbol;
-- else if (ev->x > selmon->ww - (int)TEXTW(stext))
-+ else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth())
- click = ClkStatusText;
- else
- click = ClkWinTitle;
-@@ -485,6 +517,13 @@ cleanup(void)
- XUngrabKey(dpy, AnyKey, AnyModifier, root);
- while (mons)
- cleanupmon(mons);
-+
-+ if (showsystray) {
-+ XUnmapWindow(dpy, systray->win);
-+ XDestroyWindow(dpy, systray->win);
-+ free(systray);
-+ }
-+
- for (i = 0; i < CurLast; i++)
- drw_cur_free(drw, cursor[i]);
- for (i = 0; i < LENGTH(colors); i++)
-@@ -516,9 +555,58 @@ cleanupmon(Monitor *mon)
- void
- clientmessage(XEvent *e)
- {
-+ XWindowAttributes wa;
-+ XSetWindowAttributes swa;
- XClientMessageEvent *cme = &e->xclient;
- Client *c = wintoclient(cme->window);
-
-+ if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
-+ /* add systray icons */
-+ if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
-+ if (!(c = (Client *)calloc(1, sizeof(Client))))
-+ die("fatal: could not malloc() %u bytes\n", sizeof(Client));
-+ if (!(c->win = cme->data.l[2])) {
-+ free(c);
-+ return;
-+ }
-+ c->mon = selmon;
-+ c->next = systray->icons;
-+ systray->icons = c;
-+ if (!XGetWindowAttributes(dpy, c->win, &wa)) {
-+ /* use sane defaults */
-+ wa.width = bh;
-+ wa.height = bh;
-+ wa.border_width = 0;
-+ }
-+ c->x = c->oldx = c->y = c->oldy = 0;
-+ c->w = c->oldw = wa.width;
-+ c->h = c->oldh = wa.height;
-+ c->oldbw = wa.border_width;
-+ c->bw = 0;
-+ c->isfloating = True;
-+ /* reuse tags field as mapped status */
-+ c->tags = 1;
-+ updatesizehints(c);
-+ updatesystrayicongeom(c, wa.width, wa.height);
-+ XAddToSaveSet(dpy, c->win);
-+ XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
-+ XReparentWindow(dpy, c->win, systray->win, 0, 0);
-+ /* use parents background color */
-+ swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
-+ XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
-+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-+ /* FIXME not sure if I have to send these events, too */
-+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-+ XSync(dpy, False);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ setclientstate(c, NormalState);
-+ }
-+ return;
-+ }
-+
- if (!c)
- return;
- if (cme->message_type == netatom[NetWMState]) {
-@@ -571,7 +659,7 @@ configurenotify(XEvent *e)
- for (c = m->clients; c; c = c->next)
- if (c->isfullscreen)
- resizeclient(c, m->mx, m->my, m->mw, m->mh);
-- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
-+ resizebarwin(m);
- }
- focus(NULL);
- arrange(NULL);
-@@ -656,6 +744,11 @@ destroynotify(XEvent *e)
-
- if ((c = wintoclient(ev->window)))
- unmanage(c, 1);
-+ else if ((c = wintosystrayicon(ev->window))) {
-+ removesystrayicon(c);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
- }
-
- void
-@@ -699,7 +792,7 @@ dirtomon(int dir)
- void
- drawbar(Monitor *m)
- {
-- int x, w, tw = 0;
-+ int x, w, tw = 0, stw = 0;
- int boxs = drw->fonts->h / 9;
- int boxw = drw->fonts->h / 6 + 2;
- unsigned int i, occ = 0, urg = 0;
-@@ -708,13 +801,17 @@ drawbar(Monitor *m)
- if (!m->showbar)
- return;
-
-+ if(showsystray && m == systraytomon(m) && !systrayonleft)
-+ stw = getsystraywidth();
-+
- /* draw status first so it can be overdrawn by tags later */
- if (m == selmon) { /* status is only drawn on selected monitor */
- drw_setscheme(drw, scheme[SchemeNorm]);
-- tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
-- drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
-+ tw = TEXTW(stext) - lrpad / 2 + 2; /* 2px extra right padding */
-+ drw_text(drw, m->ww - tw - stw, 0, tw, bh, lrpad / 2 - 2, stext, 0);
- }
-
-+ resizebarwin(m);
- for (c = m->clients; c; c = c->next) {
- occ |= c->tags;
- if (c->isurgent)
-@@ -735,7 +832,7 @@ drawbar(Monitor *m)
- drw_setscheme(drw, scheme[SchemeNorm]);
- x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
-
-- if ((w = m->ww - tw - x) > bh) {
-+ if ((w = m->ww - tw - stw - x) > bh) {
- if (m->sel) {
- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
-@@ -746,7 +843,7 @@ drawbar(Monitor *m)
- drw_rect(drw, x, 0, w, bh, 1, 1);
- }
- }
-- drw_map(drw, m->barwin, 0, 0, m->ww, bh);
-+ drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
- }
-
- void
-@@ -783,8 +880,11 @@ expose(XEvent *e)
- Monitor *m;
- XExposeEvent *ev = &e->xexpose;
-
-- if (ev->count == 0 && (m = wintomon(ev->window)))
-+ if (ev->count == 0 && (m = wintomon(ev->window))) {
- drawbar(m);
-+ if (m == selmon)
-+ updatesystray();
-+ }
- }
-
- void
-@@ -870,14 +970,32 @@ getatomprop(Client *c, Atom prop)
- unsigned char *p = NULL;
- Atom da, atom = None;
-
-- if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
-+ /* FIXME getatomprop should return the number of items and a pointer to
-+ * the stored data instead of this workaround */
-+ Atom req = XA_ATOM;
-+ if (prop == xatom[XembedInfo])
-+ req = xatom[XembedInfo];
-+
-+ if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
- &da, &di, &dl, &dl, &p) == Success && p) {
- atom = *(Atom *)p;
-+ if (da == xatom[XembedInfo] && dl == 2)
-+ atom = ((Atom *)p)[1];
- XFree(p);
- }
- return atom;
- }
-
-+unsigned int
-+getsystraywidth()
-+{
-+ unsigned int w = 0;
-+ Client *i;
-+ if(showsystray)
-+ for(i = systray->icons; i; w += i->w + systrayspacing, i = i->next) ;
-+ return w ? w + systrayspacing : 1;
-+}
-+
- int
- getrootptr(int *x, int *y)
- {
-@@ -1018,7 +1136,8 @@ killclient(const Arg *arg)
- {
- if (!selmon->sel)
- return;
-- if (!sendevent(selmon->sel, wmatom[WMDelete])) {
-+
-+ if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
- XGrabServer(dpy);
- XSetErrorHandler(xerrordummy);
- XSetCloseDownMode(dpy, DestroyAll);
-@@ -1105,6 +1224,13 @@ maprequest(XEvent *e)
- static XWindowAttributes wa;
- XMapRequestEvent *ev = &e->xmaprequest;
-
-+ Client *i;
-+ if ((i = wintosystrayicon(ev->window))) {
-+ sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
-+
- if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
- return;
- if (!wintoclient(ev->window))
-@@ -1226,6 +1352,17 @@ propertynotify(XEvent *e)
- Window trans;
- XPropertyEvent *ev = &e->xproperty;
-
-+ if ((c = wintosystrayicon(ev->window))) {
-+ if (ev->atom == XA_WM_NORMAL_HINTS) {
-+ updatesizehints(c);
-+ updatesystrayicongeom(c, c->w, c->h);
-+ }
-+ else
-+ updatesystrayiconstate(c, ev);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
-+
- if ((ev->window == root) && (ev->atom == XA_WM_NAME))
- updatestatus();
- else if (ev->state == PropertyDelete)
-@@ -1276,6 +1413,19 @@ recttomon(int x, int y, int w, int h)
- return r;
- }
-
-+void
-+removesystrayicon(Client *i)
-+{
-+ Client **ii;
-+
-+ if (!showsystray || !i)
-+ return;
-+ for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
-+ if (ii)
-+ *ii = i->next;
-+ free(i);
-+}
-+
- void
- resize(Client *c, int x, int y, int w, int h, int interact)
- {
-@@ -1283,6 +1433,14 @@ resize(Client *c, int x, int y, int w, int h, int interact)
- resizeclient(c, x, y, w, h);
- }
-
-+void
-+resizebarwin(Monitor *m) {
-+ unsigned int w = m->ww;
-+ if (showsystray && m == systraytomon(m) && !systrayonleft)
-+ w -= getsystraywidth();
-+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
-+}
-+
- void
- resizeclient(Client *c, int x, int y, int w, int h)
- {
-@@ -1298,6 +1456,19 @@ resizeclient(Client *c, int x, int y, int w, int h)
- XSync(dpy, False);
- }
-
-+void
-+resizerequest(XEvent *e)
-+{
-+ XResizeRequestEvent *ev = &e->xresizerequest;
-+ Client *i;
-+
-+ if ((i = wintosystrayicon(ev->window))) {
-+ updatesystrayicongeom(i, ev->width, ev->height);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
-+}
-+
- void
- resizemouse(const Arg *arg)
- {
-@@ -1444,26 +1615,37 @@ setclientstate(Client *c, long state)
- }
-
- int
--sendevent(Client *c, Atom proto)
-+sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4)
- {
- int n;
-- Atom *protocols;
-+ Atom *protocols, mt;
- int exists = 0;
- XEvent ev;
-
-- if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-- while (!exists && n--)
-- exists = protocols[n] == proto;
-- XFree(protocols);
-+ if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
-+ mt = wmatom[WMProtocols];
-+ if (XGetWMProtocols(dpy, w, &protocols, &n)) {
-+ while (!exists && n--)
-+ exists = protocols[n] == proto;
-+ XFree(protocols);
-+ }
-+ }
-+ else {
-+ exists = True;
-+ mt = proto;
- }
-+
- if (exists) {
- ev.type = ClientMessage;
-- ev.xclient.window = c->win;
-- ev.xclient.message_type = wmatom[WMProtocols];
-+ ev.xclient.window = w;
-+ ev.xclient.message_type = mt;
- ev.xclient.format = 32;
-- ev.xclient.data.l[0] = proto;
-- ev.xclient.data.l[1] = CurrentTime;
-- XSendEvent(dpy, c->win, False, NoEventMask, &ev);
-+ ev.xclient.data.l[0] = d0;
-+ ev.xclient.data.l[1] = d1;
-+ ev.xclient.data.l[2] = d2;
-+ ev.xclient.data.l[3] = d3;
-+ ev.xclient.data.l[4] = d4;
-+ XSendEvent(dpy, w, False, mask, &ev);
- }
- return exists;
- }
-@@ -1477,7 +1659,7 @@ setfocus(Client *c)
- XA_WINDOW, 32, PropModeReplace,
- (unsigned char *) &(c->win), 1);
- }
-- sendevent(c, wmatom[WMTakeFocus]);
-+ sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
- }
-
- void
-@@ -1566,6 +1748,10 @@ setup(void)
- wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
- netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
- netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
-+ netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
-+ netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
-+ netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False);
-+ netatom[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False);
- netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
- netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
- netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
-@@ -1573,6 +1759,9 @@ setup(void)
- netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
- netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
- netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
-+ xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
-+ xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
-+ xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
- /* init cursors */
- cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
- cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-@@ -1581,6 +1770,8 @@ setup(void)
- scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
- for (i = 0; i < LENGTH(colors); i++)
- scheme[i] = drw_scm_create(drw, colors[i], 3);
-+ /* init system tray */
-+ updatesystray();
- /* init bars */
- updatebars();
- updatestatus();
-@@ -1711,7 +1902,18 @@ togglebar(const Arg *arg)
- {
- selmon->showbar = !selmon->showbar;
- updatebarpos(selmon);
-- XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
-+ resizebarwin(selmon);
-+ if (showsystray) {
-+ XWindowChanges wc;
-+ if (!selmon->showbar)
-+ wc.y = -bh;
-+ else if (selmon->showbar) {
-+ wc.y = 0;
-+ if (!selmon->topbar)
-+ wc.y = selmon->mh - bh;
-+ }
-+ XConfigureWindow(dpy, systray->win, CWY, &wc);
-+ }
- arrange(selmon);
- }
-
-@@ -1807,11 +2009,18 @@ unmapnotify(XEvent *e)
- else
- unmanage(c, 0);
- }
-+ else if ((c = wintosystrayicon(ev->window))) {
-+ /* KLUDGE! sometimes icons occasionally unmap their windows, but do
-+ * _not_ destroy them. We map those windows back */
-+ XMapRaised(dpy, c->win);
-+ updatesystray();
-+ }
- }
-
- void
- updatebars(void)
- {
-+ unsigned int w;
- Monitor *m;
- XSetWindowAttributes wa = {
- .override_redirect = True,
-@@ -1822,10 +2031,15 @@ updatebars(void)
- for (m = mons; m; m = m->next) {
- if (m->barwin)
- continue;
-- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-+ w = m->ww;
-+ if (showsystray && m == systraytomon(m))
-+ w -= getsystraywidth();
-+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen),
- CopyFromParent, DefaultVisual(dpy, screen),
- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
- XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
-+ if (showsystray && m == systraytomon(m))
-+ XMapRaised(dpy, systray->win);
- XMapRaised(dpy, m->barwin);
- XSetClassHint(dpy, m->barwin, &ch);
- }
-@@ -2002,6 +2216,125 @@ updatestatus(void)
- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
- strcpy(stext, "dwm-"VERSION);
- drawbar(selmon);
-+ updatesystray();
-+}
-+
-+
-+void
-+updatesystrayicongeom(Client *i, int w, int h)
-+{
-+ if (i) {
-+ i->h = bh;
-+ if (w == h)
-+ i->w = bh;
-+ else if (h == bh)
-+ i->w = w;
-+ else
-+ i->w = (int) ((float)bh * ((float)w / (float)h));
-+ applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);
-+ /* force icons into the systray dimensions if they don't want to */
-+ if (i->h > bh) {
-+ if (i->w == i->h)
-+ i->w = bh;
-+ else
-+ i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
-+ i->h = bh;
-+ }
-+ }
-+}
-+
-+void
-+updatesystrayiconstate(Client *i, XPropertyEvent *ev)
-+{
-+ long flags;
-+ int code = 0;
-+
-+ if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
-+ !(flags = getatomprop(i, xatom[XembedInfo])))
-+ return;
-+
-+ if (flags & XEMBED_MAPPED && !i->tags) {
-+ i->tags = 1;
-+ code = XEMBED_WINDOW_ACTIVATE;
-+ XMapRaised(dpy, i->win);
-+ setclientstate(i, NormalState);
-+ }
-+ else if (!(flags & XEMBED_MAPPED) && i->tags) {
-+ i->tags = 0;
-+ code = XEMBED_WINDOW_DEACTIVATE;
-+ XUnmapWindow(dpy, i->win);
-+ setclientstate(i, WithdrawnState);
-+ }
-+ else
-+ return;
-+ sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0,
-+ systray->win, XEMBED_EMBEDDED_VERSION);
-+}
-+
-+void
-+updatesystray(void)
-+{
-+ XSetWindowAttributes wa;
-+ XWindowChanges wc;
-+ Client *i;
-+ Monitor *m = systraytomon(NULL);
-+ unsigned int x = m->mx + m->mw;
-+ unsigned int sw = TEXTW(stext) - lrpad + systrayspacing;
-+ unsigned int w = 1;
-+
-+ if (!showsystray)
-+ return;
-+ if (systrayonleft)
-+ x -= sw + lrpad / 2;
-+ if (!systray) {
-+ /* init systray */
-+ if (!(systray = (Systray *)calloc(1, sizeof(Systray))))
-+ die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
-+ systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel);
-+ wa.event_mask = ButtonPressMask | ExposureMask;
-+ wa.override_redirect = True;
-+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
-+ XSelectInput(dpy, systray->win, SubstructureNotifyMask);
-+ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
-+ PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz], 1);
-+ XChangeWindowAttributes(dpy, systray->win, CWEventMask|CWOverrideRedirect|CWBackPixel, &wa);
-+ XMapRaised(dpy, systray->win);
-+ XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime);
-+ if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
-+ sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0);
-+ XSync(dpy, False);
-+ }
-+ else {
-+ fprintf(stderr, "dwm: unable to obtain system tray.\n");
-+ free(systray);
-+ systray = NULL;
-+ return;
-+ }
-+ }
-+ for (w = 0, i = systray->icons; i; i = i->next) {
-+ /* make sure the background color stays the same */
-+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
-+ XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
-+ XMapRaised(dpy, i->win);
-+ w += systrayspacing;
-+ i->x = w;
-+ XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
-+ w += i->w;
-+ if (i->mon != m)
-+ i->mon = m;
-+ }
-+ w = w ? w + systrayspacing : 1;
-+ x -= w;
-+ XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh);
-+ wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh;
-+ wc.stack_mode = Above; wc.sibling = m->barwin;
-+ XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc);
-+ XMapWindow(dpy, systray->win);
-+ XMapSubwindows(dpy, systray->win);
-+ /* redraw background */
-+ XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
-+ XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
-+ XSync(dpy, False);
- }
-
- void
-@@ -2069,6 +2402,16 @@ wintoclient(Window w)
- return NULL;
- }
-
-+Client *
-+wintosystrayicon(Window w) {
-+ Client *i = NULL;
-+
-+ if (!showsystray || !w)
-+ return i;
-+ for (i = systray->icons; i && i->win != w; i = i->next) ;
-+ return i;
-+}
-+
- Monitor *
- wintomon(Window w)
- {
-@@ -2122,6 +2465,22 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
- return -1;
- }
-
-+Monitor *
-+systraytomon(Monitor *m) {
-+ Monitor *t;
-+ int i, n;
-+ if(!systraypinning) {
-+ if(!m)
-+ return selmon;
-+ return m == selmon ? m : NULL;
-+ }
-+ for(n = 1, t = mons; t && t->next; n++, t = t->next) ;
-+ for(i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next) ;
-+ if(systraypinningfailfirst && n < systraypinning)
-+ return mons;
-+ return t;
-+}
-+
- void
- zoom(const Arg *arg)
- {
diff --git a/todo b/todo
index 99c9477..59e3862 100644
--- a/todo
+++ b/todo
@@ -1,3 +1 @@
-# TODO: consider adding the compiler flags of -O3 and -march=native to enable auto loop vectorize for better performance.
-# TODO: Picom rule: shadow-exclude = [ "! _IS_FLOATING@:32c = 1" ];
-# TODO: Rewrite sb-scripts with pango markup
+# TODO: customize layoutmenu patch
diff --git a/transient.c b/transient.c
deleted file mode 100644
index 040adb5..0000000
--- a/transient.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* cc transient.c -o transient -lX11 */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-int main(void) {
- Display *d;
- Window r, f, t = None;
- XSizeHints h;
- XEvent e;
-
- d = XOpenDisplay(NULL);
- if (!d)
- exit(1);
- r = DefaultRootWindow(d);
-
- f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0);
- h.min_width = h.max_width = h.min_height = h.max_height = 400;
- h.flags = PMinSize | PMaxSize;
- XSetWMNormalHints(d, f, &h);
- XStoreName(d, f, "floating");
- XMapWindow(d, f);
-
- XSelectInput(d, f, ExposureMask);
- while (1) {
- XNextEvent(d, &e);
-
- if (t == None) {
- sleep(5);
- t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0);
- XSetTransientForHint(d, t, f);
- XStoreName(d, t, "transient");
- XMapWindow(d, t);
- XSelectInput(d, t, ExposureMask);
- }
- }
-
- XCloseDisplay(d);
- exit(0);
-}
diff --git a/util.c b/util.c
deleted file mode 100644
index 96b82c9..0000000
--- a/util.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util.h"
-
-void
-die(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- vfprintf(stderr, fmt, ap);
- va_end(ap);
-
- if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
- fputc(' ', stderr);
- perror(NULL);
- } else {
- fputc('\n', stderr);
- }
-
- exit(1);
-}
-
-void *
-ecalloc(size_t nmemb, size_t size)
-{
- void *p;
-
- if (!(p = calloc(nmemb, size)))
- die("calloc:");
- return p;
-}
diff --git a/util.h b/util.h
deleted file mode 100644
index f633b51..0000000
--- a/util.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#define MAX(A, B) ((A) > (B) ? (A) : (B))
-#define MIN(A, B) ((A) < (B) ? (A) : (B))
-#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
-
-void die(const char *fmt, ...);
-void *ecalloc(size_t nmemb, size_t size);