diff options
| -rw-r--r-- | commands/next-tab.go | 42 | ||||
| -rw-r--r-- | config/aerc.conf | 12 | ||||
| -rw-r--r-- | widgets/aerc.go | 16 |
3 files changed, 64 insertions, 6 deletions
diff --git a/commands/next-tab.go b/commands/next-tab.go new file mode 100644 index 0000000..fee3fb2 --- /dev/null +++ b/commands/next-tab.go @@ -0,0 +1,42 @@ +package commands + +import ( + "errors" + "fmt" + "strconv" + + "git.sr.ht/~sircmpwn/aerc2/widgets" +) + +func init() { + Register("next-tab", NextPrevTab) + Register("prev-tab", NextPrevTab) +} + +func nextPrevTabUsage(cmd string) error { + return errors.New(fmt.Sprintf("Usage: %s [n]", cmd)) +} + +func NextPrevTab(aerc *widgets.Aerc, args []string) error { + if len(args) > 2 { + return nextPrevTabUsage(args[0]) + } + var ( + n int = 1 + err error + ) + if len(args) > 1 { + n, err = strconv.Atoi(args[1]) + if err != nil { + return nextPrevTabUsage(args[0]) + } + } + for ; n > 0; n-- { + if args[0] == "prev-tab" { + aerc.PrevTab() + } else { + aerc.NextTab() + } + } + return nil +} diff --git a/config/aerc.conf b/config/aerc.conf index 30953fc..e465d5e 100644 --- a/config/aerc.conf +++ b/config/aerc.conf @@ -117,10 +117,10 @@ G = :select-message -1<Enter> J = :next-folder<Enter> K = :prev-folder<Enter> -l = :next-account<Enter> -<Right> = :next-account<Enter> -h = :prev-account<Enter> -<Left> = :prev-account<Enter> +l = :next-tab<Enter> +<Right> = :next-tab<Enter> +h = :prev-tab<Enter> +<Left> = :prev-tab<Enter> <Enter> = :view-message<Enter> d = :confirm 'Really delete this message?' ':delete-message<Enter>'<Enter> @@ -132,8 +132,8 @@ $ = :term-exec # # Any key not bound is passed through to the sub-terminal. -<Ctrl+h> = :prev-account<Enter> -<Ctrl+l> = :next-account<Enter> +<Ctrl+h> = :prev-tab<Enter> +<Ctrl+l> = :next-tab<Enter> [colors] # diff --git a/widgets/aerc.go b/widgets/aerc.go index 5841876..b94d03d 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -146,6 +146,22 @@ func (aerc *Aerc) NewTab(drawable ui.Drawable, name string) *ui.Tab { return tab } +func (aerc *Aerc) NextTab() { + next := aerc.tabs.Selected + 1 + if next >= len(aerc.tabs.Tabs) { + next = 0 + } + aerc.tabs.Select(next) +} + +func (aerc *Aerc) PrevTab() { + next := aerc.tabs.Selected - 1 + if next < 0 { + next = len(aerc.tabs.Tabs) - 1 + } + aerc.tabs.Select(next) +} + // TODO: Use per-account status lines, but a global ex line func (aerc *Aerc) SetStatus(status string) *StatusMessage { return aerc.statusline.Set(status) |