From 8236f1940b7e0369dc54d7d49b50606fe7d5b58d Mon Sep 17 00:00:00 2001
From: bakkeby <bakkeby@gmail.com>
Date: Thu, 28 May 2020 07:15:00 +0200
Subject: [PATCH] dwmblocks and status2d buttonpress adjustments for awesomebar
 and statuspadding

---
 dwm.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/dwm.c b/dwm.c
index e67e74a..7c47f38 100644
--- a/dwm.c
+++ b/dwm.c
@@ -737,13 +737,9 @@ buttonpress(XEvent *e)
 	#if STATUSCMD_PATCH && !DWMBLOCKS_PATCH
 	lastbutton = ev->button;
 	#endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH
-	#if AWESOMEBAR_PATCH || STATUSCMD_PATCH
-	padding += lrpad - 2;
-	#endif // AWESOMEBAR_PATCH | STATUSCMD_PATCH
 	#if SYSTRAY_PATCH
 	padding -= getsystraywidth();
 	#endif // SYSTRAY_PATCH
-
 	#if TAGGRID_PATCH
 	columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0);
 	#endif // TAGGRID_PATCH
@@ -811,11 +807,14 @@ buttonpress(XEvent *e)
 		{
 			click = ClkStatusText;
 			xc = selmon->ww - tw + padding;
+			#if STATUSPADDING_PATCH
+			xc += lrpad / 2;
+			#endif // STATUSPADDING_PATCH
 			char *text = rawstext;
 			int i = -1;
 			char ch;
 			#if DWMBLOCKS_PATCH
-			dwmblockssig = 0;
+			dwmblockssig = -1;
 			#else
 			statuscmdn = 0;
 			#endif // DWMBLOCKS_PATCH
@@ -831,16 +830,22 @@ buttonpress(XEvent *e)
 					text[i] = ch;
 					text += i+1;
 					i = -1;
-					if (xc >= ev->x)
-						break;
 					#if DWMBLOCKS_PATCH
+					if (xc >= ev->x && dwmblockssig != -1)
+						break;
 					dwmblockssig = ch;
 					#else
+					if (xc >= ev->x)
+						break;
 					if (ch <= LENGTH(statuscmds))
 						statuscmdn = ch - 1;
 					#endif // DWMBLOCKS_PATCH
 				}
 			}
+			#if DWMBLOCKS_PATCH
+			if (dwmblockssig == -1)
+				dwmblockssig = 0;
+			#endif // DWMBLOCKS_PATCH
 		}
 		#endif // STATUSCMD_PATCH
 		#if AWESOMEBAR_PATCH