From 80903242998863ac2b08801957949a32775db23c Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Thu, 21 Apr 2022 08:35:08 +0200
Subject: [PATCH] moveresize: Refactor some conditions for readability

---
 src/moveresize.c | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/moveresize.c b/src/moveresize.c
index 8670a628..7026cd2f 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -476,6 +476,7 @@ _MoveResizeMoveHandleMotion(void)
    int                 ndx, ndy;
    char                jumpx, jumpy;
    int                 min_dx, max_dx, min_dy, max_dy;
+   int                 at_screen_edge;
 
    ewin = Mode_mr.ewin;
    if (!ewin)
@@ -580,34 +581,36 @@ _MoveResizeMoveHandleMotion(void)
 	dd = ewin1->req_x - ewin1->shape_x;
 	if (dd < 0)
 	   dd = -dd;
-	if ((ndx != dx) &&
-	    (((ewin1->shape_x == 0) &&
-	      (dd > Conf.snap.screen_snap_dist)) ||
-	     ((ewin1->shape_x == (WinGetW(VROOT) - EoGetW(ewin1))) &&
-	      (dd > Conf.snap.screen_snap_dist)) ||
-	     ((ewin1->shape_x != 0) &&
-	      (ewin1->shape_x != (WinGetW(VROOT) - EoGetW(ewin1)) &&
-	       (dd > Conf.snap.edge_snap_dist)))))
+	if (ndx != dx)
 	  {
-	     jumpx = 1;
-	     ndx = ewin1->req_x - ewin1->shape_x + dx;
+	     at_screen_edge =
+		ewin1->shape_x == 0 ||
+		ewin1->shape_x + EoGetW(ewin1) == WinGetW(VROOT);
+
+	     if ((at_screen_edge && dd > Conf.snap.screen_snap_dist) ||
+		 (!at_screen_edge && dd > Conf.snap.edge_snap_dist))
+	       {
+		  jumpx = 1;
+		  ndx = ewin1->req_x - ewin1->shape_x + dx;
+	       }
 	  }
 
 	/* jump out of snap vertically */
 	dd = ewin1->req_y - ewin1->shape_y;
 	if (dd < 0)
 	   dd = -dd;
-	if ((ndy != dy) &&
-	    (((ewin1->shape_y == 0) &&
-	      (dd > Conf.snap.screen_snap_dist)) ||
-	     ((ewin1->shape_y == (WinGetH(VROOT) - EoGetH(ewin1))) &&
-	      (dd > Conf.snap.screen_snap_dist)) ||
-	     ((ewin1->shape_y != 0) &&
-	      (ewin1->shape_y != (WinGetH(VROOT) - EoGetH(ewin1)) &&
-	       (dd > Conf.snap.edge_snap_dist)))))
+	if (ndy != dy)
 	  {
-	     jumpy = 1;
-	     ndy = ewin1->req_y - ewin1->shape_y + dy;
+	     at_screen_edge =
+		ewin1->shape_y == 0 ||
+		ewin1->shape_y + EoGetH(ewin1) == WinGetH(VROOT);
+
+	     if ((at_screen_edge && dd > Conf.snap.screen_snap_dist) ||
+		 (!at_screen_edge && dd > Conf.snap.edge_snap_dist))
+	       {
+		  jumpy = 1;
+		  ndy = ewin1->req_y - ewin1->shape_y + dy;
+	       }
 	  }
      }