增强跨平台 pty 支持，优化窗口大小调整逻辑 #11

Author: axetroy

internal/crosspty/pty.go

@@ -13,13 +13,11 @@ import (
 )
 
 func setPytSize(p pty.Pty) error {
-	w, h, err := term.GetSize(int(os.Stdin.Fd()))
-
-	if err != nil {
-		return err
+	if w, h, err := getConsoleSize(p); err == nil {
+		return p.Resize(w, h)
 	}
 
-	return p.Resize(w, h)
+	return nil
 }
 
 func Start(shellPath string, env map[string]string) error {
@@ -35,11 +33,13 @@ func Start(shellPath string, env map[string]string) error {
 		return err
 	}
 
-	_ = setPytSize(ptmx) // Set the initial size of the pty.
+	if err := setPytSize(ptmx); err != nil {
+		return errors.WithMessage(err, "failed to set initial pty size")
+	}
 
 	ch := make(chan os.Signal, 1)
 
-	listenOnResize(ch, ptmx, setPytSize)
+	go listenOnResize(ch, ptmx, setPytSize)
 
 	defer func() { signal.Stop(ch); close(ch) }() // Cleanup signals when done.
 

internal/crosspty/size_unix.go

@@ -8,14 +8,23 @@ import (
 	"syscall"
 
 	"github.com/aymanbagabas/go-pty"
+	"golang.org/x/term"
 )
 
+func getConsoleSize(p pty.Pty) (int, int, error) {
+	w, h, err := term.GetSize(int(os.Stdin.Fd()))
+
+	if err != nil {
+		return 0, 0, err
+	}
+
+	return w, h, nil
+}
+
 func listenOnResize(ch chan os.Signal, p pty.Pty, onResize func(p pty.Pty) error) {
 	signal.Notify(ch, syscall.SIGWINCH)
 
-	go func() {
-		for range ch {
-			_ = onResize(p)
-		}
-	}()
+	for range ch {
+		_ = onResize(p)
+	}
 }

internal/crosspty/size_windows.go

@@ -4,11 +4,47 @@ package crosspty
 
 import (
 	"os"
+	"time"
 
 	"github.com/aymanbagabas/go-pty"
+	"golang.org/x/sys/windows"
 )
 
 func listenOnResize(ch chan os.Signal, p pty.Pty, onResize func(p pty.Pty) error) {
 	// Windows does not support resizing pty, so we do nothing here.
 	// This is a no-op function to satisfy the interface.
+	var prevCols, prevRows int
+
+	for {
+		time.Sleep(500 * time.Millisecond)
+
+		cols, rows, err := getConsoleSize(p)
+
+		if err != nil {
+			continue
+		}
+
+		if cols != prevCols || rows != prevRows {
+			err := onResize(p)
+
+			if err == nil {
+				prevCols = cols
+				prevRows = rows
+			}
+		}
+	}
+}
+
+func getConsoleSize(p pty.Pty) (int, int, error) {
+	handle := windows.Handle(os.Stdout.Fd())
+	var info windows.ConsoleScreenBufferInfo
+
+	if err := windows.GetConsoleScreenBufferInfo(handle, &info); err != nil {
+		return 0, 0, err
+	}
+
+	cols := int(info.Window.Right - info.Window.Left + 1)
+	rows := int(info.Window.Bottom - info.Window.Top + 1)
+
+	return cols, rows, nil
 }