Fix resize stutter effect

ammario · ammario · commit 62ffe24b06cf · 2020-04-23T14:56:15.000-05:00
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -5,12 +5,14 @@ import (
 	"io"
 	"os"
 	"os/signal"
+	"time"
 
 	"github.com/spf13/pflag"
 	"go.coder.com/cli"
 	"go.coder.com/flog"
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/sys/unix"
+	"golang.org/x/time/rate"
 
 	client "cdr.dev/coder-cli/internal/entclient"
 	"cdr.dev/coder-cli/wush"
@@ -39,6 +41,9 @@ func (cmd *shellCmd) sendResizeEvents(termfd int, client *wush.Client) {
 	sigs := make(chan os.Signal, 16)
 	signal.Notify(sigs, unix.SIGWINCH)
 
+	// Limit the frequency of resizes to prevent a stuttering effect.
+	resizeLimiter := rate.NewLimiter(rate.Every(time.Millisecond*100), 1)
+
 	for {
 		width, height, err := terminal.GetSize(termfd)
 		if err != nil {
@@ -51,8 +56,10 @@ func (cmd *shellCmd) sendResizeEvents(termfd int, client *wush.Client) {
 			flog.Error("get term size: %v", err)
 			return
 		}
+
 		// Do this last so the first resize is sent.
 		<-sigs
+		resizeLimiter.Wait(context.Background())
 	}
 }
 
diff --git a/go.mod b/go.mod
@@ -16,6 +16,7 @@ require (
 	golang.org/x/crypto v0.0.0-20200422194213-44a606286825
 	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
 	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 	nhooyr.io/websocket v1.8.5
 )
diff --git a/go.sum b/go.sum
@@ -59,6 +59,7 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ require (`
`16`	`16`	`golang.org/x/crypto v0.0.0-20200422194213-44a606286825`
`17`	`17`	`golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a`
`18`	`18`	`golang.org/x/sys v0.0.0-20200413165638-669c56c373c4`
	`19`	`+ golang.org/x/time v0.0.0-20191024005414-555d28b269f0`
`19`	`20`	`golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543`
`20`	`21`	`nhooyr.io/websocket v1.8.5`
`21`	`22`	`)`