TTY resize for Windows

PentHertz · Sep 19, 2024 · a966a27 · a966a27
1 parent 3d2179a
commit a966a27
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 12 deletions.
diff --git a/go/rfswift/dock/rfdock.go b/go/rfswift/dock/rfdock.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 	"os/signal"
-    "syscall"
+    "runtime"
 
 	"context"
 	"github.com/docker/docker/api/types"
@@ -630,17 +630,39 @@ func DockerExec(containerIdentifier string, WorkingDir string) {
 
     // Handle terminal resize
     go func() {
-        sigchan := make(chan os.Signal, 1)
-        signal.Notify(sigchan, syscall.SIGWINCH)
-        defer signal.Stop(sigchan)
-
-        for range sigchan {
-            if outIsTerminal {
-                if size, err := term.GetWinsize(outFd); err == nil {
-                    cli.ContainerExecResize(ctx, execID.ID, container.ResizeOptions{
-                        Height: uint(size.Height),
-                        Width:  uint(size.Width),
-                    })
+        switch runtime.GOOS {
+        case "linux", "darwin":
+            sigchan := make(chan os.Signal, 1)
+            signal.Notify(sigchan, syscallsigwin())
+            defer signal.Stop(sigchan)
+
+            for range sigchan {
+                if outIsTerminal {
+                    if size, err := term.GetWinsize(outFd); err == nil {
+                        cli.ContainerExecResize(ctx, execID.ID, container.ResizeOptions{
+                            Height: uint(size.Height),
+                            Width:  uint(size.Width),
+                        })
+                    }
+                }
+            }
+        case "windows":
+            ticker := time.NewTicker(500 * time.Millisecond)
+            defer ticker.Stop()
+
+            var lastHeight, lastWidth uint16
+            for range ticker.C {
+                if outIsTerminal {
+                    if size, err := term.GetWinsize(outFd); err == nil {
+                        if size.Height != lastHeight || size.Width != lastWidth {
+                            cli.ContainerExecResize(ctx, execID.ID, container.ResizeOptions{
+                                Height: uint(size.Height),
+                                Width:  uint(size.Width),
+                            })
+                            lastHeight = size.Height
+                            lastWidth = size.Width
+                        }
+                    }
                 }
             }
         }

diff --git a/go/rfswift/dock/terminal_darwin.go b/go/rfswift/dock/terminal_darwin.go
@@ -1,9 +1,15 @@
 package dock
 
 import (
+	"syscall"
+	"os"
 	"golang.org/x/crypto/ssh/terminal"
 )
 
 func getTerminalSize(fd int) (int, int, error) {
 	return terminal.GetSize(fd)
 }
+
+func syscallsigwin() (os.Signal) {
+	return syscall.SIGWINCH
+}
diff --git a/go/rfswift/dock/terminal_linux.go b/go/rfswift/dock/terminal_linux.go
@@ -1,9 +1,15 @@
 package dock
 
 import (
+	"syscall"
+	"os"
 	"golang.org/x/crypto/ssh/terminal"
 )
 
 func getTerminalSize(fd int) (int, int, error) {
 	return terminal.GetSize(fd)
 }
+
+func syscallsigwin() (os.Signal) {
+	return syscall.SIGWINCH
+}
diff --git a/go/rfswift/dock/terminal_windows.go b/go/rfswift/dock/terminal_windows.go
@@ -1,6 +1,7 @@
 package dock
 
 import (
+	"os"
 	"golang.org/x/sys/windows"
 )
 
@@ -20,3 +21,7 @@ func getTerminalSize(fd int) (int, int, error) {
 	height := int(info.Window.Bottom - info.Window.Top + 1)
 	return width, height, nil
 }
+
+func syscallsigwin() os.Signal {
+    return nil // No signal equivalent for Windows
+}