aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-03-14 23:41:25 -0400
committerDrew DeVault <sir@cmpwn.com>2019-03-14 23:41:25 -0400
commit24daef89e0fc6056c3ff7b94880ed12b4ec3eaa6 (patch)
tree82bffc5ee8ec795d07833734929907db0f659f85
parent4c8feb9aa54ddb162558482905c4723e2743e657 (diff)
Implement :{next,prev}-message
-rw-r--r--commands/next-folder.go6
-rw-r--r--commands/next-message.go43
-rw-r--r--widgets/account.go4
-rw-r--r--widgets/msglist.go20
4 files changed, 70 insertions, 3 deletions
diff --git a/commands/next-folder.go b/commands/next-folder.go
index ed11615..dce8907 100644
--- a/commands/next-folder.go
+++ b/commands/next-folder.go
@@ -13,13 +13,13 @@ func init() {
Register("prev-folder", NextPrevFolder)
}
-func usage(cmd string) error {
+func nextPrevFolderUsage(cmd string) error {
return errors.New(fmt.Sprintf("Usage: %s [n]", cmd))
}
func NextPrevFolder(aerc *widgets.Aerc, args []string) error {
if len(args) > 2 {
- return usage(args[0])
+ return nextPrevFolderUsage(args[0])
}
var (
n int = 1
@@ -28,7 +28,7 @@ func NextPrevFolder(aerc *widgets.Aerc, args []string) error {
if len(args) > 1 {
n, err = strconv.Atoi(args[1])
if err != nil {
- return usage(args[0])
+ return nextPrevFolderUsage(args[0])
}
}
acct := aerc.SelectedAccount()
diff --git a/commands/next-message.go b/commands/next-message.go
new file mode 100644
index 0000000..86cd678
--- /dev/null
+++ b/commands/next-message.go
@@ -0,0 +1,43 @@
+package commands
+
+import (
+ "errors"
+ "fmt"
+ "strconv"
+
+ "git.sr.ht/~sircmpwn/aerc2/widgets"
+)
+
+func init() {
+ Register("next-message", NextPrevMessage)
+ Register("prev-message", NextPrevMessage)
+}
+
+func nextPrevMessageUsage(cmd string) error {
+ return errors.New(fmt.Sprintf("Usage: %s [n]", cmd))
+}
+
+func NextPrevMessage(aerc *widgets.Aerc, args []string) error {
+ if len(args) > 2 {
+ return nextPrevMessageUsage(args[0])
+ }
+ var (
+ n int = 1
+ err error
+ )
+ if len(args) > 1 {
+ n, err = strconv.Atoi(args[1])
+ if err != nil {
+ return nextPrevMessageUsage(args[0])
+ }
+ }
+ acct := aerc.SelectedAccount()
+ for ; n > 0; n-- {
+ if args[0] == "prev-message" {
+ acct.Messages().Prev()
+ } else {
+ acct.Messages().Next()
+ }
+ }
+ return nil
+}
diff --git a/widgets/account.go b/widgets/account.go
index 82d2cad..f5e24d2 100644
--- a/widgets/account.go
+++ b/widgets/account.go
@@ -172,6 +172,10 @@ func (acct *AccountView) Directories() *DirectoryList {
return acct.dirlist
}
+func (acct *AccountView) Messages() *MessageList {
+ return acct.msglist
+}
+
func (acct *AccountView) onMessage(msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Done:
diff --git a/widgets/msglist.go b/widgets/msglist.go
index e004e0e..36d7f7a 100644
--- a/widgets/msglist.go
+++ b/widgets/msglist.go
@@ -180,3 +180,23 @@ func (ml *MessageList) SetStore(store *MessageStore) {
}
ml.Invalidate()
}
+
+func (ml *MessageList) nextPrev(delta int) {
+ ml.selected += delta
+ if ml.selected < 0 {
+ ml.selected = len(ml.store.Uids) - 1
+ }
+ if ml.selected >= len(ml.store.Uids) {
+ ml.selected = 0
+ }
+ // TODO: scrolling
+ ml.Invalidate()
+}
+
+func (ml *MessageList) Next() {
+ ml.nextPrev(1)
+}
+
+func (ml *MessageList) Prev() {
+ ml.nextPrev(-1)
+}