Commit 694d3271e2afd0fc9a20ede5856bd4ee41d92eb3
2020-12-01T14:53:55
trim redundant parameters from {ref,tree}_scroll_{up,down} functions Pass only the view and scroll amount to these functions; remove unused parameters and those that are contained in the view state. ok 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 197 198 199 200 201 202 203
diff --git a/tog/tog.c b/tog/tog.c
index 37a8fe8..3d070a1 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -4986,47 +4986,47 @@ draw_tree_entries(struct tog_view *view,
}
static void
-tree_scroll_up(struct tog_view *view,
- struct got_tree_entry **first_displayed_entry, int maxscroll,
- struct got_tree_object *tree, int isroot)
+tree_scroll_up(struct tog_view *view, int maxscroll)
{
+ struct tog_tree_view_state *s = &view->state.tree;
struct got_tree_entry *te;
+ int isroot = s->tree == s->root;
int i = 0;
- if (*first_displayed_entry == NULL)
+ if (s->first_displayed_entry == NULL)
return;
- te = got_tree_entry_get_prev(tree, *first_displayed_entry);
+ te = got_tree_entry_get_prev(s->tree, s->first_displayed_entry);
while (i++ < maxscroll) {
if (te == NULL) {
if (!isroot)
- *first_displayed_entry = NULL;
+ s->first_displayed_entry = NULL;
break;
}
- *first_displayed_entry = te;
- te = got_tree_entry_get_prev(tree, te);
+ s->first_displayed_entry = te;
+ te = got_tree_entry_get_prev(s->tree, te);
}
}
static void
-tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
- struct got_tree_entry *last_displayed_entry,
- struct got_tree_object *tree)
+tree_scroll_down(struct tog_view *view, int maxscroll)
{
+ struct tog_tree_view_state *s = &view->state.tree;
struct got_tree_entry *next, *last;
int n = 0;
- if (*first_displayed_entry)
- next = got_tree_entry_get_next(tree, *first_displayed_entry);
+ if (s->first_displayed_entry)
+ next = got_tree_entry_get_next(s->tree,
+ s->first_displayed_entry);
else
- next = got_object_tree_get_first_entry(tree);
+ next = got_object_tree_get_first_entry(s->tree);
- last = last_displayed_entry;
+ last = s->last_displayed_entry;
while (next && last && n++ < maxscroll) {
- last = got_tree_entry_get_next(tree, last);
+ last = got_tree_entry_get_next(s->tree, last);
if (last) {
- *first_displayed_entry = next;
- next = got_tree_entry_get_next(tree, next);
+ s->first_displayed_entry = next;
+ next = got_tree_entry_get_next(s->tree, next);
}
}
}
@@ -5412,8 +5412,7 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected--;
break;
}
- tree_scroll_up(view, &s->first_displayed_entry, 1,
- s->tree, s->tree == s->root);
+ tree_scroll_up(view, 1);
break;
case KEY_PPAGE:
case CTRL('b'):
@@ -5425,8 +5424,7 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
if (s->first_displayed_entry == NULL)
s->selected = 0;
}
- tree_scroll_up(view, &s->first_displayed_entry,
- MAX(0, view->nlines - 3), s->tree, s->tree == s->root);
+ tree_scroll_up(view, MAX(0, view->nlines - 3));
break;
case 'j':
case KEY_DOWN:
@@ -5438,8 +5436,7 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
== NULL)
/* can't scroll any further */
break;
- tree_scroll_down(&s->first_displayed_entry, 1,
- s->last_displayed_entry, s->tree);
+ tree_scroll_down(view, 1);
break;
case KEY_NPAGE:
case CTRL('f'):
@@ -5450,8 +5447,7 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected = s->ndisplayed - 1;
break;
}
- tree_scroll_down(&s->first_displayed_entry, view->nlines - 3,
- s->last_displayed_entry, s->tree);
+ tree_scroll_down(view, view->nlines - 3);
break;
case KEY_ENTER:
case '\r':
@@ -5853,43 +5849,41 @@ done:
}
static void
-ref_scroll_up(struct tog_view *view,
- struct tog_reflist_entry **first_displayed_entry, int maxscroll,
- struct tog_reflist_head *refs)
+ref_scroll_up(struct tog_view *view, int maxscroll)
{
+ struct tog_ref_view_state *s = &view->state.ref;
struct tog_reflist_entry *re;
int i = 0;
- if (*first_displayed_entry == TAILQ_FIRST(refs))
+ if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
return;
- re = TAILQ_PREV(*first_displayed_entry, tog_reflist_head, entry);
+ re = TAILQ_PREV(s->first_displayed_entry, tog_reflist_head, entry);
while (i++ < maxscroll) {
if (re == NULL)
break;
- *first_displayed_entry = re;
+ s->first_displayed_entry = re;
re = TAILQ_PREV(re, tog_reflist_head, entry);
}
}
static void
-ref_scroll_down(struct tog_reflist_entry **first_displayed_entry, int maxscroll,
- struct tog_reflist_entry *last_displayed_entry,
- struct tog_reflist_head *refs)
+ref_scroll_down(struct tog_view *view, int maxscroll)
{
+ struct tog_ref_view_state *s = &view->state.ref;
struct tog_reflist_entry *next, *last;
int n = 0;
- if (*first_displayed_entry)
- next = TAILQ_NEXT(*first_displayed_entry, entry);
+ if (s->first_displayed_entry)
+ next = TAILQ_NEXT(s->first_displayed_entry, entry);
else
- next = TAILQ_FIRST(refs);
+ next = TAILQ_FIRST(&s->refs);
- last = last_displayed_entry;
+ last = s->last_displayed_entry;
while (next && last && n++ < maxscroll) {
last = TAILQ_NEXT(last, entry);
if (last) {
- *first_displayed_entry = next;
+ s->first_displayed_entry = next;
next = TAILQ_NEXT(next, entry);
}
}
@@ -6204,14 +6198,13 @@ input_ref_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected--;
break;
}
- ref_scroll_up(view, &s->first_displayed_entry, 1, &s->refs);
+ ref_scroll_up(view, 1);
break;
case KEY_PPAGE:
case CTRL('b'):
if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
s->selected = 0;
- ref_scroll_up(view, &s->first_displayed_entry,
- MAX(0, view->nlines - 1), &s->refs);
+ ref_scroll_up(view, MAX(0, view->nlines - 1));
break;
case 'j':
case KEY_DOWN:
@@ -6222,8 +6215,7 @@ input_ref_view(struct tog_view **new_view, struct tog_view **dead_view,
if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL)
/* can't scroll any further */
break;
- ref_scroll_down(&s->first_displayed_entry, 1,
- s->last_displayed_entry, &s->refs);
+ ref_scroll_down(view, 1);
break;
case KEY_NPAGE:
case CTRL('f'):
@@ -6233,8 +6225,7 @@ input_ref_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected = s->ndisplayed - 1;
break;
}
- ref_scroll_down(&s->first_displayed_entry,
- view->nlines - 1, s->last_displayed_entry, &s->refs);
+ ref_scroll_down(view, view->nlines - 1);
break;
case CTRL('l'):
ref_view_free_refs(s);