x11-wm/dwm: fix patches

This commit is contained in:
odrling 2022-06-21 13:46:07 +02:00
parent 0f1c3e0843
commit 8fffd8a309
No known key found for this signature in database
GPG Key ID: A0145F975F9F8B75
26 changed files with 121 additions and 117 deletions

View File

@ -1,15 +1,15 @@
From 38b0d257f4f52e4312ce1d04512894e80eb66481 Mon Sep 17 00:00:00 2001
From 0156c667ffa9185896bed2fffcf15077b599c826 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Sat, 27 Mar 2021 18:56:05 +0100
Subject: [PATCH 01/26] set up my patches and config
---
config.def.h | 116 ++++++++++++++++++++++++++++++--------------------
patches.def.h | 50 +++++++++++-----------
2 files changed, 94 insertions(+), 72 deletions(-)
config.def.h | 120 +++++++++++++++++++++++++++++---------------------
patches.def.h | 50 ++++++++++-----------
2 files changed, 95 insertions(+), 75 deletions(-)
diff --git a/config.def.h b/config.def.h
index f74b909..79b3dd9 100644
index 40c9f46..bcf19a2 100644
--- a/config.def.h
+++ b/config.def.h
@@ -125,11 +125,11 @@ static void (*bartabmonfns[])(Monitor *) = { NULL /* , customlayoutfn */ };
@ -75,7 +75,7 @@ index f74b909..79b3dd9 100644
static char urgfgcolor[] = "#bbbbbb";
static char urgbgcolor[] = "#222222";
@@ -346,7 +346,7 @@ static const char *layoutmenu_cmd = "layoutmenu.sh";
@@ -366,7 +366,7 @@ static const char *layoutmenu_cmd = "layoutmenu.sh";
#if COOL_AUTOSTART_PATCH
static const char *const autostart[] = {
@ -84,19 +84,23 @@ index f74b909..79b3dd9 100644
NULL /* terminate */
};
#endif // COOL_AUTOSTART_PATCH
@@ -435,8 +435,9 @@ static const Rule rules[] = {
@@ -457,11 +457,10 @@ static const Rule rules[] = {
RULE(.wintype = WTYPE "UTILITY", .isfloating = 1)
RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1)
RULE(.wintype = WTYPE "SPLASH", .isfloating = 1)
- RULE(.class = "Gimp", .tags = 1 << 4)
- RULE(.class = "Firefox", .tags = 1 << 7)
- #if RENAMED_SCRATCHPADS_PATCH
- RULE(.instance = "spterm", .scratchkey = 's', .isfloating = 1)
- #elif SCRATCHPADS_PATCH
+ RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 2)
+ RULE(.class = "Ardour", .tags = 1 << 8)
+ RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1)
#if SCRATCHPADS_PATCH
+ #if SCRATCHPADS_PATCH
RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1)
#endif // SCRATCHPADS_PATCH
@@ -591,13 +592,13 @@ static const int scrollargs[][2] = {
};
@@ -615,13 +614,13 @@ static const int scrollargs[][2] = {
static const Layout layouts[] = {
/* 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
@ -115,7 +119,7 @@ index f74b909..79b3dd9 100644
{ "|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
@@ -656,7 +657,7 @@ static const Layout layouts[] = {
@@ -680,7 +679,7 @@ static const Layout layouts[] = {
#if TILE_LAYOUT
{ "[]=", tile }, /* first entry is default */
#endif
@ -124,7 +128,7 @@ index f74b909..79b3dd9 100644
#if MONOCLE_LAYOUT
{ "[M]", monocle },
#endif
@@ -711,7 +712,7 @@ static const char *xkb_layouts[] = {
@@ -735,7 +734,7 @@ static const char *xkb_layouts[] = {
#endif // XKB_PATCH
/* key definitions */
@ -133,7 +137,7 @@ index f74b909..79b3dd9 100644
#if COMBO_PATCH && SWAPTAGS_PATCH && TAGOTHERMONITOR_PATCH
#define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \
@@ -812,6 +813,10 @@ static const char *dmenucmd[] = {
@@ -836,6 +835,10 @@ static const char *dmenucmd[] = {
NULL
};
static const char *termcmd[] = { "st", NULL };
@ -144,7 +148,7 @@ index f74b909..79b3dd9 100644
#if BAR_STATUSCMD_PATCH
#if BAR_DWMBLOCKS_PATCH
@@ -842,7 +847,7 @@ static Key keys[] = {
@@ -866,7 +869,7 @@ static Key keys[] = {
#if KEYMODES_PATCH
{ MODKEY, XK_Escape, setkeymode, {.ui = COMMANDMODE} },
#endif // KEYMODES_PATCH
@ -153,7 +157,7 @@ index f74b909..79b3dd9 100644
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
#if RIODRAW_PATCH
{ MODKEY|ControlMask, XK_p, riospawnsync, {.v = dmenucmd } },
@@ -966,14 +971,14 @@ static Key keys[] = {
@@ -990,14 +993,14 @@ static Key keys[] = {
#if BAR_WINTITLEACTIONS_PATCH
{ MODKEY|ControlMask, XK_z, showhideclient, {0} },
#endif // BAR_WINTITLEACTIONS_PATCH
@ -170,7 +174,7 @@ index f74b909..79b3dd9 100644
#if RESTARTSIG_PATCH
{ MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
#endif // RESTARTSIG_PATCH
@@ -989,9 +994,9 @@ static Key keys[] = {
@@ -1013,9 +1016,9 @@ static Key keys[] = {
#if XRDB_PATCH && !BAR_VTCOLORS_PATCH
{ MODKEY|ShiftMask, XK_F5, xrdb, {.v = NULL } },
#endif // XRDB_PATCH
@ -183,7 +187,7 @@ index f74b909..79b3dd9 100644
#if COLUMNS_LAYOUT
{ MODKEY, XK_c, setlayout, {.v = &layouts[3]} },
#endif // COLUMNS_LAYOUT
@@ -1050,10 +1055,10 @@ static Key keys[] = {
@@ -1078,10 +1081,10 @@ static Key keys[] = {
{ MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
#endif // SCRATCHPAD_ALT_1_PATCH
@ -198,7 +202,7 @@ index f74b909..79b3dd9 100644
#if FOCUSADJACENTTAG_PATCH
{ MODKEY, XK_Left, viewtoleft, {0} }, // note keybinding conflict with focusdir
{ MODKEY, XK_Right, viewtoright, {0} }, // note keybinding conflict with focusdir
@@ -1190,23 +1195,40 @@ static Key keys[] = {
@@ -1218,23 +1221,40 @@ static Key keys[] = {
{ MODKEY|ControlMask, XK_numbersign, setborderpx, {.i = 0 } },
#endif // SETBORDERPX_PATCH
#if CYCLELAYOUTS_PATCH
@ -251,7 +255,7 @@ index f74b909..79b3dd9 100644
#if KEYMODES_PATCH
diff --git a/patches.def.h b/patches.def.h
index 697f6e6..fb93871 100644
index 3cc9756..9c50442 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -317,7 +317,7 @@
@ -369,7 +373,7 @@ index 697f6e6..fb93871 100644
/* 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
@@ -866,7 +866,7 @@
@@ -878,7 +878,7 @@
* This takes precedence over the resizecorners patch.
* https://github.com/bakkeby/patches/blob/master/dwm/dwm-resizepoint-6.2.diff
*/
@ -378,7 +382,7 @@ index 697f6e6..fb93871 100644
/* Adds a keyboard shortcut to restart dwm or alternatively by using kill -HUP dwmpid.
* Additionally dwm can quit cleanly by using kill -TERM dwmpid.
@@ -990,7 +990,7 @@
@@ -1014,7 +1014,7 @@
* comes to focusmon, tagmon and similar functionality.
* https://www.mail-archive.com/hackers@suckless.org/msg09400.html
*/
@ -387,7 +391,7 @@ index 697f6e6..fb93871 100644
/* Spawns programs from currently focused client's working directory.
* https://dwm.suckless.org/patches/spawn_cwd/
@@ -1016,12 +1016,12 @@
@@ -1040,12 +1040,12 @@
*
* https://github.com/bakkeby/patches/wiki/steam
*/
@ -402,7 +406,7 @@ index 697f6e6..fb93871 100644
/* 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,
@@ -1038,7 +1038,7 @@
@@ -1062,7 +1062,7 @@
*
* https://dwm.suckless.org/patches/swallow/
*/
@ -411,7 +415,7 @@ index 697f6e6..fb93871 100644
/* 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
@@ -1074,7 +1074,7 @@
@@ -1098,7 +1098,7 @@
* https://github.com/bakkeby/patches/blob/master/dwm/dwm-switchtag-6.2.diff
* Also see https://dwm.suckless.org/patches/switchtotag
*/
@ -420,7 +424,7 @@ index 697f6e6..fb93871 100644
/* 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
@@ -1116,7 +1116,7 @@
@@ -1140,7 +1140,7 @@
* while remaining in fullscreen.
* https://github.com/bakkeby/patches/blob/master/dwm/dwm-tagmonfixfs-6.2.diff
*/
@ -429,7 +433,7 @@ index 697f6e6..fb93871 100644
/* 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.
@@ -1214,7 +1214,7 @@
@@ -1238,7 +1238,7 @@
* when the mouse cursor is (a) on a different screen or (b) on top of a different window.
* https://dwm.suckless.org/patches/warp/
*/
@ -438,7 +442,7 @@ index 697f6e6..fb93871 100644
/* 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.
@@ -1242,7 +1242,7 @@
@@ -1266,7 +1266,7 @@
* the float border color, awesomebar, urgentborder and titlecolor patches.
* https://dwm.suckless.org/patches/xrdb/
*/
@ -447,7 +451,7 @@ index 697f6e6..fb93871 100644
/* 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/
@@ -1304,7 +1304,7 @@
@@ -1328,7 +1328,7 @@
* A revamped, more flexible, and over-the-top version of the original flextile layout.
* https://dwm.suckless.org/patches/flextile/ (original)
*/
@ -456,7 +460,7 @@ index 697f6e6..fb93871 100644
/* Gappless grid layout.
* https://dwm.suckless.org/patches/gaplessgrid/
@@ -1329,7 +1329,7 @@
@@ -1353,7 +1353,7 @@
/* The default tile layout.
* This can be optionally disabled in favour of other layouts.
*/

View File

@ -1,4 +1,4 @@
From 47cc1e563f95437fd4ee5cb0adbb41750e0b793f Mon Sep 17 00:00:00 2001
From fa518fe6ad779422d2b8e5d97ccc2cc68962893e Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Sat, 27 Mar 2021 19:07:22 +0100
Subject: [PATCH 02/26] set urgent color
@ -8,7 +8,7 @@ Subject: [PATCH 02/26] set urgent color
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/config.def.h b/config.def.h
index 79b3dd9..6fb1ff4 100644
index bcf19a2..f3e46fd 100644
--- a/config.def.h
+++ b/config.def.h
@@ -168,9 +168,9 @@ static char hidselfgcolor[] = "#222222";
@ -23,7 +23,7 @@ index 79b3dd9..6fb1ff4 100644
+static char urgbordercolor[] = "#dddddd";
static char urgfloatcolor[] = "#db8fd9";
#if BAR_FLEXWINTITLE_PATCH
#if RENAMED_SCRATCHPADS_PATCH
--
2.35.1

View File

@ -1,4 +1,4 @@
From 0d7763c00e74b3a07d323af1f7962c8434ba5082 Mon Sep 17 00:00:00 2001
From ea2a82c09deb587c488507f7067d5d1ddde6fda6 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Sun, 28 Mar 2021 20:22:05 +0200
Subject: [PATCH 03/26] more config
@ -9,10 +9,10 @@ Subject: [PATCH 03/26] more config
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/config.def.h b/config.def.h
index 6fb1ff4..147f110 100644
index f3e46fd..59cb63a 100644
--- a/config.def.h
+++ b/config.def.h
@@ -435,8 +435,9 @@ static const Rule rules[] = {
@@ -457,8 +457,9 @@ static const Rule rules[] = {
RULE(.wintype = WTYPE "UTILITY", .isfloating = 1)
RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1)
RULE(.wintype = WTYPE "SPLASH", .isfloating = 1)
@ -24,7 +24,7 @@ index 6fb1ff4..147f110 100644
RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1)
#if SCRATCHPADS_PATCH
RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1)
@@ -1042,7 +1043,7 @@ static Key keys[] = {
@@ -1068,7 +1069,7 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_f, fullscreen, {0} },
#endif // FULLSCREEN_PATCH
#if STICKY_PATCH
@ -33,7 +33,7 @@ index 6fb1ff4..147f110 100644
#endif // STICKY_PATCH
#if SCRATCHPAD_ALT_1_PATCH
{ MODKEY, XK_minus, scratchpad_show, {0} },
@@ -1052,8 +1053,8 @@ static Key keys[] = {
@@ -1078,8 +1079,8 @@ static Key keys[] = {
{ MODKEY, XK_0, view, {.ui = ~SPTAGMASK } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~SPTAGMASK } },
#else
@ -44,7 +44,7 @@ index 6fb1ff4..147f110 100644
#endif // SCRATCHPAD_ALT_1_PATCH
{ MODKEY|ControlMask, XK_j, focusmon, {.i = -1 } },
{ MODKEY|ControlMask, XK_k, focusmon, {.i = +1 } },
@@ -1496,7 +1497,9 @@ static Signal signals[] = {
@@ -1522,7 +1523,9 @@ static Signal signals[] = {
/* trigger signals using `xsetroot -name "fsignal:<signum>"` */
static Signal signals[] = {
/* signum function argument */
@ -56,7 +56,7 @@ index 6fb1ff4..147f110 100644
#endif // DWMC_PATCH
diff --git a/patches.def.h b/patches.def.h
index fb93871..fcf8e1e 100644
index 9c50442..c195cdb 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -440,7 +440,7 @@

View File

@ -1,4 +1,4 @@
From 4b8ad296cd799440050eeaa66854c3d9205d4f3d Mon Sep 17 00:00:00 2001
From 8a2949f488e9bb7d49f7d774e7dcd30f7abb6495 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 1 Apr 2021 20:27:49 +0200
Subject: [PATCH 04/26] edit cyclelayout keybinding
@ -8,10 +8,10 @@ Subject: [PATCH 04/26] edit cyclelayout keybinding
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/config.def.h b/config.def.h
index 147f110..3378fab 100644
index 59cb63a..d124c1c 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1012,8 +1012,8 @@ static Key keys[] = {
@@ -1034,8 +1034,8 @@ static Key keys[] = {
{ MODKEY|Mod5Mask|Mod1Mask, XK_Tab, rotatelayoutaxis, {.i = -4 } }, /* flextile, 4 = secondary stack axis */
{ MODKEY|ControlMask, XK_Return, mirrorlayout, {0} }, /* flextile, flip master and stack areas */
#endif // FLEXTILE_DELUXE_LAYOUT
@ -22,7 +22,7 @@ index 147f110..3378fab 100644
#if MAXIMIZE_PATCH
{ MODKEY|ControlMask|ShiftMask, XK_h, togglehorizontalmax, {0} },
{ MODKEY|ControlMask|ShiftMask, XK_l, togglehorizontalmax, {0} },
@@ -1196,8 +1196,8 @@ static Key keys[] = {
@@ -1222,8 +1222,8 @@ static Key keys[] = {
{ MODKEY|ControlMask, XK_numbersign, setborderpx, {.i = 0 } },
#endif // SETBORDERPX_PATCH
#if CYCLELAYOUTS_PATCH

View File

@ -1,4 +1,4 @@
From 4ff89f8015868c02dd7ea7754f6a5a44f5ed82be Mon Sep 17 00:00:00 2001
From e4a442abf972dd290b8b6dc60be8e81876c0a86c Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Wed, 21 Apr 2021 23:19:07 +0200
Subject: [PATCH 05/26] I don't think this argument is required
@ -8,10 +8,10 @@ Subject: [PATCH 05/26] I don't think this argument is required
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.def.h b/config.def.h
index 3378fab..c40fbb5 100644
index d124c1c..2f293f8 100644
--- a/config.def.h
+++ b/config.def.h
@@ -814,8 +814,8 @@ static const char *dmenucmd[] = {
@@ -836,8 +836,8 @@ static const char *dmenucmd[] = {
NULL
};
static const char *termcmd[] = { "st", NULL };

View File

@ -1,4 +1,4 @@
From 4d2f2055fa38b4cc6546c558f8706c6d75c36812 Mon Sep 17 00:00:00 2001
From 1d8cb3de97c8ec537a4e34d0e319e35c84f15eaa Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Wed, 21 Apr 2021 23:36:07 +0200
Subject: [PATCH 06/26] decomment libraries used by enabled patches

View File

@ -1,4 +1,4 @@
From 1afda29caed01f66fed3bcd5838b6228221ede70 Mon Sep 17 00:00:00 2001
From 3b27ae783576361432032c1aec8df6ba2a539e36 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Sat, 24 Apr 2021 15:02:45 +0200
Subject: [PATCH 07/26] runsvdir on startup
@ -8,10 +8,10 @@ Subject: [PATCH 07/26] runsvdir on startup
1 file changed, 1 insertion(+)
diff --git a/config.def.h b/config.def.h
index c40fbb5..55d1832 100644
index 2f293f8..c8acd30 100644
--- a/config.def.h
+++ b/config.def.h
@@ -347,6 +347,7 @@ static const char *layoutmenu_cmd = "layoutmenu.sh";
@@ -367,6 +367,7 @@ static const char *layoutmenu_cmd = "layoutmenu.sh";
#if COOL_AUTOSTART_PATCH
static const char *const autostart[] = {
"dwmblocks", NULL,

View File

@ -1,4 +1,4 @@
From af8e2a984cca8688d6146e47cb98b6b398b2df52 Mon Sep 17 00:00:00 2001
From ede1c5b01ad7e77189ecf213fc199995cf481b06 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 14 May 2021 19:58:33 +0200
Subject: [PATCH 08/26] browser config
@ -9,10 +9,10 @@ Subject: [PATCH 08/26] browser config
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/config.def.h b/config.def.h
index 55d1832..43772e0 100644
index c8acd30..c73e40e 100644
--- a/config.def.h
+++ b/config.def.h
@@ -437,6 +437,7 @@ static const Rule rules[] = {
@@ -459,6 +459,7 @@ static const Rule rules[] = {
RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1)
RULE(.wintype = WTYPE "SPLASH", .isfloating = 1)
RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1)
@ -20,7 +20,7 @@ index 55d1832..43772e0 100644
RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0)
RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0)
RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1)
@@ -1219,7 +1220,7 @@ static Key keys[] = {
@@ -1245,7 +1246,7 @@ static Key keys[] = {
{ MODKEY, XK_Left, spawn, SHCMD("backlight - 5") },
{ MODKEY, XK_Right, spawn, SHCMD("backlight + 5") },
{ MODKEY|ShiftMask, XK_d, spawn, SHCMD("discord") },
@ -30,10 +30,10 @@ index 55d1832..43772e0 100644
{ MODKEY, XK_v, spawn, SHCMD("st -e vid") },
{ MODKEY, XK_n, spawn, SHCMD("st -e newsboat") },
diff --git a/patches.def.h b/patches.def.h
index fcf8e1e..3d7b39f 100644
index c195cdb..c0c782a 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -1223,7 +1223,7 @@
@@ -1247,7 +1247,7 @@
* or Google-chrome "browser" vs "pop-up".
* https://github.com/bakkeby/patches/blob/master/dwm/dwm-windowrolerule-6.2.diff
*/

View File

@ -1,4 +1,4 @@
From 7bb2c8c28b9d0f45690c5f6b779802d057478cac Mon Sep 17 00:00:00 2001
From 22be898cf31df1f6e670be81258e6ed16e1f11a9 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 14 May 2021 20:04:15 +0200
Subject: [PATCH 09/26] discord window rules
@ -8,10 +8,10 @@ Subject: [PATCH 09/26] discord window rules
1 file changed, 2 insertions(+)
diff --git a/config.def.h b/config.def.h
index 43772e0..a156b91 100644
index c73e40e..d07511f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -436,6 +436,8 @@ static const Rule rules[] = {
@@ -458,6 +458,8 @@ static const Rule rules[] = {
RULE(.wintype = WTYPE "UTILITY", .isfloating = 1)
RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1)
RULE(.wintype = WTYPE "SPLASH", .isfloating = 1)

View File

@ -1,4 +1,4 @@
From 616f3903df6f3d06b6782df51226ecc7990cbf05 Mon Sep 17 00:00:00 2001
From 9b9e394dec9b9114fcdd46e76e942fa014c684c2 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 14 May 2021 20:08:27 +0200
Subject: [PATCH 10/26] apply one rule patch
@ -8,7 +8,7 @@ Subject: [PATCH 10/26] apply one rule patch
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches.def.h b/patches.def.h
index 3d7b39f..3940626 100644
index c0c782a..dce12ed 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -802,7 +802,7 @@

View File

@ -1,4 +1,4 @@
From 6dc0a432a9fd282035836876918c60f2641635d7 Mon Sep 17 00:00:00 2001
From c00549918be8ee876b01eff618da2235303d90bd Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Sun, 20 Jun 2021 18:13:17 +0200
Subject: [PATCH 11/26] add agordejo rule
@ -8,10 +8,10 @@ Subject: [PATCH 11/26] add agordejo rule
1 file changed, 1 insertion(+)
diff --git a/config.def.h b/config.def.h
index a156b91..54437fa 100644
index d07511f..fea9b01 100644
--- a/config.def.h
+++ b/config.def.h
@@ -441,6 +441,7 @@ static const Rule rules[] = {
@@ -463,6 +463,7 @@ static const Rule rules[] = {
RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1)
RULE(.role = "browser", .tags = 1 << 7, .switchtag = 1)
RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0)

View File

@ -1,4 +1,4 @@
From 6c16f82292dde613a732388fe9d2933b83ca92d0 Mon Sep 17 00:00:00 2001
From 5ad5318c5a20cf7403fdab32022db6388af2d78d Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Sat, 25 Sep 2021 14:36:07 +0200
Subject: [PATCH 12/26] start easyeffects on tag 9
@ -8,10 +8,10 @@ Subject: [PATCH 12/26] start easyeffects on tag 9
1 file changed, 1 insertion(+)
diff --git a/config.def.h b/config.def.h
index 54437fa..64fe003 100644
index fea9b01..8b51ca2 100644
--- a/config.def.h
+++ b/config.def.h
@@ -441,6 +441,7 @@ static const Rule rules[] = {
@@ -463,6 +463,7 @@ static const Rule rules[] = {
RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1)
RULE(.role = "browser", .tags = 1 << 7, .switchtag = 1)
RULE(.class = "Ardour", .tags = 1 << 8, .monitor = 0)

View File

@ -1,4 +1,4 @@
From 29ca58969c2ebe085e020d0b67c76ad857e3e554 Mon Sep 17 00:00:00 2001
From 5e6c851294570cdd7907070bde1e76830e9144dd Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 25 Nov 2021 01:15:38 +0100
Subject: [PATCH 13/26] set carla to tag 9
@ -8,10 +8,10 @@ Subject: [PATCH 13/26] set carla to tag 9
1 file changed, 1 insertion(+)
diff --git a/config.def.h b/config.def.h
index 64fe003..9741a9e 100644
index 8b51ca2..817041a 100644
--- a/config.def.h
+++ b/config.def.h
@@ -440,6 +440,7 @@ static const Rule rules[] = {
@@ -462,6 +462,7 @@ static const Rule rules[] = {
RULE(.class = "lightcord", .tags = 1 << 0, .switchtag = 1, .monitor = 0)
RULE(.class = "Firefox", .tags = 1 << 7, .switchtag = 1)
RULE(.role = "browser", .tags = 1 << 7, .switchtag = 1)

View File

@ -1,4 +1,4 @@
From 84a1bb4a5dd79de2b152c95149eb43f3756fa014 Mon Sep 17 00:00:00 2001
From b9b0de722ee6c03c5cfb1107488d91cc2528402d Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Wed, 22 Dec 2021 00:00:07 +0100
Subject: [PATCH 14/26] set dmenucmd to rofi
@ -8,10 +8,10 @@ Subject: [PATCH 14/26] set dmenucmd to rofi
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/config.def.h b/config.def.h
index 9741a9e..a105d88 100644
index 817041a..815e48f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -806,19 +806,7 @@ static const char *xkb_layouts[] = {
@@ -828,19 +828,7 @@ static const char *xkb_layouts[] = {
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
#endif // NODMENU_PATCH
static const char *dmenucmd[] = {

View File

@ -1,4 +1,4 @@
From 404f34a61723b8c4ead4abdf67d0dbdb553b55a5 Mon Sep 17 00:00:00 2001
From d02ba45bd7803f63614be483b4521c22cfd60101 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Wed, 20 Apr 2022 13:30:35 +0200
Subject: [PATCH 15/26] enable no border patch
@ -8,7 +8,7 @@ Subject: [PATCH 15/26] enable no border patch
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches.def.h b/patches.def.h
index 3940626..f36a391 100644
index dce12ed..01a61e9 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -762,7 +762,7 @@

View File

@ -1,4 +1,4 @@
From 6b58c6fe96d40dd24812a789d53555df6ac03af2 Mon Sep 17 00:00:00 2001
From ccb5af564dad912b548b86991dae0f808c3d2d73 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Wed, 20 Apr 2022 13:52:04 +0200
Subject: [PATCH 16/26] force swallow from alacritty
@ -8,10 +8,10 @@ Subject: [PATCH 16/26] force swallow from alacritty
1 file changed, 1 insertion(+)
diff --git a/config.def.h b/config.def.h
index a105d88..2463bc0 100644
index 815e48f..dbb0d47 100644
--- a/config.def.h
+++ b/config.def.h
@@ -446,6 +446,7 @@ static const Rule rules[] = {
@@ -468,6 +468,7 @@ static const Rule rules[] = {
RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0)
RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0)
RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1)

View File

@ -1,4 +1,4 @@
From 93a6397a782fb703cea6a4d90bb22a36cd9502de Mon Sep 17 00:00:00 2001
From 22ae928bb34fe5d1fc770bf675bfbdcf4f7ccf9e Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Wed, 20 Apr 2022 18:18:33 +0200
Subject: [PATCH 17/26] remove browser rules and add permanent
@ -9,10 +9,10 @@ Subject: [PATCH 17/26] remove browser rules and add permanent
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/config.def.h b/config.def.h
index 2463bc0..6128503 100644
index dbb0d47..97226f8 100644
--- a/config.def.h
+++ b/config.def.h
@@ -436,14 +436,10 @@ static const Rule rules[] = {
@@ -458,14 +458,10 @@ static const Rule rules[] = {
RULE(.wintype = WTYPE "UTILITY", .isfloating = 1)
RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1)
RULE(.wintype = WTYPE "SPLASH", .isfloating = 1)
@ -32,7 +32,7 @@ index 2463bc0..6128503 100644
RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1)
RULE(.class = "Alacritty", .isterminal = 1)
diff --git a/patches.def.h b/patches.def.h
index f36a391..8dd9b72 100644
index 01a61e9..b2082fe 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -679,7 +679,7 @@

View File

@ -1,4 +1,4 @@
From 18a1239defc4dbfad324582ef9040c2aa918bb86 Mon Sep 17 00:00:00 2001
From 75eefd66d379c26925f147e9d4f8d1054d36b3e3 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Wed, 20 Apr 2022 19:13:43 +0200
Subject: [PATCH 18/26] sendmon: keeptag patch
@ -9,11 +9,11 @@ Subject: [PATCH 18/26] sendmon: keeptag patch
2 files changed, 6 insertions(+)
diff --git a/dwm.c b/dwm.c
index 9f70675..fa00ebb 100644
index 8d8ca19..6b66f77 100644
--- a/dwm.c
+++ b/dwm.c
@@ -3198,11 +3198,13 @@ sendmon(Client *c, Monitor *m)
#if SCRATCHPADS_PATCH
@@ -3268,11 +3268,13 @@ sendmon(Client *c, Monitor *m)
#if SCRATCHPADS_PATCH && !RENAMED_SCRATCHPADS_PATCH
if (!(c->tags & SPTAGMASK))
#endif // SCRATCHPADS_PATCH
+ #if !SENDMON_KEEPTAGS
@ -27,10 +27,10 @@ index 9f70675..fa00ebb 100644
attachx(c);
#else
diff --git a/patches.def.h b/patches.def.h
index 8dd9b72..2517801 100644
index b2082fe..ee260d0 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -939,6 +939,10 @@
@@ -963,6 +963,10 @@
*/
#define SENDMON_KEEPFOCUS_PATCH 0

View File

@ -1,4 +1,4 @@
From e34c9fc0ba04425d22345161a206f9b4c6960e89 Mon Sep 17 00:00:00 2001
From 26007412a42b5513ef4967a6754329f9b706caed Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Wed, 20 Apr 2022 19:31:59 +0200
Subject: [PATCH 19/26] taglabels
@ -8,7 +8,7 @@ Subject: [PATCH 19/26] taglabels
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/patches.def.h b/patches.def.h
index 2517801..3d89feb 100644
index ee260d0..980d862 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -153,12 +153,12 @@

View File

@ -1,4 +1,4 @@
From 30103e0c46d39def5182fdc66993ba528ca4110a Mon Sep 17 00:00:00 2001
From f88cf9c46ac1616e5abe4846c97a6edb0fd9b87d Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Wed, 20 Apr 2022 20:26:55 +0200
Subject: [PATCH 20/26] better taglabels
@ -10,7 +10,7 @@ Subject: [PATCH 20/26] better taglabels
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/config.def.h b/config.def.h
index 6128503..156c5f7 100644
index 97226f8..a291b34 100644
--- a/config.def.h
+++ b/config.def.h
@@ -92,8 +92,8 @@ static const unsigned int systrayspacing = 2; /* systray spacing */
@ -24,7 +24,7 @@ index 6128503..156c5f7 100644
static const int lcaselbl = 0; /* 1 means make tag label lowercase */
#endif // BAR_TAGLABELS_PATCH
#if BAR_UNDERLINETAGS_PATCH
@@ -442,7 +442,9 @@ static const Rule rules[] = {
@@ -464,7 +464,9 @@ static const Rule rules[] = {
RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0, .ispermanent = 1)
RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0)
RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1)
@ -36,10 +36,10 @@ index 6128503..156c5f7 100644
RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1)
#endif // SCRATCHPADS_PATCH
diff --git a/dwm.c b/dwm.c
index fa00ebb..5a61cf8 100644
index 6b66f77..bb0ad84 100644
--- a/dwm.c
+++ b/dwm.c
@@ -327,6 +327,7 @@ struct XkbInfo {
@@ -339,6 +339,7 @@ struct XkbInfo {
typedef struct Client Client;
struct Client {
char name[256];
@ -47,7 +47,7 @@ index fa00ebb..5a61cf8 100644
float mina, maxa;
#if CFACTS_PATCH
float cfact;
@@ -506,6 +507,7 @@ typedef struct {
@@ -524,6 +525,7 @@ typedef struct {
#endif // WINDOWROLERULE_PATCH
const char *instance;
const char *title;
@ -55,17 +55,17 @@ index fa00ebb..5a61cf8 100644
const char *wintype;
unsigned int tags;
#if SWITCHTAG_PATCH
@@ -840,6 +842,9 @@ applyrules(Client *c)
@@ -866,6 +868,9 @@ applyrules(Client *c)
class = ch.res_class ? ch.res_class : broken;
instance = ch.res_name ? ch.res_name : broken;
wintype = getatomprop(c, netatom[NetWMWindowType]);
wintype = getatomprop(c, netatom[NetWMWindowType], XA_ATOM);
+
+ snprintf(c->label, 48, "%s", class);
+
#if WINDOWROLERULE_PATCH
gettextprop(c->win, wmatom[WMWindowRole], role, sizeof(role));
#endif // WINDOWROLERULE_PATCH
@@ -859,6 +864,8 @@ applyrules(Client *c)
@@ -885,6 +890,8 @@ applyrules(Client *c)
&& (!r->instance || strstr(instance, r->instance))
&& (!r->wintype || wintype == XInternAtom(dpy, r->wintype, False)))
{

View File

@ -1,4 +1,4 @@
From 83ead15ffb619d19db900bb76c0ff4e1c1ec9f89 Mon Sep 17 00:00:00 2001
From 35b51f815d0bd35857893dfb4b5e785dc786d5d8 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 21 Apr 2022 01:55:12 +0200
Subject: [PATCH 21/26] no swallow syncplay mpv
@ -8,10 +8,10 @@ Subject: [PATCH 21/26] no swallow syncplay mpv
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h
index 156c5f7..49dc7dd 100644
index a291b34..45e7fc7 100644
--- a/config.def.h
+++ b/config.def.h
@@ -441,7 +441,7 @@ static const Rule rules[] = {
@@ -463,7 +463,7 @@ static const Rule rules[] = {
RULE(.class = "easyeffects", .tags = 1 << 8, .monitor = 0, .ispermanent = 1)
RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0, .ispermanent = 1)
RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0)

View File

@ -1,4 +1,4 @@
From 685aa555d1d45dc4f83010b8130bd8647be0c000 Mon Sep 17 00:00:00 2001
From 605a4465e5d416fbad2c305a78ae04f0b4add3db Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 21 Apr 2022 13:39:36 +0200
Subject: [PATCH 22/26] add thunderbird and ardour labels
@ -8,10 +8,10 @@ Subject: [PATCH 22/26] add thunderbird and ardour labels
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h
index 49dc7dd..8545d82 100644
index 45e7fc7..68220d5 100644
--- a/config.def.h
+++ b/config.def.h
@@ -437,7 +437,7 @@ static const Rule rules[] = {
@@ -459,7 +459,7 @@ static const Rule rules[] = {
RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1)
RULE(.wintype = WTYPE "SPLASH", .isfloating = 1)
RULE(.class = "Carla2", .tags = 1 << 8, .monitor = 0, .switchtag = 0, .ispermanent = 1)
@ -20,7 +20,7 @@ index 49dc7dd..8545d82 100644
RULE(.class = "easyeffects", .tags = 1 << 8, .monitor = 0, .ispermanent = 1)
RULE(.class = "Agordejo", .tags = 1 << 8, .monitor = 0, .ispermanent = 1)
RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0)
@@ -445,6 +445,7 @@ static const Rule rules[] = {
@@ -467,6 +467,7 @@ static const Rule rules[] = {
RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120")
RULE(.class = "Chromium-browser-chromium", .label = "\uf268")
RULE(.class = "firefox", .label = "\uf269")

View File

@ -1,4 +1,4 @@
From f0c01408a02cfb5ca8fd7948adea1bb3d1208650 Mon Sep 17 00:00:00 2001
From b7d4771a3c65d21ef6e34ce82d4590dd20464858 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 5 May 2022 17:29:55 +0200
Subject: [PATCH 23/26] use rofi run
@ -8,10 +8,10 @@ Subject: [PATCH 23/26] use rofi run
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h
index 8545d82..5366375 100644
index 68220d5..4fa056f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -806,7 +806,7 @@ static const char *xkb_layouts[] = {
@@ -828,7 +828,7 @@ static const char *xkb_layouts[] = {
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
#endif // NODMENU_PATCH
static const char *dmenucmd[] = {

View File

@ -1,4 +1,4 @@
From 5f78d8bce9e71cd3c296eb3438b97f862fe8e317 Mon Sep 17 00:00:00 2001
From d691b5401b22bb8a910f9fd5034a5a3beaa480f9 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 26 May 2022 22:32:57 +0200
Subject: [PATCH 24/26] add st as terminal
@ -8,10 +8,10 @@ Subject: [PATCH 24/26] add st as terminal
1 file changed, 1 insertion(+)
diff --git a/config.def.h b/config.def.h
index 5366375..bdb0d22 100644
index 4fa056f..edd71ed 100644
--- a/config.def.h
+++ b/config.def.h
@@ -443,6 +443,7 @@ static const Rule rules[] = {
@@ -465,6 +465,7 @@ static const Rule rules[] = {
RULE(.class = "qBittorrent", .tags = 1 << 6, .switchtag = 1, .monitor = 0)
RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1, .noswallow = 1)
RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120")

View File

@ -1,4 +1,4 @@
From fc248a3e01d1930e884ba32b82fa9ef966b42793 Mon Sep 17 00:00:00 2001
From 66466df4143fb47789e03b7ad182b7fdd256bf6d Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Mon, 30 May 2022 01:53:40 +0200
Subject: [PATCH 25/26] add discord icon ig
@ -8,10 +8,10 @@ Subject: [PATCH 25/26] add discord icon ig
1 file changed, 1 insertion(+)
diff --git a/config.def.h b/config.def.h
index bdb0d22..86ad4d6 100644
index edd71ed..7357e1e 100644
--- a/config.def.h
+++ b/config.def.h
@@ -444,6 +444,7 @@ static const Rule rules[] = {
@@ -466,6 +466,7 @@ static const Rule rules[] = {
RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1, .noswallow = 1)
RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120")
RULE(.class = "st-256color", .isterminal = 1, .label = "\uf120")

View File

@ -1,4 +1,4 @@
From f25e65031d6dbdb01a4fd209ff2f75be92526a75 Mon Sep 17 00:00:00 2001
From f9e06fc11fb2839c3a170af7a504552c50d793a7 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 2 Jun 2022 16:00:25 +0200
Subject: [PATCH 26/26] set correct fontawesome discord character
@ -8,10 +8,10 @@ Subject: [PATCH 26/26] set correct fontawesome discord character
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h
index 86ad4d6..74537af 100644
index 7357e1e..88c801e 100644
--- a/config.def.h
+++ b/config.def.h
@@ -444,7 +444,7 @@ static const Rule rules[] = {
@@ -466,7 +466,7 @@ static const Rule rules[] = {
RULE(.class = "mpv", .instance = "syncplay-mpv", .monitor = 1, .noswallow = 1)
RULE(.class = "Alacritty", .isterminal = 1, .label = "\uf120")
RULE(.class = "st-256color", .isterminal = 1, .label = "\uf120")