refactor #3

main.go

@@ -52,53 +52,59 @@ func RestoreWindowPositions(client *hypr.Client) error {
 	}
 
 	for _, window := range windows {
+		// ignore all special workspaces because they can't be moved between monitors
 		if window.Workspace.ID < 0 {
 			continue
 		}
 
-		//monitor := monitorByID[window.MonitorID]
-
 		windowBounds := image.Rect(
 			window.At[0],
 			window.At[1],
 			window.At[0]+window.Size[0],
 			window.At[1]+window.Size[1])
 
-		shouldMonitorBounds := monitorBoundsByID[window.MonitorID]
-
-		if windowBounds.In(shouldMonitorBounds) {
+		monitorBounds := monitorBoundsByID[window.MonitorID]
+		if windowBounds.In(monitorBounds) {
 			continue
 		}
 
-		// fmt.Println("IMPOSSIBLE WINDOW POSITION DETECTED", window.Title, window.Address)
-		// fmt.Println("workspace:", window.Workspace.ID)
-		// fmt.Println("monitor:", shouldMonitorBounds)
-		// fmt.Println("window:", windowBounds)
+		boundsOfActualMonitor := GetMonitorBoundsByWindowBounds(windowBounds, monitorBoundsByID)
 
-		isMonitorBounds := image.Rect(-1, -1, -1, -1)
-		for _, monitorBounds := range monitorBoundsByID {
-			if windowBounds.In(monitorBounds) {
-				isMonitorBounds = monitorBounds
-				break
-			}
+		shouldPos := image.Pt(-1, -1)
+		if boundsOfActualMonitor == nil {
+			// use coords [0,0] respective to the wanted monitor if window is completely OOB
+			shouldPos = monitorBounds.Min
+		} else {
+			// calculate new position based on the position of the window and its actual monitor
+			diff := windowBounds.Min.Sub(boundsOfActualMonitor.Min)
+			shouldPos = monitorBounds.Min.Add(diff)
 		}
 
-		diff := windowBounds.Min.Sub(isMonitorBounds.Min)
-		shouldPos := shouldMonitorBounds.Min.Add(diff)
-
-		if isMonitorBounds == image.Rect(-1, -1, -1, -1) {
-			shouldPos = shouldMonitorBounds.Min
-		}
-
-		client.DispatchExpectOK(fmt.Sprintf(
+		cmd := fmt.Sprintf(
 			"movewindowpixel exact %d %d,address:%s",
 			shouldPos.X,
 			shouldPos.Y,
-			window.Address,
-		))
+			window.Address)
+
+		if err := client.DispatchExpectOK(cmd); err != nil {
+			log.Printf("invalid position could NOT be restored successfully for window (class: '%s' | title: '%s')\n", window.Class, window.Title)
+			continue
+		}
 
 		log.Printf("invalid position restored for window (class: '%s' | title: '%s')\n", window.Class, window.Title)
 	}
 
 	return nil
 }
+
+// GetMonitorBoundsByWindowBounds returns the monitor bounds which contains windowBounds
+// or image.Rect(-1, -1, -1, -1) if windowBounds is outside any monitor bounds
+func GetMonitorBoundsByWindowBounds(windowBounds image.Rectangle, monitorBoundsByID map[int]image.Rectangle) *image.Rectangle {
+	for _, monitorBounds := range monitorBoundsByID {
+		if windowBounds.In(monitorBounds) {
+			newBounds := windowBounds
+			return &newBounds
+		}
+	}
+	return nil
+}