Commit 4a7f7875318553da67065b06f4a7a2e0f7eb4176
2018-05-10T14:35:47
implement page-down scroll in tog log view
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
diff --git a/tog/tog.c b/tog/tog.c
index c0fdf7c..bbec670 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -441,8 +441,8 @@ fetch_commits(struct commit_queue_entry **start_entry,
}
static const struct got_error *
-draw_commits(struct commit_queue_entry **last,
- struct commit_queue_entry *first, int selected, int limit)
+draw_commits(struct commit_queue_entry **last, struct commit_queue_entry *first,
+ int selected, int limit)
{
const struct got_error *err = NULL;
struct commit_queue_entry *entry;
@@ -541,12 +541,25 @@ scroll_down(struct commit_queue_entry **first_displayed_entry, int n,
return NULL;
}
+static int
+num_parents(struct commit_queue_entry *entry)
+{
+ int nparents = 0;
+
+ while (entry) {
+ entry = TAILQ_NEXT(entry, entry);
+ nparents++;
+ }
+
+ return nparents;
+}
+
static const struct got_error *
show_log_view(struct got_object_id *start_id, struct got_repository *repo)
{
const struct got_error *err = NULL;
struct got_object_id *id;
- int ch, done = 0, selected = 0;
+ int ch, done = 0, selected = 0, nparents;
struct commit_queue commits;
struct commit_queue_entry *first_displayed_entry = NULL;
struct commit_queue_entry *last_displayed_entry = NULL;
@@ -613,6 +626,16 @@ show_log_view(struct got_object_id *start_id, struct got_repository *repo)
if (err)
goto done;
break;
+ case KEY_NPAGE:
+ nparents = num_parents(first_displayed_entry);
+ err = scroll_down(&first_displayed_entry,
+ MIN(nparents, LINES), last_displayed_entry,
+ &commits, repo);
+ if (err)
+ goto done;
+ nparents = num_parents(first_displayed_entry);
+ selected = MIN(nparents, LINES) - 1;
+ break;
case KEY_RESIZE:
if (selected > LINES)
selected = LINES - 1;