fix: improve resize callback handling for better UX (#132)

Author: mtraworld

cmd/neru/modes.go

@@ -77,7 +77,7 @@ func (a *App) activateHintMode(action Action) {
 	// Always resize overlay to the active screen (where mouse is) before collecting elements
 	// This ensures proper positioning when switching between multiple displays
 	if a.hintOverlay != nil {
-		// Use synchronous resize with callback - no artificial delay needed
+		// Use synchronous resize with timeout to prevent hanging
 		a.hintOverlay.ResizeToActiveScreenSync()
 		a.hintOverlayNeedsRefresh = false
 	}
@@ -172,7 +172,7 @@ func (a *App) activateGridMode(action Action) {
 	if a.gridCtx != nil && a.gridCtx.gridOverlay != nil {
 		gridOverlay := *a.gridCtx.gridOverlay
 
-		// Use synchronous resize with callback - no artificial delay needed
+		// Use synchronous resize with timeout to prevent hanging
 		gridOverlay.ResizeToActiveScreenSync()
 		a.gridOverlayNeedsRefresh = false
 	}
@@ -925,7 +925,7 @@ func (a *App) exitMode() {
 		a.hintOverlay.Hide()
 	case ModeGrid:
 		// If we are in mouse up action, remove the mouse up to prevent further dragging
-		if a.currentAction == ActionMouseUp {
+		if a.gridCtx.currentAction == ActionMouseUp {
 			a.logger.Info("Detected MouseUp action, removing mouse up event...")
 			err := accessibility.LeftMouseUp()
 			if err != nil {
@@ -943,6 +943,7 @@ func (a *App) exitMode() {
 		}
 		// Hide overlays
 		if a.gridCtx != nil && a.gridCtx.gridOverlay != nil && *a.gridCtx.gridOverlay != nil {
+			a.logger.Info("Hiding grid overlay")
 			(*a.gridCtx.gridOverlay).Hide()
 		}
 		// Also clear any context menu drawn on hint overlay
@@ -959,6 +960,7 @@ func (a *App) exitMode() {
 	// Update mode after all cleanup is done
 	a.currentMode = ModeIdle
 	a.currentAction = ActionLeftClick
+	a.gridCtx.currentAction = ActionLeftClick
 	a.logger.Debug("Mode transition complete",
 		zap.String("to", "idle"))
 

internal/grid/grid_overlay.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
+	"time"
 	"unsafe"
 
 	"github.com/y3owk1n/neru/internal/config"
@@ -121,6 +122,10 @@ func (o *GridOverlay) ResizeToActiveScreenSync() {
 	gridCallbackMap[id] = done
 	gridCallbackLock.Unlock()
 
+	if o.logger != nil {
+		o.logger.Debug("Grid overlay resize started", zap.Uint64("callback_id", id))
+	}
+
 	// Pass ID as context (safe - no Go pointers)
 	// Note: uintptr conversion must happen in same expression to satisfy go vet
 	C.resizeOverlayToActiveScreenWithCallback(
@@ -129,7 +134,32 @@ func (o *GridOverlay) ResizeToActiveScreenSync() {
 		*(*unsafe.Pointer)(unsafe.Pointer(&id)),
 	)
 
-	<-done
+	// Don't wait for callback - continue immediately for better UX
+	// The resize operation is typically fast and visually complete before callback
+	// Start a goroutine to handle cleanup when callback eventually arrives
+	go func() {
+		if o.logger != nil {
+			o.logger.Debug("Grid overlay resize background cleanup started", zap.Uint64("callback_id", id))
+		}
+
+		select {
+		case <-done:
+			// Callback received, normal cleanup already handled in callback
+			if o.logger != nil {
+				o.logger.Debug("Grid overlay resize callback received", zap.Uint64("callback_id", id))
+			}
+		case <-time.After(2 * time.Second):
+			// Long timeout for cleanup only - callback likely failed
+			gridCallbackLock.Lock()
+			delete(gridCallbackMap, id)
+			gridCallbackLock.Unlock()
+
+			if o.logger != nil {
+				o.logger.Debug("Grid overlay resize cleanup timeout - removed callback from map",
+					zap.Uint64("callback_id", id))
+			}
+		}
+	}()
 }
 
 // Draw renders the flat grid with all 3-char cells visible

internal/hints/overlay.go

@@ -15,6 +15,7 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
+	"time"
 	"unsafe"
 
 	"github.com/y3owk1n/neru/internal/config"
@@ -112,6 +113,10 @@ func (o *Overlay) ResizeToActiveScreenSync() {
 	hintCallbackMap[id] = done
 	hintCallbackLock.Unlock()
 
+	if o.logger != nil {
+		o.logger.Debug("Hint overlay resize started", zap.Uint64("callback_id", id))
+	}
+
 	// Pass ID as context (safe - no Go pointers)
 	// Note: uintptr conversion must happen in same expression to satisfy go vet
 	C.resizeOverlayToActiveScreenWithCallback(
@@ -120,7 +125,32 @@ func (o *Overlay) ResizeToActiveScreenSync() {
 		*(*unsafe.Pointer)(unsafe.Pointer(&id)),
 	)
 
-	<-done
+	// Don't wait for callback - continue immediately for better UX
+	// The resize operation is typically fast and visually complete before callback
+	// Start a goroutine to handle cleanup when callback eventually arrives
+	go func() {
+		if o.logger != nil {
+			o.logger.Debug("Hint overlay resize background cleanup started", zap.Uint64("callback_id", id))
+		}
+
+		select {
+		case <-done:
+			// Callback received, normal cleanup already handled in callback
+			if o.logger != nil {
+				o.logger.Debug("Hint overlay resize callback received", zap.Uint64("callback_id", id))
+			}
+		case <-time.After(2 * time.Second):
+			// Long timeout for cleanup only - callback likely failed
+			hintCallbackLock.Lock()
+			delete(hintCallbackMap, id)
+			hintCallbackLock.Unlock()
+
+			if o.logger != nil {
+				o.logger.Debug("Hint overlay resize cleanup timeout - removed callback from map",
+					zap.Uint64("callback_id", id))
+			}
+		}
+	}()
 }
 
 // DrawHintsWithoutArrow draws hints without arrows