Commit Diff

Commit:
1c5e5faa6333a09f54d94e18818547ae55f433f7
From:
Mark Jamsek <mark@jamsek.dev>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
alias C-b/C-f to scroll page back/forward with b/f Suggested by naddy. Remap 'f'ullscreen to 'F', and blame view key maps 'b' and 'B' to 'c' and 'C', respectively, per stsp's and naddy's suggestion. While here, remove trailing whitespace. ok naddy@
Actions:
Patch | Tree
commit - 016bfe4bc2e2f43aea446f3c89e1539235c66fd2
commit + 1c5e5faa6333a09f54d94e18818547ae55f433f7
blob - 31dd5084aea96d44619fbb6cccdbd3f12ca27915
blob + ccc38d4c5d675293f415ff2696edfd596fbb3220
--- tog/tog.1
+++ tog/tog.1
@@ -64,7 +64,7 @@ Quit
 Quit the view which is in focus.
 .It Cm Tab
 Switch focus between views.
-.It Cm f
+.It Cm F
 Toggle fullscreen mode for a split-screen view.
 .Nm
 will automatically use split-screen views if the size of the terminal
@@ -114,9 +114,9 @@ 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
+.It Cm Page-down, Ctrl+f, f
 Move the selection cursor down one page.
-.It Cm Page-up, Ctrl+b
+.It Cm Page-up, Ctrl+b, b
 Move the selection cursor up one page.
 .It Cm Ctrl+d, d
 Move the selection cursor down one half page.
@@ -239,9 +239,9 @@ Diff output moves right on the screen.
 Scroll view to the rightmost position.
 .It Cm 0
 Scroll view left to the start of the line.
-.It Cm Page-down, Space, Ctrl+f
+.It Cm Page-down, Space, Ctrl+f, f
 Scroll down one page.
-.It Cm Page-up, Ctrl+b
+.It Cm Page-up, Ctrl+b, b
 Scroll up one page.
 .It Cm Ctrl+d, d
 Scroll down one half page.
@@ -320,9 +320,9 @@ File output moves right on the screen.
 Scroll view to the rightmost position.
 .It Cm 0
 Scroll view left to the start of the line.
-.It Cm Page-down, Space, Ctrl+f
+.It Cm Page-down, Space, Ctrl+f, f
 Move the selection cursor down one page.
-.It Cm Page-up, Ctrl+b
+.It Cm Page-up, Ctrl+b, b
 Move the selection cursor up one page.
 .It Cm Ctrl+d, d
 Move the selection cursor down one half page.
@@ -336,7 +336,7 @@ Move the selection cursor to the last line of the file
 Open a
 .Cm diff
 view for the currently selected line's commit.
-.It Cm b
+.It Cm c
 Reload the
 .Cm blame
 view with the version of the file as found in the currently
@@ -346,7 +346,7 @@ Reload the
 .Cm blame
 view with the version of the file as found in the parent commit of the
 currently selected line's commit.
-.It Cm B
+.It Cm C
 Reload the
 .Cm blame
 view with the previously blamed commit.
@@ -403,9 +403,9 @@ 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
+.It Cm Page-down, Ctrl+f, f
 Move the selection cursor down one page.
-.It Cm Page-up, Ctrl+b
+.It Cm Page-up, Ctrl+b, b
 Move the selection cursor up one page.
 .It Cm Ctrl+d, d
 Move the selection cursor down one half page.
@@ -477,9 +477,9 @@ 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
+.It Cm Page-down, Ctrl+f, f
 Move the selection cursor down one page.
-.It Cm Page-up, Ctrl+b
+.It Cm Page-up, Ctrl+b, b
 Move the selection cursor up one page.
 .It Cm Ctrl+d, d
 Move the selection cursor down one half page.
blob - 11494c8c26e0c6b19d6db5607f102770b3462e43
blob + cd781101f2b3d1c878adeb7a1acfae913bd7de0e
--- tog/tog.c
+++ tog/tog.c
@@ -972,7 +972,7 @@ view_input(struct tog_view **new, int *done, struct to
 	case 'Q':
 		*done = 1;
 		break;
-	case 'f':
+	case 'F':
 		if (view_is_parent_view(view)) {
 			if (view->child == NULL)
 				break;
@@ -2634,6 +2634,7 @@ input_log_view(struct tog_view **new_view, struct tog_
 		/* FALL THROUGH */
 	case KEY_PPAGE:
 	case CTRL('b'):
+	case 'b':
 		if (s->first_displayed_entry == NULL)
 			break;
 		if (TAILQ_FIRST(&s->commits.head) == s->first_displayed_entry)
@@ -2686,7 +2687,8 @@ input_log_view(struct tog_view **new_view, struct tog_
 		nscroll /= 2;
 		/* FALL THROUGH */
 	case KEY_NPAGE:
-	case CTRL('f'): {
+	case CTRL('f'):
+	case 'f': {
 		struct commit_queue_entry *first;
 		first = s->first_displayed_entry;
 		if (first == NULL)
@@ -3196,7 +3198,7 @@ add_matched_line(int *wtotal, const char *line, int wl
 			}
 			if (width0 + w + width > skipcol)
 				break;
-			w += width; 
+			w += width;
 			i++;
 		}
 		/* draw (visible part of) matched token (if scrolled into it) */
@@ -4066,6 +4068,7 @@ input_diff_view(struct tog_view **new_view, struct tog
 		/* FALL THROUGH */
 	case KEY_PPAGE:
 	case CTRL('b'):
+	case 'b':
 		if (s->first_displayed_line == 1)
 			break;
 		i = 0;
@@ -4084,6 +4087,7 @@ input_diff_view(struct tog_view **new_view, struct tog
 		/* FALL THROUGH */
 	case KEY_NPAGE:
 	case CTRL('f'):
+	case 'f':
 	case ' ':
 		if (s->eof)
 			break;
@@ -5008,6 +5012,7 @@ input_blame_view(struct tog_view **new_view, struct to
 		/* FALL THROUGH */
 	case KEY_PPAGE:
 	case CTRL('b'):
+	case 'b':
 		if (s->first_displayed_line == 1) {
 			s->selected_line = MAX(1, s->selected_line - nscroll);
 			break;
@@ -5028,7 +5033,7 @@ input_blame_view(struct tog_view **new_view, struct to
 		    s->blame.nlines)
 			s->first_displayed_line++;
 		break;
-	case 'b':
+	case 'c':
 	case 'p': {
 		struct got_object_id *id = NULL;
 		id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
@@ -5096,7 +5101,7 @@ input_blame_view(struct tog_view **new_view, struct to
 			break;
 		break;
 	}
-	case 'B': {
+	case 'C': {
 		struct got_object_qid *first;
 		first = STAILQ_FIRST(&s->blamed_commits);
 		if (!got_object_id_cmp(&first->id, s->commit_id))
@@ -5166,6 +5171,7 @@ input_blame_view(struct tog_view **new_view, struct to
 		/* FALL THROUGH */
 	case KEY_NPAGE:
 	case CTRL('f'):
+	case 'f':
 	case ' ':
 		if (s->last_displayed_line >= s->blame.nlines &&
 		    s->selected_line >= MIN(s->blame.nlines,
@@ -5970,6 +5976,7 @@ input_tree_view(struct tog_view **new_view, struct tog
 		/* FALL THROUGH */
 	case KEY_PPAGE:
 	case CTRL('b'):
+	case 'b':
 		if (s->tree == s->root) {
 			if (got_object_tree_get_first_entry(s->tree) ==
 			    s->first_displayed_entry)
@@ -5999,6 +6006,7 @@ input_tree_view(struct tog_view **new_view, struct tog
 		/* FALL THROUGH */
 	case KEY_NPAGE:
 	case CTRL('f'):
+	case 'f':
 		if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
 		    == NULL) {
 			/* can't scroll any further; move cursor down */
@@ -6847,6 +6855,7 @@ input_ref_view(struct tog_view **new_view, struct tog_
 		/* FALL THROUGH */
 	case KEY_PPAGE:
 	case CTRL('b'):
+	case 'b':
 		if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
 			s->selected -= MIN(nscroll, s->selected);
 		ref_scroll_up(s, MAX(0, nscroll));
@@ -6869,6 +6878,7 @@ input_ref_view(struct tog_view **new_view, struct tog_
 		/* FALL THROUGH */
 	case KEY_NPAGE:
 	case CTRL('f'):
+	case 'f':
 		if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL) {
 			/* can't scroll any further; move cursor down */
 			if (s->selected < s->ndisplayed - 1)