mirror of
https://github.com/wavetermdev/waveterm.git
synced 2025-01-03 18:47:56 +01:00
b136c915df
* working on cmd restart logic * button to restart command * bind Cmd-R to restart selected command, and Cmd-Shift-R to restart last command. Browser Refresh is now Option-R. also fix 'clear' command to not delete running commands (like archive). some small changes to keyboard utility code to always set 'alt' and 'meta' appropriately. use 'cmd' and 'option' for crossplatform bindings * focus restarted line * update termopts, use current winsize to set termopts for new command * add cmd.restartts to track restart time * display restarted time in line w/ tooltip with original time * add restartts to line:show
135 lines
3.4 KiB
Go
135 lines
3.4 KiB
Go
// Copyright 2023, Command Line Inc.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package cmdrunner
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/base"
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/shellutil"
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/shexec"
|
|
"github.com/wavetermdev/waveterm/wavesrv/pkg/remote"
|
|
"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
|
|
)
|
|
|
|
// PTERM=MxM,Mx25
|
|
// PTERM="Mx25!"
|
|
// PTERM=80x25,80x35
|
|
|
|
type PTermOptsType struct {
|
|
Rows string
|
|
RowsFlex bool
|
|
Cols string
|
|
ColsFlex bool
|
|
}
|
|
|
|
const PTermMax = "M"
|
|
|
|
func isDigits(s string) bool {
|
|
for _, ch := range s {
|
|
if ch < '0' || ch > '9' {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
func atoiDefault(s string, def int) int {
|
|
ival, err := strconv.Atoi(s)
|
|
if err != nil {
|
|
return def
|
|
}
|
|
return ival
|
|
}
|
|
|
|
func parseTermPart(part string, partType string) (string, bool, error) {
|
|
flex := true
|
|
if strings.HasSuffix(part, "!") {
|
|
part = part[:len(part)-1]
|
|
flex = false
|
|
}
|
|
if part == "" {
|
|
return PTermMax, flex, nil
|
|
}
|
|
if part == PTermMax {
|
|
return PTermMax, flex, nil
|
|
}
|
|
if !isDigits(part) {
|
|
return "", false, fmt.Errorf("invalid PTERM %s: must be '%s' or [number]", partType, PTermMax)
|
|
}
|
|
return part, flex, nil
|
|
}
|
|
|
|
func parseSingleTermStr(s string) (*PTermOptsType, error) {
|
|
s = strings.TrimSpace(s)
|
|
xIdx := strings.Index(s, "x")
|
|
if xIdx == -1 {
|
|
return nil, fmt.Errorf("invalid PTERM, must include 'x' to separate width and height (e.g. WxH)")
|
|
}
|
|
rowsPart := s[0:xIdx]
|
|
colsPart := s[xIdx+1:]
|
|
rows, rowsFlex, err := parseTermPart(rowsPart, "rows")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cols, colsFlex, err := parseTermPart(colsPart, "cols")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &PTermOptsType{Rows: rows, RowsFlex: rowsFlex, Cols: cols, ColsFlex: colsFlex}, nil
|
|
}
|
|
|
|
func GetUITermOpts(winSize *packet.WinSize, ptermStr string) (*packet.TermOpts, error) {
|
|
opts, err := parseSingleTermStr(ptermStr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
termOpts := &packet.TermOpts{Rows: shellutil.DefaultTermRows, Cols: shellutil.DefaultTermCols, Term: remote.DefaultTerm, MaxPtySize: shexec.DefaultMaxPtySize}
|
|
if winSize == nil {
|
|
winSize = &packet.WinSize{Rows: shellutil.DefaultTermRows, Cols: shellutil.DefaultTermCols}
|
|
}
|
|
if winSize.Rows == 0 {
|
|
winSize.Rows = shellutil.DefaultTermRows
|
|
}
|
|
if winSize.Cols == 0 {
|
|
winSize.Cols = shellutil.DefaultTermCols
|
|
}
|
|
if opts.Rows == PTermMax {
|
|
termOpts.Rows = winSize.Rows
|
|
} else {
|
|
termOpts.Rows = atoiDefault(opts.Rows, termOpts.Rows)
|
|
}
|
|
if opts.Cols == PTermMax {
|
|
termOpts.Cols = winSize.Cols
|
|
} else {
|
|
termOpts.Cols = atoiDefault(opts.Cols, termOpts.Cols)
|
|
}
|
|
termOpts.MaxPtySize = base.BoundInt64(termOpts.MaxPtySize, shexec.MinMaxPtySize, shexec.MaxMaxPtySize)
|
|
termOpts.Cols = base.BoundInt(termOpts.Cols, shexec.MinTermCols, shexec.MaxTermCols)
|
|
termOpts.Rows = base.BoundInt(termOpts.Rows, shexec.MinTermRows, shexec.MaxTermRows)
|
|
termOpts.FlexRows = opts.RowsFlex
|
|
return termOpts, nil
|
|
}
|
|
|
|
func convertTermOpts(pkto *packet.TermOpts) *sstore.TermOpts {
|
|
return &sstore.TermOpts{
|
|
Rows: int64(pkto.Rows),
|
|
Cols: int64(pkto.Cols),
|
|
FlexRows: pkto.FlexRows,
|
|
MaxPtySize: pkto.MaxPtySize,
|
|
}
|
|
}
|
|
|
|
func convertToPacketTermOpts(sto sstore.TermOpts) *packet.TermOpts {
|
|
return &packet.TermOpts{
|
|
Rows: int(sto.Rows),
|
|
Cols: int(sto.Cols),
|
|
FlexRows: sto.FlexRows,
|
|
MaxPtySize: sto.MaxPtySize,
|
|
}
|
|
}
|