From 2d9ff5cb851d9321d384250b65fdbbe3ea2a2870 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Sun, 21 Nov 2021 02:12:05 +0500
Subject: [PATCH] Improve macro "INTERSECT"

---
 src/dwm.c | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/dwm.c b/src/dwm.c
index c4de540..9252633 100644
--- a/src/dwm.c
+++ b/src/dwm.c
@@ -46,32 +46,32 @@
 		Mod3Mask | Mod4Mask | Mod5Mask)              \
 )
 
-#define INTERSECT(x,y,w,h,m) (                                        \
-	MAX(                                                              \
-		0,                                                            \
-		MIN(                                                          \
-			(x) + (w),                                                \
-			(m)->window_area_geometry.x + (m)->window_area_geometry.w \
-		)                                                             \
-		-                                                             \
-		MAX(                                                          \
-			(x),                                                      \
-			(m)->window_area_geometry.x                               \
-		)                                                             \
-	)                                                                 \
-	*                                                                 \
-	MAX(                                                              \
-		0,                                                            \
-		MIN(                                                          \
-			(y) + (h),                                                \
-			(m)->window_area_geometry.y + (m)->window_area_geometry.h \
-		)                                                             \
-		-                                                             \
-		MAX(                                                          \
-			(y),                                                      \
-			(m)->window_area_geometry.y                               \
-		)                                                             \
-	)                                                                 \
+#define INTERSECT(x,y,w,h,window_area_geometry) (           \
+	MAX(                                                    \
+		0,                                                  \
+		MIN(                                                \
+			(x) + (w),                                      \
+			window_area_geometry.x + window_area_geometry.w \
+		)                                                   \
+		-                                                   \
+		MAX(                                                \
+			(x),                                            \
+			window_area_geometry.x                          \
+		)                                                   \
+	)                                                       \
+	*                                                       \
+	MAX(                                                    \
+		0,                                                  \
+		MIN(                                                \
+			(y) + (h),                                      \
+			window_area_geometry.y + window_area_geometry.h \
+		)                                                   \
+		-                                                   \
+		MAX(                                                \
+			(y),                                            \
+			window_area_geometry.y                          \
+		)                                                   \
+	)                                                       \
 )
 
 /*********
@@ -1243,7 +1243,7 @@ Monitor *recttomon(int x, int y, int w, int h)
 	int a, area = 0;
 
 	for (m = mons; m; m = m->next)
-		if ((a = INTERSECT(x, y, w, h, m)) > area) {
+		if ((a = INTERSECT(x, y, w, h, m->window_area_geometry)) > area) {
 			area = a;
 			r = m;
 		}