script: Try to get&set terminal size

Instead of defaulting to 80x24, try to get the terminal size and set it.
Lovingly tested by hand.

Signed-off-by: Jussi Maki <[email protected]>

Author: joamaki

Diff for: script.go

@@ -124,8 +124,13 @@ func RunRepl(h *Hive, in *os.File, out *os.File, prompt string) {
 		io.Reader
 		io.Writer
 	}{in, out}
-	term := term.NewTerminal(inout, prompt)
-	log := slog.New(slog.NewTextHandler(term, nil))
+	terminal := term.NewTerminal(inout, prompt)
+	log := slog.New(slog.NewTextHandler(terminal, nil))
+	if width, height, err := term.GetSize(int(in.Fd())); err == nil {
+		if err := terminal.SetSize(width, height); err != nil {
+			log.Error("Failed to set terminal size", "error", err)
+		}
+	}
 
 	cmds, err := h.ScriptCommands(log)
 	if err != nil {
@@ -168,7 +173,7 @@ func RunRepl(h *Hive, in *os.File, out *os.File, prompt string) {
 	s := newState()
 
 	for {
-		line, err := term.ReadLine()
+		line, err := terminal.ReadLine()
 		if err != nil {
 			if errors.Is(err, io.EOF) {
 				return
@@ -177,16 +182,16 @@ func RunRepl(h *Hive, in *os.File, out *os.File, prompt string) {
 			}
 		}
 
-		err = e.ExecuteLine(s, line, term)
+		err = e.ExecuteLine(s, line, terminal)
 		if err != nil {
-			fmt.Fprintln(term, err.Error())
+			fmt.Fprintln(terminal, err.Error())
 		}
 
 		if s.Context().Err() != nil {
 			// Context was cancelled due to interrupt. Re-create the state
 			// to run more commands.
 			s = newState()
-			fmt.Fprintln(term, "^C (interrupted)")
+			fmt.Fprintln(terminal, "^C (interrupted)")
 		}
 	}
 }

Diff for: script/cmds.go

@@ -1205,25 +1205,28 @@ func Break() Cmd {
 			defer term.Restore(int(tty.Fd()), prev)
 
 			// Switch the log output to the terminal until we continue
-			term := term.NewTerminal(tty, "debug> ")
+			terminal := term.NewTerminal(tty, "debug> ")
+			if width, height, err := term.GetSize(int(tty.Fd())); err == nil {
+				terminal.SetSize(width, height)
+			}
 			origLogOut := s.logOut
 			defer func() {
 				s.logOut = origLogOut
 
 			}()
-			s.logOut = term
+			s.logOut = terminal
 
-			fmt.Fprintf(term, "\nBreak! Control-d to continue.\n")
+			fmt.Fprintf(terminal, "\nBreak! Control-d to continue.\n")
 
 			engine := s.engine
 			for {
-				line, err := term.ReadLine()
+				line, err := terminal.ReadLine()
 				if err != nil {
 					return nil, nil
 				}
-				err = engine.ExecuteLine(s, line, term)
+				err = engine.ExecuteLine(s, line, terminal)
 				if err != nil {
-					fmt.Fprintln(term, err.Error())
+					fmt.Fprintln(terminal, err.Error())
 				}
 			}
 		},