Commit 48bb96f04b6f67bbc78ae9526830dbf20e84ef7d

Christian Weisgerber 2022-06-20T20:53:20

tog: make SPACE page down in all views ok op@, Mark Jamsek

diff --git a/tog/tog.1 b/tog/tog.1
index ccc38d4..a89f36b 100644
--- a/tog/tog.1
+++ b/tog/tog.1
@@ -114,7 +114,7 @@ Log message moves right on the screen.
 Scroll log message field to the rightmost position.
 .It Cm 0
 Scroll log message field to the leftmost position.
-.It Cm Page-down, Ctrl+f, f
+.It Cm Page-down, Space, Ctrl+f, f
 Move the selection cursor down one page.
 .It Cm Page-up, Ctrl+b, b
 Move the selection cursor up one page.
@@ -130,7 +130,7 @@ This will traverse all commits on the current branch which may take
 a long time depending on the number of commits in branch history.
 If needed, this operation can be cancelled with
 .Cm Backspace .
-.It Cm Enter, Space
+.It Cm Enter
 Open a
 .Cm diff
 view showing file changes made in the currently selected commit.
@@ -403,7 +403,7 @@ are as follows:
 Move the selection cursor down.
 .It Cm Up-arrow, k, Ctrl-p
 Move the selection cursor up.
-.It Cm Page-down, Ctrl+f, f
+.It Cm Page-down, Space, Ctrl+f, f
 Move the selection cursor down one page.
 .It Cm Page-up, Ctrl+b, b
 Move the selection cursor up one page.
@@ -477,7 +477,7 @@ are as follows:
 Move the selection cursor down.
 .It Cm Up-arrow, k, Ctrl-p
 Move the selection cursor up.
-.It Cm Page-down, Ctrl+f, f
+.It Cm Page-down, Space, Ctrl+f, f
 Move the selection cursor down one page.
 .It Cm Page-up, Ctrl+b, b
 Move the selection cursor up one page.
diff --git a/tog/tog.c b/tog/tog.c
index 89cccde..17b45ee 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -2684,7 +2684,8 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
 		/* FALL THROUGH */
 	case KEY_NPAGE:
 	case CTRL('f'):
-	case 'f': {
+	case 'f':
+	case ' ': {
 		struct commit_queue_entry *first;
 		first = s->first_displayed_entry;
 		if (first == NULL)
@@ -2716,7 +2717,6 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
 		}
 		break;
 	case KEY_ENTER:
-	case ' ':
 	case '\r':
 		if (s->selected_entry == NULL)
 			break;
@@ -6003,6 +6003,7 @@ input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
 	case KEY_NPAGE:
 	case CTRL('f'):
 	case 'f':
+	case ' ':
 		if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
 		    == NULL) {
 			/* can't scroll any further; move cursor down */
@@ -6875,6 +6876,7 @@ input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
 	case KEY_NPAGE:
 	case CTRL('f'):
 	case 'f':
+	case ' ':
 		if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL) {
 			/* can't scroll any further; move cursor down */
 			if (s->selected < s->ndisplayed - 1)