Merge remote-tracking branch 'upstream/master'

- Combine spotify and podcast tags into single audio tag
- Create new media/video tag
- Add window rules / update tag for bunch of applications

README.org

@@ -1150,7 +1150,6 @@ Awesomebar takes precedence over fancybar.
 
 https://dwm.suckless.org/patches/awesomebar/
 
-
 #+BEGIN_SRC c :tangle patches.def.h
 #define BAR_AWESOMEBAR_PATCH 0
 #+END_SRC
@@ -1682,6 +1681,8 @@ This patch adds back in the workaround for a BadLength error in the Xft library
 
 *** Padding
 
+**** Main
+
 This patch adds vertical and horizontal space between the statusbar and the edge of the screen.
 
 https://dwm.suckless.org/patches/barpadding/
@@ -1690,6 +1691,22 @@ https://dwm.suckless.org/patches/barpadding/
 #define BAR_PADDING_PATCH 0
 #+END_SRC
 
+**** Vanity Gaps
+
+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.
+
+#+BEGIN_SRC c :tangle patches.def.h
+#define BAR_PADDING_VANITYGAPS_PATCH 0
+#+END_SRC
+
+**** Smart
+
+Smart bar padding patch that automatically adjusts the padding when there is only one client on the monitor. Works well with vanitygaps and barpadding patches.
+
+#+BEGIN_SRC c :tangle patches.def.h
+#define BAR_PADDING_SMART_PATCH 0
+#+END_SRC
+
 *** Pango
 
 This patch adds simple markup for status messages using pango markup.
@@ -4250,7 +4267,7 @@ static char *tagicons[][NUMTAGS] =
 #endif // NAMETAG_PATCH
 {
         /* [DEFAULT_TAGS]        = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }, */
-        [DEFAULT_TAGS]        = { "󰍩 ₁", "󰗚 ₂", " ₃", " ₄", "󰖟 ₅", " ₆", "󰊢 ₇", " ₈", " ₉" },
+        [DEFAULT_TAGS]        = { "󰍩 ₁", "󰠮 ₂", " ₃", "󰿎 ₄", "󰖟 ₅", " ₆", "󰊢 ₇", "󰊖 ₈", " ₉" },
         [ALTERNATIVE_TAGS]    = { "A", "B", "C", "D", "E", "F", "G", "H", "I" },
         [ALT_TAGS_DECORATION] = { "<1>", "<2>", "<3>", "<4>", "<5>", "<6>", "<7>", "<8>", "<9>" },
 };
@@ -4315,10 +4332,24 @@ static const Rule rules[] = {
         RULE(.class = "Beeper", .tags = 1 << 0)
         RULE(.class = "Signal", .tags = 1 << 0)
         RULE(.class = "discord", .tags = 1 << 0)
+        RULE(.class = "zoom", .tags = 1 << 0)
         RULE(.class = "Logseq", .tags = 1 << 1)
+        RULE(.class = "obsidian", .tags = 1 << 1)
         RULE(.class = "anytype", .tags = 1 << 1)
         RULE(.class = "pocket-casts-linux", .tags = 1 << 2)
-        RULE(.class = "Spotify", .tags = 1 << 3)
+        RULE(.class = "Spotify", .tags = 1 << 2)
+        RULE(.class = "Pavucontrol", .tags = 1 << 2)
+        RULE(.class = "easyeffects", .tags = 1 << 2)
+        RULE(.class = "NoiseTorch", .tags = 1 << 2)
+        RULE(.class = "Audacity", .tags = 1 << 2)
+        RULE(.class = "mpv", .tags = 1 << 3)
+        RULE(.class = "vlc", .tags = 1 << 3)
+        RULE(.class = "Ristretto", .tags = 1 << 3)
+        RULE(.class = "trackma-qt", .tags = 1 << 3)
+        RULE(.class = "Trackma-gtk", .tags = 1 << 3)
+        RULE(.class = "obs", .tags = 1 << 3)
+        RULE(.class = "kdenlive", .tags = 1 << 3)
+        RULE(.class = "Blender", .tags = 1 << 3)
         RULE(.class = "Vivaldi-stable", .tags = 1 << 4)
         RULE(.class = "kitty", .tags = 1 << 5, .isterminal = 1)
         RULE(.class = "Emacs", .tags = 1 << 6)
@@ -4327,12 +4358,11 @@ static const Rule rules[] = {
         RULE(.title = "Steam", .tags = 1 << 7)
         RULE(.class = "Lutris", .tags = 1 << 7)
         RULE(.class = "gamescope", .tags = 1 << 7)
+        RULE(.class = "Oversteer", .tags = 1 << 7)
+        RULE(.class = "PrismLauncher", .tags = 1 << 7)
+        RULE(.class = "antimicrox", .tags = 1 << 7)
+        RULE(.class = "ProtonUp-Qt", .tags = 1 << 7)
         RULE(.class = "Thunar", .tags = 1 << 8)
-        RULE(.class = "trackma", .tags = 1 << 8)
-        RULE(.class = "Trackma-gtk", .tags = 1 << 8)
-        RULE(.class = "obs", .tags = 1 << 8)
-        RULE(.class = "NoiseTorch", .tags = 1 << 8)
-        RULE(.class = "kdenlive", .tags = 1 << 8)
         RULE(.class = "Syncthing GTK", .tags = 1 << 8)
         RULE(.class = "Nyrna", .tags = 1 << 8)
         RULE(.class = "openrgb", .tags = 1 << 8)
@@ -5827,7 +5857,7 @@ yellow                    = ${xrdb:color3:#F1FA8C}
 green                     = ${xrdb:color2:#50FA7B}
 orange                    = ${xrdb:color16:#FFB86C}
 
-background                = ${self.dark-gray}
+background                = #CC282A36
 background-alt            = ${self.light-gray}
 foreground                = ${self.white}
 foreground-alt            = ${self.lighter-gray}
@@ -5836,8 +5866,8 @@ secondary                 = ${self.blue}
 alert                     = ${self.red}
 
 ; left
-powermenu-foreground      = ${self.background}
-powermenu-background      = ${self.blue}
+powermenu-foreground      = ${self.blue}
+powermenu-background      = ${self.background}
 powermenu-underline       = ${self.background}
 powermenu-overline        = ${self.background}
 
@@ -5881,8 +5911,8 @@ dwm-empty-background      = ${self.background}
 dwm-empty-underline       = ${self.background}
 dwm-empty-overline        = ${self.background}
 
-media-playing-foreground  = ${self.background}
-media-playing-background  = ${self.green}
+media-playing-foreground  = ${self.green}
+media-playing-background  = ${self.background}
 media-playing-underline   = ${self.background}
 media-playing-overline    = ${self.background}
 
@@ -5890,43 +5920,43 @@ media-playing-overline    = ${self.background}
 tray-background           = ${self.background}
 
 ; right
-kernel-foreground         = ${self.background}
-kernel-background         = ${self.orange}
+kernel-foreground         = ${self.orange}
+kernel-background         = ${self.background}
 kernel-underline          = ${self.background}
 kernel-overline           = ${self.background}
 
-cpu-foreground            = ${self.background}
-cpu-background            = ${self.purple}
+cpu-foreground            = ${self.purple}
+cpu-background            = ${self.background}
 cpu-underline             = ${self.background}
 cpu-overline              = ${self.background}
 
-memory-foreground         = ${self.background}
-memory-background         = ${self.blue}
+memory-foreground         = ${self.blue}
+memory-background         = ${self.background}
 memory-underline          = ${self.background}
 memory-overline           = ${self.background}
 
-filesystem-foreground     = ${self.background}
-filesystem-background     = ${self.pink}
+filesystem-foreground     = ${self.pink}
+filesystem-background     = ${self.background}
 filesystem-underline      = ${self.background}
 filesystem-overline       = ${self.background}
 
-date-foreground           = ${self.background}
-date-background           = ${self.yellow}
+date-foreground           = ${self.yellow}
+date-background           = ${self.background}
 date-underline            = ${self.background}
 date-overline             = ${self.background}
 
-time-foreground           = ${self.background}
-time-background           = ${self.purple}
+time-foreground           = ${self.purple}
+time-background           = ${self.background}
 time-underline            = ${self.background}
 time-overline             = ${self.background}
 
-deadd-notification-center-foreground = ${self.background}
-deadd-notification-center-background = ${self.green}
+deadd-notification-center-foreground = ${self.green}
+deadd-notification-center-background = ${self.background}
 deadd-notification-center-underline  = ${self.background}
 deadd-notification-center-overline   = ${self.background}
 
-volume-foreground           = ${self.background}
-volume-background           = ${self.red}
+volume-foreground           = ${self.red}
+volume-background           = ${self.background}
 volume-underline            = ${self.background}
 volume-overline             = ${self.background}
 #+END_SRC
@@ -6052,8 +6082,8 @@ radius = 10.0
 ; Individual values can be defined using:
 ;   {overline,underline}-size
 ;   {overline,underline}-color
-overline-size  = 4
-underline-size = 4
+overline-size  = 0
+underline-size = 0
 
 ; Values applied to all borders
 ; Individual side values can be defined using:
@@ -6213,7 +6243,7 @@ cursor-scroll = ns-resize
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/powermenu-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.powermenu-background}
 content-underline  = ${colors.powermenu-underline}
 content-overline   = ${colors.powermenu-overline}
@@ -6223,7 +6253,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/powermenu-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.powermenu-background}
 content-underline  = ${colors.powermenu-underline}
 content-overline   = ${colors.powermenu-overline}
@@ -6373,7 +6403,7 @@ label-empty-padding    = ${sizes.module-dwm-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/media-playing-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.media-playing-background}
 content-underline  = ${colors.media-playing-underline}
 content-overline   = ${colors.media-playing-overline}
@@ -6383,7 +6413,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/media-playing-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.media-playing-background}
 content-underline  = ${colors.media-playing-underline}
 content-overline   = ${colors.media-playing-overline}
@@ -6563,7 +6593,7 @@ wait
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/date-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.date-background}
 content-underline  = ${colors.date-underline}
 content-overline   = ${colors.date-overline}
@@ -6573,7 +6603,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/date-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.date-background}
 content-underline  = ${colors.date-underline}
 content-overline   = ${colors.date-overline}
@@ -6608,7 +6638,7 @@ format = <label>
 ;   %date%
 ;   %time%
 ; Default: %date%
-label = " %date%"
+label = " %date%"
 ; label-font = 3
 label-foreground = ${colors.date-foreground}
 label-background = ${colors.date-background}
@@ -6622,7 +6652,7 @@ label-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/time-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.time-background}
 content-underline  = ${colors.time-underline}
 content-overline   = ${colors.time-overline}
@@ -6632,7 +6662,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/time-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.time-background}
 content-underline  = ${colors.time-underline}
 content-overline   = ${colors.time-overline}
@@ -6681,7 +6711,7 @@ label-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/kernel-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.kernel-background}
 content-underline  = ${colors.kernel-underline}
 content-overline   = ${colors.kernel-overline}
@@ -6691,7 +6721,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/kernel-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.kernel-background}
 content-underline  = ${colors.kernel-underline}
 content-overline   = ${colors.kernel-overline}
@@ -6761,7 +6791,7 @@ label-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/cpu-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.cpu-background}
 content-underline  = ${colors.cpu-underline}
 content-overline   = ${colors.cpu-overline}
@@ -6771,7 +6801,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/cpu-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.cpu-background}
 content-underline  = ${colors.cpu-underline}
 content-overline   = ${colors.cpu-overline}
@@ -6798,7 +6828,7 @@ format = %{A1:kitty btop:}<label>%{A}
 ;   %percentage-sum% - Cumulative load on all cores
 ;   %percentage-cores% - load percentage for each core
 ;   %percentage-core[1-9]% - load percentage for specific core
-label =  %percentage%%
+label =  %percentage%%
 label-padding    = ${sizes.module-padding}
 label-foreground = ${colors.cpu-foreground}
 label-background = ${colors.cpu-background}
@@ -6823,7 +6853,7 @@ ramp-coreload-foreground = ${colors.cpu}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/memory-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.memory-background}
 content-underline  = ${colors.memory-underline}
 content-overline   = ${colors.memory-overline}
@@ -6833,7 +6863,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/memory-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.memory-background}
 content-underline  = ${colors.memory-underline}
 content-overline   = ${colors.memory-overline}
@@ -6878,7 +6908,7 @@ format = %{A1:kitty btop:}<label>%{A}
 ;   %gb_swap_free%
 ;   %gb_swap_used%
 
-label = 󰍛 %percentage_used%%
+label =   %percentage_used%%
 label-padding    = ${sizes.module-padding}
 label-foreground = ${colors.memory-foreground}
 label-background = ${colors.memory-background}
@@ -6924,7 +6954,7 @@ ramp-free-foreground = ${colors.memory}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/filesystem-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.filesystem-background}
 content-underline  = ${colors.filesystem-underline}
 content-overline   = ${colors.filesystem-overline}
@@ -6934,7 +6964,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/filesystem-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.filesystem-background}
 content-underline  = ${colors.filesystem-underline}
 content-overline   = ${colors.filesystem-overline}
@@ -7004,7 +7034,7 @@ label-unmounted-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/deadd-notification-center-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.deadd-notification-center-background}
 content-underline  = ${colors.deadd-notification-center-underline}
 content-overline   = ${colors.deadd-notification-center-overline}
@@ -7014,7 +7044,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/deadd-notification-center-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.deadd-notification-center-background}
 content-underline  = ${colors.deadd-notification-center-underline}
 content-overline   = ${colors.deadd-notification-center-overline}
@@ -7049,7 +7079,7 @@ click-right = "/home/sravan/.scripts/deadd.sh --rofi"
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/volume-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.volume-background}
 content-underline  = ${colors.volume-underline}
 content-overline   = ${colors.volume-overline}
@@ -7059,7 +7089,7 @@ content-padding    = ${sizes.module-padding}
 #+BEGIN_SRC conf :tangle polybar/config.ini
 [module/volume-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.volume-background}
 content-underline  = ${colors.volume-underline}
 content-overline   = ${colors.volume-overline}

config.def.h

@@ -449,7 +449,7 @@ static char *tagicons[][NUMTAGS] =
 #endif // NAMETAG_PATCH
 {
         /* [DEFAULT_TAGS]        = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }, */
-        [DEFAULT_TAGS]        = { "󰍩 ₁", "󰗚 ₂", " ₃", " ₄", "󰖟 ₅", " ₆", "󰊢 ₇", " ₈", " ₉" },
+        [DEFAULT_TAGS]        = { "󰍩 ₁", "󰠮 ₂", " ₃", "󰿎 ₄", "󰖟 ₅", " ₆", "󰊢 ₇", "󰊖 ₈", " ₉" },
         [ALTERNATIVE_TAGS]    = { "A", "B", "C", "D", "E", "F", "G", "H", "I" },
         [ALT_TAGS_DECORATION] = { "<1>", "<2>", "<3>", "<4>", "<5>", "<6>", "<7>", "<8>", "<9>" },
 };
@@ -477,10 +477,24 @@ static const Rule rules[] = {
         RULE(.class = "Beeper", .tags = 1 << 0)
         RULE(.class = "Signal", .tags = 1 << 0)
         RULE(.class = "discord", .tags = 1 << 0)
+        RULE(.class = "zoom", .tags = 1 << 0)
         RULE(.class = "Logseq", .tags = 1 << 1)
+        RULE(.class = "obsidian", .tags = 1 << 1)
         RULE(.class = "anytype", .tags = 1 << 1)
         RULE(.class = "pocket-casts-linux", .tags = 1 << 2)
-        RULE(.class = "Spotify", .tags = 1 << 3)
+        RULE(.class = "Spotify", .tags = 1 << 2)
+        RULE(.class = "Pavucontrol", .tags = 1 << 2)
+        RULE(.class = "easyeffects", .tags = 1 << 2)
+        RULE(.class = "NoiseTorch", .tags = 1 << 2)
+        RULE(.class = "Audacity", .tags = 1 << 2)
+        RULE(.class = "mpv", .tags = 1 << 3)
+        RULE(.class = "vlc", .tags = 1 << 3)
+        RULE(.class = "Ristretto", .tags = 1 << 3)
+        RULE(.class = "trackma-qt", .tags = 1 << 3)
+        RULE(.class = "Trackma-gtk", .tags = 1 << 3)
+        RULE(.class = "obs", .tags = 1 << 3)
+        RULE(.class = "kdenlive", .tags = 1 << 3)
+        RULE(.class = "Blender", .tags = 1 << 3)
         RULE(.class = "Vivaldi-stable", .tags = 1 << 4)
         RULE(.class = "kitty", .tags = 1 << 5, .isterminal = 1)
         RULE(.class = "Emacs", .tags = 1 << 6)
@@ -489,12 +503,11 @@ static const Rule rules[] = {
         RULE(.title = "Steam", .tags = 1 << 7)
         RULE(.class = "Lutris", .tags = 1 << 7)
         RULE(.class = "gamescope", .tags = 1 << 7)
+        RULE(.class = "Oversteer", .tags = 1 << 7)
+        RULE(.class = "PrismLauncher", .tags = 1 << 7)
+        RULE(.class = "antimicrox", .tags = 1 << 7)
+        RULE(.class = "ProtonUp-Qt", .tags = 1 << 7)
         RULE(.class = "Thunar", .tags = 1 << 8)
-        RULE(.class = "trackma", .tags = 1 << 8)
-        RULE(.class = "Trackma-gtk", .tags = 1 << 8)
-        RULE(.class = "obs", .tags = 1 << 8)
-        RULE(.class = "NoiseTorch", .tags = 1 << 8)
-        RULE(.class = "kdenlive", .tags = 1 << 8)
         RULE(.class = "Syncthing GTK", .tags = 1 << 8)
         RULE(.class = "Nyrna", .tags = 1 << 8)
         RULE(.class = "openrgb", .tags = 1 << 8)

dwm.c

@@ -688,6 +688,9 @@ static void maprequest(XEvent *e);
 static void motionnotify(XEvent *e);
 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
+#if NOBORDER_PATCH
+static int noborder(Client *c);
+#endif // NOBORDER_PATCH
 #if !ZOOMSWAP_PATCH || TAGINTOSTACK_ALLMASTER_PATCH || TAGINTOSTACK_ONEMASTER_PATCH
 static void pop(Client *c);
 #endif // !ZOOMSWAP_PATCH / TAGINTOSTACK_ALLMASTER_PATCH / TAGINTOSTACK_ONEMASTER_PATCH
@@ -1108,6 +1111,11 @@ arrange(Monitor *m)
 void
 arrangemon(Monitor *m)
 {
+	#if BAR_PADDING_SMART_PATCH
+	updatebarpos(selmon);
+	for (Bar *bar = selmon->bar; bar; bar = bar->next)
+		XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
+	#endif // BAR_PADDING_SMART_PATCH
 	#if TAB_PATCH
 	updatebarpos(m);
 	XMoveResizeWindow(dpy, m->tabwin, m->wx, m->ty, m->ww, th);
@@ -1461,6 +1469,15 @@ configure(Client *c)
 	ce.width = c->w;
 	ce.height = c->h;
 	ce.border_width = c->bw;
+
+	#if NOBORDER_PATCH
+	if (noborder(c)) {
+		ce.width += c->bw * 2;
+		ce.height += c->bw * 2;
+		ce.border_width = 0;
+	}
+	#endif // NOBORDER_PATCH
+
 	ce.above = None;
 	ce.override_redirect = False;
 	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
@@ -2857,6 +2874,52 @@ nexttiled(Client *c)
 	return c;
 }
 
+#if NOBORDER_PATCH
+int
+noborder(Client *c)
+{
+	int monocle_layout = 0;
+
+	#if MONOCLE_LAYOUT
+	if (&monocle == c->mon->lt[c->mon->sellt]->arrange)
+		monocle_layout = 1;
+	#endif // MONOCLE_LAYOUT
+
+	#if DECK_LAYOUT
+	if (&deck == c->mon->lt[c->mon->sellt]->arrange && c->mon->nmaster == 0)
+		monocle_layout = 1;
+	#endif // DECK_LAYOUT
+
+	#if FLEXTILE_DELUXE_LAYOUT
+	if (&flextile == c->mon->lt[c->mon->sellt]->arrange && (
+		(c->mon->ltaxis[LAYOUT] == NO_SPLIT && c->mon->ltaxis[MASTER] == MONOCLE) ||
+		(c->mon->ltaxis[STACK] == MONOCLE && c->mon->nmaster == 0)
+	)) {
+		monocle_layout = 1;
+	}
+	#endif //FLEXTILE_DELUXE_LAYOUT
+
+	if (!monocle_layout && (nexttiled(c->mon->clients) != c || nexttiled(c->next)))
+		return 0;
+
+	if (c->isfloating)
+		return 0;
+
+	if (!c->mon->lt[c->mon->sellt]->arrange)
+		return 0;
+
+	#if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
+	if (c->fakefullscreen != 1 && c->isfullscreen)
+		return 0;
+	#elif !FAKEFULLSCREEN_PATCH
+	if (c->isfullscreen)
+		return 0;
+	#endif // FAKEFULLSCREEN_CLIENT_PATCH
+
+	return 1;
+}
+#endif // NOBORDER_PATCH
+
 #if !ZOOMSWAP_PATCH || TAGINTOSTACK_ALLMASTER_PATCH || TAGINTOSTACK_ONEMASTER_PATCH
 void
 pop(Client *c)
@@ -3011,31 +3074,9 @@ resizeclient(Client *c, int x, int y, int w, int h)
 	drawroundedcorners(c);
 	#endif // ROUNDED_CORNERS_PATCH
 	#if NOBORDER_PATCH
-	if (((nexttiled(c->mon->clients) == c && !nexttiled(c->next))
-		#if MONOCLE_LAYOUT
-		|| &monocle == c->mon->lt[c->mon->sellt]->arrange
-		#endif // MONOCLE_LAYOUT
-		#if DECK_LAYOUT
-		|| (&deck == c->mon->lt[c->mon->sellt]->arrange &&
-			c->mon->nmaster == 0)
-		#endif // DECK_LAYOUT
-		#if FLEXTILE_DELUXE_LAYOUT
-		|| (&flextile == c->mon->lt[c->mon->sellt]->arrange && (
-			(c->mon->ltaxis[LAYOUT] == NO_SPLIT &&
-			 c->mon->ltaxis[MASTER] == MONOCLE) ||
-			(c->mon->ltaxis[STACK] == MONOCLE &&
-			 c->mon->nmaster == 0)))
-		#endif //FLEXTILE_DELUXE_LAYOUT
-		)
-		#if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
-		&& (c->fakefullscreen == 1 || !c->isfullscreen)
-		#else
-		&& !c->isfullscreen
-		#endif // FAKEFULLSCREEN_CLIENT_PATCH
-		&& !c->isfloating
-		&& c->mon->lt[c->mon->sellt]->arrange) {
-		c->w = wc.width += c->bw * 2;
-		c->h = wc.height += c->bw * 2;
+	if (noborder(c)) {
+		wc.width += c->bw * 2;
+		wc.height += c->bw * 2;
 		wc.border_width = 0;
 	}
 	#endif // NOBORDER_PATCH
@@ -4664,12 +4705,30 @@ updatebarpos(Monitor *m)
 	if (enablegaps)
 	#endif // PERTAG_VANITYGAPS_PATCH
 	{
+		#if BAR_PADDING_SMART_PATCH
+		unsigned int n; Client *c;
+		for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+		if (n > 1) {
+			y_pad = gappoh;
+			x_pad = gappov;
+		}
+		#else
 		y_pad = gappoh;
 		x_pad = gappov;
+		#endif // BAR_PADDING_SMART_PATCH
 	}
 	#elif BAR_PADDING_PATCH
+	#if BAR_PADDING_SMART_PATCH
+	unsigned int n; Client *c;
+	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+	if (n > 1) {
+		y_pad = vertpad;
+		x_pad = sidepad;
+	}
+	#else
 	y_pad = vertpad;
 	x_pad = sidepad;
+	#endif // BAR_PADDING_SMART_PATCH
 	#endif // BAR_PADDING_PATCH | BAR_PADDING_VANITYGAPS_PATCH
 
 	#if INSETS_PATCH

patches.def.h

@@ -91,6 +91,10 @@
 
 #define BAR_PADDING_PATCH 0
 
+#define BAR_PADDING_VANITYGAPS_PATCH 0
+
+#define BAR_PADDING_SMART_PATCH 0
+
 #define BAR_PANGO_PATCH 0
 
 #define BAR_STATICSTATUS_PATCH 0

polybar/config.ini

@@ -11,7 +11,7 @@ yellow                    = ${xrdb:color3:#F1FA8C}
 green                     = ${xrdb:color2:#50FA7B}
 orange                    = ${xrdb:color16:#FFB86C}
 
-background                = ${self.dark-gray}
+background                = #CC282A36
 background-alt            = ${self.light-gray}
 foreground                = ${self.white}
 foreground-alt            = ${self.lighter-gray}
@@ -20,8 +20,8 @@ secondary                 = ${self.blue}
 alert                     = ${self.red}
 
 ; left
-powermenu-foreground      = ${self.background}
-powermenu-background      = ${self.blue}
+powermenu-foreground      = ${self.blue}
+powermenu-background      = ${self.background}
 powermenu-underline       = ${self.background}
 powermenu-overline        = ${self.background}
 
@@ -65,8 +65,8 @@ dwm-empty-background      = ${self.background}
 dwm-empty-underline       = ${self.background}
 dwm-empty-overline        = ${self.background}
 
-media-playing-foreground  = ${self.background}
-media-playing-background  = ${self.green}
+media-playing-foreground  = ${self.green}
+media-playing-background  = ${self.background}
 media-playing-underline   = ${self.background}
 media-playing-overline    = ${self.background}
 
@@ -74,43 +74,43 @@ media-playing-overline    = ${self.background}
 tray-background           = ${self.background}
 
 ; right
-kernel-foreground         = ${self.background}
-kernel-background         = ${self.orange}
+kernel-foreground         = ${self.orange}
+kernel-background         = ${self.background}
 kernel-underline          = ${self.background}
 kernel-overline           = ${self.background}
 
-cpu-foreground            = ${self.background}
-cpu-background            = ${self.purple}
+cpu-foreground            = ${self.purple}
+cpu-background            = ${self.background}
 cpu-underline             = ${self.background}
 cpu-overline              = ${self.background}
 
-memory-foreground         = ${self.background}
-memory-background         = ${self.blue}
+memory-foreground         = ${self.blue}
+memory-background         = ${self.background}
 memory-underline          = ${self.background}
 memory-overline           = ${self.background}
 
-filesystem-foreground     = ${self.background}
-filesystem-background     = ${self.pink}
+filesystem-foreground     = ${self.pink}
+filesystem-background     = ${self.background}
 filesystem-underline      = ${self.background}
 filesystem-overline       = ${self.background}
 
-date-foreground           = ${self.background}
-date-background           = ${self.yellow}
+date-foreground           = ${self.yellow}
+date-background           = ${self.background}
 date-underline            = ${self.background}
 date-overline             = ${self.background}
 
-time-foreground           = ${self.background}
-time-background           = ${self.purple}
+time-foreground           = ${self.purple}
+time-background           = ${self.background}
 time-underline            = ${self.background}
 time-overline             = ${self.background}
 
-deadd-notification-center-foreground = ${self.background}
-deadd-notification-center-background = ${self.green}
+deadd-notification-center-foreground = ${self.green}
+deadd-notification-center-background = ${self.background}
 deadd-notification-center-underline  = ${self.background}
 deadd-notification-center-overline   = ${self.background}
 
-volume-foreground           = ${self.background}
-volume-background           = ${self.red}
+volume-foreground           = ${self.red}
+volume-background           = ${self.background}
 volume-underline            = ${self.background}
 volume-overline             = ${self.background}
 
@@ -213,8 +213,8 @@ radius = 10.0
 ; Individual values can be defined using:
 ;   {overline,underline}-size
 ;   {overline,underline}-color
-overline-size  = 4
-underline-size = 4
+overline-size  = 0
+underline-size = 0
 
 ; Values applied to all borders
 ; Individual side values can be defined using:
@@ -368,7 +368,7 @@ cursor-scroll = ns-resize
 
 [module/powermenu-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.powermenu-background}
 content-underline  = ${colors.powermenu-underline}
 content-overline   = ${colors.powermenu-overline}
@@ -376,7 +376,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/powermenu-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.powermenu-background}
 content-underline  = ${colors.powermenu-underline}
 content-overline   = ${colors.powermenu-overline}
@@ -514,7 +514,7 @@ label-empty-padding    = ${sizes.module-dwm-padding}
 
 [module/media-playing-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.media-playing-background}
 content-underline  = ${colors.media-playing-underline}
 content-overline   = ${colors.media-playing-overline}
@@ -522,7 +522,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/media-playing-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.media-playing-background}
 content-underline  = ${colors.media-playing-underline}
 content-overline   = ${colors.media-playing-overline}
@@ -597,7 +597,7 @@ click-left = "/home/sravan/.scripts/playerctl.sh --next"
 
 [module/date-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.date-background}
 content-underline  = ${colors.date-underline}
 content-overline   = ${colors.date-overline}
@@ -605,7 +605,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/date-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.date-background}
 content-underline  = ${colors.date-underline}
 content-overline   = ${colors.date-overline}
@@ -638,7 +638,7 @@ format = <label>
 ;   %date%
 ;   %time%
 ; Default: %date%
-label = " %date%"
+label = " %date%"
 ; label-font = 3
 label-foreground = ${colors.date-foreground}
 label-background = ${colors.date-background}
@@ -648,7 +648,7 @@ label-padding    = ${sizes.module-padding}
 
 [module/time-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.time-background}
 content-underline  = ${colors.time-underline}
 content-overline   = ${colors.time-overline}
@@ -656,7 +656,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/time-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.time-background}
 content-underline  = ${colors.time-underline}
 content-overline   = ${colors.time-overline}
@@ -699,7 +699,7 @@ label-padding    = ${sizes.module-padding}
 
 [module/kernel-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.kernel-background}
 content-underline  = ${colors.kernel-underline}
 content-overline   = ${colors.kernel-overline}
@@ -707,7 +707,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/kernel-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.kernel-background}
 content-underline  = ${colors.kernel-underline}
 content-overline   = ${colors.kernel-overline}
@@ -771,7 +771,7 @@ label-padding    = ${sizes.module-padding}
 
 [module/cpu-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.cpu-background}
 content-underline  = ${colors.cpu-underline}
 content-overline   = ${colors.cpu-overline}
@@ -779,7 +779,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/cpu-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.cpu-background}
 content-underline  = ${colors.cpu-underline}
 content-overline   = ${colors.cpu-overline}
@@ -804,7 +804,7 @@ format = %{A1:kitty btop:}<label>%{A}
 ;   %percentage-sum% - Cumulative load on all cores
 ;   %percentage-cores% - load percentage for each core
 ;   %percentage-core[1-9]% - load percentage for specific core
-label =  %percentage%%
+label =  %percentage%%
 label-padding    = ${sizes.module-padding}
 label-foreground = ${colors.cpu-foreground}
 label-background = ${colors.cpu-background}
@@ -825,7 +825,7 @@ ramp-coreload-foreground = ${colors.cpu}
 
 [module/memory-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.memory-background}
 content-underline  = ${colors.memory-underline}
 content-overline   = ${colors.memory-overline}
@@ -833,7 +833,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/memory-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.memory-background}
 content-underline  = ${colors.memory-underline}
 content-overline   = ${colors.memory-overline}
@@ -876,7 +876,7 @@ format = %{A1:kitty btop:}<label>%{A}
 ;   %gb_swap_free%
 ;   %gb_swap_used%
 
-label = 󰍛 %percentage_used%%
+label =   %percentage_used%%
 label-padding    = ${sizes.module-padding}
 label-foreground = ${colors.memory-foreground}
 label-background = ${colors.memory-background}
@@ -918,7 +918,7 @@ ramp-free-foreground = ${colors.memory}
 
 [module/filesystem-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.filesystem-background}
 content-underline  = ${colors.filesystem-underline}
 content-overline   = ${colors.filesystem-overline}
@@ -926,7 +926,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/filesystem-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.filesystem-background}
 content-underline  = ${colors.filesystem-underline}
 content-overline   = ${colors.filesystem-overline}
@@ -990,7 +990,7 @@ label-unmounted-padding    = ${sizes.module-padding}
 
 [module/deadd-notification-center-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.deadd-notification-center-background}
 content-underline  = ${colors.deadd-notification-center-underline}
 content-overline   = ${colors.deadd-notification-center-overline}
@@ -998,7 +998,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/deadd-notification-center-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.deadd-notification-center-background}
 content-underline  = ${colors.deadd-notification-center-underline}
 content-overline   = ${colors.deadd-notification-center-overline}
@@ -1027,7 +1027,7 @@ click-right = "/home/sravan/.scripts/deadd.sh --rofi"
 
 [module/volume-left]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.volume-background}
 content-underline  = ${colors.volume-underline}
 content-overline   = ${colors.volume-overline}
@@ -1035,7 +1035,7 @@ content-padding    = ${sizes.module-padding}
 
 [module/volume-right]
 type = custom/text
-content = ""
+content = " "
 content-foreground = ${colors.volume-background}
 content-underline  = ${colors.volume-underline}
 content-overline   = ${colors.volume-overline}