From 989730d47000feb297b5fab4e273a9d9b13c5741 Mon Sep 17 00:00:00 2001 From: Jeffas Date: Fri, 26 Jul 2019 22:41:13 +0100 Subject: Add index option to change-tab This allows selection of a tab using its index. It attempts to parse the given argument as a number, if it fails then it uses it as a name. Also supports relative indexes using prefixed + or -. --- commands/ct.go | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'commands') diff --git a/commands/ct.go b/commands/ct.go index 19fb63a..4e66331 100644 --- a/commands/ct.go +++ b/commands/ct.go @@ -3,6 +3,7 @@ package commands import ( "errors" "fmt" + "strconv" "strings" "git.sr.ht/~sircmpwn/aerc/widgets" @@ -35,16 +36,34 @@ func (_ ChangeTab) Execute(aerc *widgets.Aerc, args []string) error { if len(args) != 2 { return errors.New(fmt.Sprintf("Usage: %s ", args[0])) } - if args[1] == "-" { ok := aerc.SelectPreviousTab() if !ok { return errors.New("No previous tab to return to") } } else { - ok := aerc.SelectTab(args[1]) - if !ok { - return errors.New("No tab with that name") + n, err := strconv.Atoi(args[1]) + if err == nil { + if strings.HasPrefix(args[1], "+") { + for ; n > 0; n-- { + aerc.NextTab() + } + } else if strings.HasPrefix(args[1], "-") { + for ; n < 0; n++ { + aerc.PrevTab() + } + } else { + ok := aerc.SelectTabIndex(n) + if !ok { + return errors.New( + "No tab with that index") + } + } + } else { + ok := aerc.SelectTab(args[1]) + if !ok { + return errors.New("No tab with that name") + } } } return nil -- cgit v1.2.3