Improve macro "INTERSECT"

This commit is contained in:
Alex Kotov 2021-11-21 02:12:05 +05:00
parent 9c6f08a38b
commit 2d9ff5cb85
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
1 changed files with 27 additions and 27 deletions

View File

@ -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;
}