Commit 3e13595003634037ff26696ce7a32545721bfc24
2020-12-01T23:50:40
pass only the view state to scroll functions that don't need the full view 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
diff --git a/tog/tog.c b/tog/tog.c
index 1752dad..dcec3b8 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -1683,9 +1683,8 @@ done:
}
static void
-log_scroll_up(struct tog_view *view, int maxscroll)
+log_scroll_up(struct tog_log_view_state *s, int maxscroll)
{
- struct tog_log_view_state *s = &view->state.log;
struct commit_queue_entry *entry;
int nscrolled = 0;
@@ -2362,7 +2361,7 @@ input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
if (s->selected > 0)
s->selected--;
else
- log_scroll_up(view, 1);
+ log_scroll_up(s, 1);
break;
case KEY_PPAGE:
case CTRL('b'):
@@ -2373,7 +2372,7 @@ input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected = 0;
break;
}
- log_scroll_up(view, view->nlines - 1);
+ log_scroll_up(s, view->nlines - 1);
break;
case 'j':
case KEY_DOWN:
@@ -4931,9 +4930,8 @@ draw_tree_entries(struct tog_view *view, const char *parent_path)
}
static void
-tree_scroll_up(struct tog_view *view, int maxscroll)
+tree_scroll_up(struct tog_tree_view_state *s, 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;
@@ -4954,9 +4952,8 @@ tree_scroll_up(struct tog_view *view, int maxscroll)
}
static void
-tree_scroll_down(struct tog_view *view, int maxscroll)
+tree_scroll_down(struct tog_tree_view_state *s, int maxscroll)
{
- struct tog_tree_view_state *s = &view->state.tree;
struct got_tree_entry *next, *last;
int n = 0;
@@ -5353,7 +5350,7 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected--;
break;
}
- tree_scroll_up(view, 1);
+ tree_scroll_up(s, 1);
break;
case KEY_PPAGE:
case CTRL('b'):
@@ -5365,7 +5362,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, MAX(0, view->nlines - 3));
+ tree_scroll_up(s, MAX(0, view->nlines - 3));
break;
case 'j':
case KEY_DOWN:
@@ -5377,7 +5374,7 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
== NULL)
/* can't scroll any further */
break;
- tree_scroll_down(view, 1);
+ tree_scroll_down(s, 1);
break;
case KEY_NPAGE:
case CTRL('f'):
@@ -5388,7 +5385,7 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected = s->ndisplayed - 1;
break;
}
- tree_scroll_down(view, view->nlines - 3);
+ tree_scroll_down(s, view->nlines - 3);
break;
case KEY_ENTER:
case '\r':
@@ -5790,9 +5787,8 @@ done:
}
static void
-ref_scroll_up(struct tog_view *view, int maxscroll)
+ref_scroll_up(struct tog_ref_view_state *s, int maxscroll)
{
- struct tog_ref_view_state *s = &view->state.ref;
struct tog_reflist_entry *re;
int i = 0;
@@ -5809,9 +5805,8 @@ ref_scroll_up(struct tog_view *view, int maxscroll)
}
static void
-ref_scroll_down(struct tog_view *view, int maxscroll)
+ref_scroll_down(struct tog_ref_view_state *s, int maxscroll)
{
- struct tog_ref_view_state *s = &view->state.ref;
struct tog_reflist_entry *next, *last;
int n = 0;
@@ -6139,13 +6134,13 @@ input_ref_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected--;
break;
}
- ref_scroll_up(view, 1);
+ ref_scroll_up(s, 1);
break;
case KEY_PPAGE:
case CTRL('b'):
if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
s->selected = 0;
- ref_scroll_up(view, MAX(0, view->nlines - 1));
+ ref_scroll_up(s, MAX(0, view->nlines - 1));
break;
case 'j':
case KEY_DOWN:
@@ -6156,7 +6151,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(view, 1);
+ ref_scroll_down(s, 1);
break;
case KEY_NPAGE:
case CTRL('f'):
@@ -6166,7 +6161,7 @@ input_ref_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected = s->ndisplayed - 1;
break;
}
- ref_scroll_down(view, view->nlines - 1);
+ ref_scroll_down(s, view->nlines - 1);
break;
case CTRL('l'):
ref_view_free_refs(s);