Commit b880cc75ed8a91d3ed8ddb051aa4ea4e2b7314c0
2022-06-30T05:02:23
tog: refactor log cursor movement in prep for hsplit Simplify the log input handler by moving (page)up/down and home/end logic into helper routines as we need to perform some checks on these cases when navigating the log view in horizontal splits. ok op@ and stsp@
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 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196
diff --git a/tog/tog.c b/tog/tog.c
index 89606b6..d66402a 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -2619,6 +2619,82 @@ show_log_view(struct tog_view *view)
return draw_commits(view);
}
+static void
+log_move_cursor_up(struct tog_view *view, int page, int home)
+{
+ struct tog_log_view_state *s = &view->state.log;
+
+ if (s->selected_entry->idx == 0)
+ view->count = 0;
+ if (s->first_displayed_entry == NULL)
+ return;
+
+ if ((page && TAILQ_FIRST(&s->commits.head) == s->first_displayed_entry)
+ || home)
+ s->selected = home ? 0 : MAX(0, s->selected - page - 1);
+
+ if (!page && !home && s->selected > 0)
+ --s->selected;
+ else
+ log_scroll_up(s, home ? s->commits.ncommits : MAX(page, 1));
+
+ select_commit(s);
+ return;
+}
+
+static const struct got_error *
+log_move_cursor_down(struct tog_view *view, int page)
+{
+ struct tog_log_view_state *s = &view->state.log;
+ struct commit_queue_entry *first;
+ const struct got_error *err = NULL;
+
+ first = s->first_displayed_entry;
+ if (first == NULL) {
+ view->count = 0;
+ return NULL;
+ }
+
+ if (s->thread_args.log_complete &&
+ s->selected_entry->idx >= s->commits.ncommits - 1)
+ return NULL;
+
+ if (!page) {
+ int eos = view->nlines - 2;
+
+ if (s->selected < MIN(eos, s->commits.ncommits - 1))
+ ++s->selected;
+ else
+ err = log_scroll_down(view, 1);
+ } else if (s->thread_args.log_complete) {
+ if (s->last_displayed_entry->idx == s->commits.ncommits - 1)
+ s->selected += MIN(s->last_displayed_entry->idx -
+ s->selected_entry->idx, page + 1);
+ else
+ err = log_scroll_down(view, MIN(page,
+ s->commits.ncommits - s->selected_entry->idx - 1));
+ s->selected = MIN(view->nlines - 2, s->commits.ncommits - 1);
+ } else {
+ err = log_scroll_down(view, page);
+ if (err)
+ return err;
+ if (first == s->first_displayed_entry && s->selected <
+ MIN(view->nlines - 2, s->commits.ncommits - 1)) {
+ s->selected = MIN(s->commits.ncommits - 1, page);
+ }
+ }
+ if (err)
+ return err;
+
+ select_commit(s);
+
+ if (s->thread_args.log_complete &&
+ s->selected_entry->idx == s->commits.ncommits - 1)
+ view->count = 0;
+
+ return NULL;
+}
+
static const struct got_error *
input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
{
@@ -2634,12 +2710,9 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
s->thread_args.load_all = 0;
else if (s->thread_args.log_complete) {
s->thread_args.load_all = 0;
- log_scroll_down(view, s->commits.ncommits);
- s->selected = MIN(view->nlines - 2,
- s->commits.ncommits - 1);
- select_commit(s);
+ err = log_move_cursor_down(view, s->commits.ncommits);
}
- return NULL;
+ return err;
}
switch (ch) {
@@ -2671,21 +2744,11 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
case '<':
case ',':
case CTRL('p'):
- if (s->selected_entry->idx == 0)
- view->count = 0;
- if (s->first_displayed_entry == NULL)
- break;
- if (s->selected > 0)
- s->selected--;
- else
- log_scroll_up(s, 1);
- select_commit(s);
+ log_move_cursor_up(view, 0, 0);
break;
case 'g':
case KEY_HOME:
- s->selected = 0;
- s->first_displayed_entry = TAILQ_FIRST(&s->commits.head);
- select_commit(s);
+ log_move_cursor_up(view, 0, 1);
view->count = 0;
break;
case CTRL('u'):
@@ -2695,35 +2758,14 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
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)
- s->selected = MAX(0, s->selected - nscroll - 1);
- else
- log_scroll_up(s, nscroll);
- select_commit(s);
- if (s->selected_entry->idx == 0)
- view->count = 0;
+ log_move_cursor_up(view, nscroll, 0);
break;
case 'j':
case KEY_DOWN:
case '>':
case '.':
case CTRL('n'):
- if (s->first_displayed_entry == NULL)
- break;
- if (s->selected < MIN(view->nlines - 2,
- s->commits.ncommits - 1))
- s->selected++;
- else {
- err = log_scroll_down(view, 1);
- if (err)
- break;
- }
- select_commit(s);
- if (s->thread_args.log_complete &&
- s->selected_entry->idx == s->commits.ncommits - 1)
- view->count = 0;
+ err = log_move_cursor_down(view, 0);
break;
case 'G':
case KEY_END: {
@@ -2755,29 +2797,9 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
case KEY_NPAGE:
case CTRL('f'):
case 'f':
- case ' ': {
- struct commit_queue_entry *first;
- first = s->first_displayed_entry;
- if (first == NULL) {
- view->count = 0;
- break;
- }
- err = log_scroll_down(view, nscroll);
- if (err)
- break;
- if (first == s->first_displayed_entry &&
- s->selected < MIN(view->nlines - 2,
- s->commits.ncommits - 1)) {
- /* can't scroll further down */
- s->selected += MIN(s->last_displayed_entry->idx -
- s->selected_entry->idx, nscroll + 1);
- }
- select_commit(s);
- if (s->thread_args.log_complete &&
- s->selected_entry->idx == s->commits.ncommits - 1)
- view->count = 0;
+ case ' ':
+ err = log_move_cursor_down(view, nscroll);
break;
- }
case KEY_RESIZE:
if (s->selected > view->nlines - 2)
s->selected = view->nlines - 2;