~sircmpwn/aerc

989730d47000feb297b5fab4e273a9d9b13c5741 — Jeffas 1 year, 3 months ago 0ee7d30
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 -.
3 files changed, 37 insertions(+), 6 deletions(-)

M commands/ct.go
M doc/aerc.1.scd
M widgets/aerc.go
M commands/ct.go => commands/ct.go +23 -4
@@ 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 <tab>", 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

M doc/aerc.1.scd => doc/aerc.1.scd +4 -2
@@ 36,8 36,10 @@ These commands work in any context.
*cd* <directory>
	Changes aerc's current working directory.

*change-tab* <tabname>
	Changes the focus to the tab with the name.
*change-tab* [+|-]<tab name or index>
	Changes the focus to the tab with the given name. If a number is given,
	it's treated as an index. If + or - is specified, the number is interpreted
	as a delta from the selected tab.

*exec* <command...>
	Executes an arbitrary command in the background.

M widgets/aerc.go => widgets/aerc.go +10 -0
@@ 268,6 268,16 @@ func (aerc *Aerc) SelectTab(name string) bool {
	return false
}

func (aerc *Aerc) SelectTabIndex(index int) bool {
	for i, _ := range aerc.tabs.Tabs {
		if i == index {
			aerc.tabs.Select(i)
			return true
		}
	}
	return false
}

func (aerc *Aerc) TabNames() []string {
	var names []string
	for _, tab := range aerc.tabs.Tabs {