change: debug output

.github/workflows/release.yml

@@ -11,6 +11,8 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Go
         uses: actions/setup-go@v2
+        with:
+          go-version: '1.21'
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:

cmd_alpha.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"errors"
+	"os"
 
 	"github.com/shu-go/nmfmt"
 )
@@ -15,13 +16,12 @@ func (c alphaCmd) Run(args []string, g globalCmd) error {
 	}
 
 	opacity := toInt(args[0], 255)
-	if g.Debug {
-		nmfmt.Printf("opacity = $arg -> $opacity/255",
-			nmfmt.M{
-				"arg":     args[0],
-				"opacity": opacity,
-			})
-	}
+
+	g.debug(os.Stderr, "opacity $=arg:q -> $opacity/255\n",
+		nmfmt.M{
+			"arg":     args[0],
+			"opacity": opacity,
+		})
 
 	style, _, _ := getWindowLong.Call(uintptr(g.targetHandle), gwlEXStyle)
 	setWindowLong.Call(uintptr(g.targetHandle), gwlEXStyle, style|wsEXLayered)

cmd_resize.go

@@ -2,9 +2,10 @@ package main
 
 import (
 	"errors"
+	"os"
 	"unsafe"
 
-	"github.com/shu-go/rog"
+	"github.com/shu-go/nmfmt"
 )
 
 type resizeCmd struct {
@@ -29,9 +30,11 @@ func (c *resizeCmd) Before(g globalCmd) error {
 
 	oldrect := c.rect
 
-	if g.Debug {
-		rog.Print(oldrect)
-	}
+	g.debug(os.Stderr, "$=original\n",
+		nmfmt.M{
+			"original": oldrect,
+		})
+
 	if c.Left != "" {
 		c.rect.Left = toInt(c.Left, g.scrWidth)
 	}
@@ -48,12 +51,11 @@ func (c *resizeCmd) Before(g globalCmd) error {
 	} else {
 		c.rect.Bottom = c.rect.Top + (oldrect.Bottom - oldrect.Top)
 	}
-	if g.Debug {
-		if c.Restore {
-			rog.Print("restore")
-		} else {
-			rog.Print(c.rect)
-		}
+
+	if c.Restore {
+		g.debug(os.Stderr, "restore\n")
+	} else {
+		g.debug(os.Stderr, "resized $rect\n", nmfmt.M{"rect": c.rect})
 	}
 
 	return nil

cmd_wait.go

@@ -66,7 +66,7 @@ waitLoop:
 			fmt.Fprintln(os.Stderr, "cancelled")
 			break waitLoop
 		case <-ctx.Done():
-			fmt.Fprintln(os.Stderr, "cancelled")
+			fmt.Fprintln(os.Stderr, "cancelled (timeout)")
 			break waitLoop
 		default:
 			//nop

go.mod

@@ -5,7 +5,6 @@ go 1.21
 require (
 	github.com/mitchellh/go-ps v1.0.0
 	github.com/shu-go/gli/v2 v2.0.1
-	github.com/shu-go/rog v0.1.0
 	github.com/shu-go/nmfmt v0.1.0
 )
 

go.sum

@@ -13,7 +13,5 @@ github.com/shu-go/gli/v2 v2.0.1 h1:XA1QSfUdpWW1FIqLjuXo+Gs/IjEy+uviuxKQ45IRYC8=
 github.com/shu-go/gli/v2 v2.0.1/go.mod h1:pSC0XKb69hEarQpiQU74CNiKpcS7a90iJAMUGL3SinQ=
 github.com/shu-go/gotwant v0.0.0-20190920074605-b4f19c0bac91 h1:nwDc3kHbf9scf1UZIWiWw5tZF3Z4yOJAMjNN+kYXJwE=
 github.com/shu-go/gotwant v0.0.0-20190920074605-b4f19c0bac91/go.mod h1:FZepfqvib0mXjHiaQPTv0RUD5QMpMA/FHLfBQjZRRQg=
-github.com/shu-go/rog v0.1.0 h1:mplglNOiUN1ujq0UTkosB5NL/GQhFX2gRYcen7aEhTY=
-github.com/shu-go/rog v0.1.0/go.mod h1:gO+FpqgnHoxbF6FPJN6PaAEl6hcZRLNL+nQZgbbElzo=
 github.com/shu-go/nmfmt v0.1.0 h1:gL5u0yiIsegh2gofeNUpAJPWCNgOF+qIivBc9qO/KoE=
 github.com/shu-go/nmfmt v0.1.0/go.mod h1:ulgNf0sfuQEEdX2cM71sGviSEKDf9DUXlm5WtFn0PJY=

vvin.go

@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"fmt"
+	"io"
 	"math"
 	"os"
 	"strconv"
@@ -12,6 +13,7 @@ import (
 
 	"github.com/mitchellh/go-ps"
 	"github.com/shu-go/gli/v2"
+	"github.com/shu-go/nmfmt"
 )
 
 // Version is app version
@@ -21,6 +23,8 @@ type globalCmd struct {
 	Target string `cli:"target,t=WINDOW_TITLE" help:"default to current window"`
 	Debug  bool   `help:"output debug info"`
 
+	debug func(io.Writer, string, ...any) (int, error) // nmfmt
+
 	Minimize minCmd     `cli:"minimize,min" help:"minimize/restore"`
 	Maximize maxCmd     `cli:"maximize,max" help:"maximize/restore"`
 	Resize   resizeCmd  `cli:"resize,move,mv" help:"resize/move"`
@@ -34,6 +38,14 @@ type globalCmd struct {
 }
 
 func (c *globalCmd) Before() error {
+	c.debug = func(io.Writer, string, ...any) (int, error) {
+		return 0, nil
+	}
+	if c.Debug {
+		c.debug = nmfmt.Fprintf
+	}
+	c.debug(os.Stderr, "Debug enabled.\n")
+
 	wins, err := listAllWindows()
 	if err != nil {
 		return err
@@ -45,6 +57,12 @@ func (c *globalCmd) Before() error {
 	}
 	c.targetHandle = win.Handle
 
+	c.debug(os.Stderr, "$=target:q -> $=handle:x\n",
+		nmfmt.M{
+			"target": c.Target,
+			"handle": c.targetHandle,
+		})
+
 	w, _, _ := getSystemMetrics.Call(smCXVirtualScreen)
 	h, _, _ := getSystemMetrics.Call(smCYVirtualScreen)
 	c.scrWidth = int(w)