Merge pull request #406 from RamonUnch/RamonUnch-ZSnapMode

Add nearest zone from center option

hooks.c

@@ -215,6 +215,7 @@ static struct config {
     UCHAR UniKeyHoldMenu;
     // [Zones]
     UCHAR UseZones;
+    UCHAR ZSnapMode;
     UCHAR LayoutNumber;
     char InterZone;
   # ifdef WIN64
@@ -326,6 +327,7 @@ static const struct OptionListItem Input_uchars[] = {
 // [Zones]
 static const struct OptionListItem Zones_uchars[] = {
     { "UseZones", 0 },
+    { "ZSnapMode", 0 },
     { "LayoutNumber", 0 },
     { "InterZone", 0 },
   # ifdef WIN64

zones.c

@@ -14,7 +14,7 @@ unsigned nzones[MAX_LAYOUTS];
 DWORD Grids[MAX_LAYOUTS];
 static void freezones()
 {
-    USHORT i;
+    unsigned i;
     for (i=0; i<ARR_SZ(Zones);i++)
         free(Zones[i]);
 }
@@ -130,7 +130,64 @@ static void RecalculateZonesFromGrids()
     }
 }
 
-static unsigned GetZoneFromPoint(POINT pt, RECT *urc, int extend)
+static xpure unsigned long ClacPtRectDist(const POINT pt, const RECT *zone)
+{
+    POINT Zpt = { (zone->left+zone->right)/2, (zone->top+zone->bottom)/2 };
+    long dx = (pt.x - Zpt.x)>>1;
+    long dy = (pt.y - Zpt.y)>>1;
+
+    return dx*dx + dy*dy;
+}
+
+static unsigned GetNearestZoneDist(POINT pt, unsigned long *dist_)
+{
+    RECT * const lZones = Zones[conf.LayoutNumber];
+    if(!lZones) return 0;
+    unsigned long dist = 0xffffffff;
+    unsigned idx = 0;
+    unsigned i;
+    for (i=0; i < nzones[conf.LayoutNumber]; i++) {
+        unsigned long dst = ClacPtRectDist(pt, &lZones[i]);
+        if ( dst < dist ) {
+            dist = dst;
+            idx = i;
+        }
+    }
+    *dist_ = dist;
+    return idx;
+}
+
+static unsigned GetZoneNearestFromPoint(POINT pt, RECT *urc, int extend)
+{
+
+    RECT * const lZones = Zones[conf.LayoutNumber];
+    if(!lZones) return 0;
+    unsigned i, ret=0;
+    SetRectEmpty(urc);
+    int iz = conf.InterZone;
+    iz = (iz * iz) << 1;
+    unsigned long mindist=0;
+
+    i = GetNearestZoneDist(pt, &mindist);
+    ret = mindist != 0xffffffff;
+    if (!ret) return 0;
+    CopyRect(urc, &lZones[i]);
+    mindist += iz; // Add iz tolerance.
+    for (i=0; i < nzones[conf.LayoutNumber]; i++) {
+
+        BOOL inrect = mindist > ClacPtRectDist(pt, &lZones[i]);
+        if ((state.ctrl||extend) && !inrect)
+            inrect = mindist > ClacPtRectDist(extend?state.shiftpt:state.ctrlpt, &lZones[i]);
+
+        if (inrect) {
+            UnionRect(urc, urc, &lZones[i]);
+            ret++;
+        }
+    }
+    return ret;
+}
+
+static unsigned GetZoneContainingPoint(POINT pt, RECT *urc, int extend)
 {
 
     RECT * const lZones = Zones[conf.LayoutNumber];
@@ -154,6 +211,15 @@ static unsigned GetZoneFromPoint(POINT pt, RECT *urc, int extend)
     }
     return ret;
 }
+static unsigned GetZoneFromPoint(POINT pt, RECT *urc, int extend)
+{
+	switch (conf.ZSnapMode) {
+	case 0: return GetZoneContainingPoint(pt, urc, extend);
+	case 1: return GetZoneNearestFromPoint(pt, urc, extend);
+	}
+	// Invalid Snap mode!
+	return 0;
+}
 static int pure IsResizable(HWND hwnd);
 
 static void ActionToggleSnapToZoneMode()
@@ -230,7 +296,7 @@ static void MoveWindowToTouchingZone(HWND hwnd, UCHAR direction, UCHAR extend)
     ClampPointInRect(&mi.rcWork, &pt);
 
     RECT zrc;
-    unsigned ret = GetZoneFromPoint(pt, &zrc, 0);
+    unsigned ret = GetZoneContainingPoint(pt, &zrc, 0);
     if (!ret) return; // Outside of a rect
 
     RECT fr; // final rect...