implement search for got tree view
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
diff --git a/tog/tog.c b/tog/tog.c
index 2c08f13..49ba8f0 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -228,6 +228,7 @@ struct tog_tree_view_state {
struct got_object_id *commit_id;
struct got_repository *repo;
struct got_reflist_head *refs;
+ struct got_tree_entry *matched_entry;
};
/*
@@ -315,6 +316,8 @@ static const struct got_error *show_tree_view(struct tog_view *);
static const struct got_error *input_tree_view(struct tog_view **,
struct tog_view **, struct tog_view **, struct tog_view *, int);
static const struct got_error *close_tree_view(struct tog_view *);
+static const struct got_error *search_start_tree_view(struct tog_view *);
+static const struct got_error *search_next_tree_view(struct tog_view *);
static volatile sig_atomic_t tog_sigwinch_received;
@@ -524,6 +527,7 @@ tog_resizeterm(void)
static const struct got_error *
view_search_start(struct tog_view *view)
{
+ const struct got_error *err = NULL;
char pattern[1024];
int ret;
@@ -549,7 +553,11 @@ view_search_start(struct tog_view *view)
if (regcomp(&view->regex, pattern,
REG_EXTENDED | REG_ICASE | REG_NOSUB | REG_NEWLINE) == 0) {
- view->search_start(view);
+ err = view->search_start(view);
+ if (err) {
+ regfree(&view->regex);
+ return err;
+ }
view->searching = TOG_SEARCH_FORWARD;
view->search_next_done = 0;
view->search_next(view);
@@ -1806,7 +1814,6 @@ search_next_log_view(struct tog_view *view)
return NULL;
}
-
static const struct got_error *
open_log_view(struct tog_view *view, struct got_object_id *start_id,
struct got_reflist_head *refs, struct got_repository *repo,
@@ -3889,6 +3896,8 @@ open_tree_view(struct tog_view *view, struct got_tree_object *root,
view->show = show_tree_view;
view->input = input_tree_view;
view->close = close_tree_view;
+ view->search_start = search_start_tree_view;
+ view->search_next = search_next_tree_view;
done:
free(commit_id_str);
if (err) {
@@ -3922,6 +3931,103 @@ close_tree_view(struct tog_view *view)
}
static const struct got_error *
+search_start_tree_view(struct tog_view *view)
+{
+ struct tog_tree_view_state *s = &view->state.tree;
+
+ s->matched_entry = NULL;
+ return NULL;
+}
+
+static int
+match_tree_entry(struct got_tree_entry *te, regex_t *regex)
+{
+ regmatch_t regmatch;
+
+ return regexec(regex, te->name, 1, ®match, 0) == 0;
+}
+
+static const struct got_error *
+search_next_tree_view(struct tog_view *view)
+{
+ struct tog_tree_view_state *s = &view->state.tree;
+ struct got_tree_entry *entry, *te;
+
+ if (!view->searching) {
+ view->search_next_done = 1;
+ return NULL;
+ }
+
+ if (s->matched_entry) {
+ if (view->searching == TOG_SEARCH_FORWARD) {
+ if (s->selected_entry)
+ entry = SIMPLEQ_NEXT(s->selected_entry, entry);
+ else
+ entry = SIMPLEQ_FIRST(&s->entries->head);
+ }
+ else {
+ if (s->selected_entry == NULL) {
+ SIMPLEQ_FOREACH(te, &s->entries->head, entry)
+ entry = te;
+ } else {
+ SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
+ entry = te;
+ if (SIMPLEQ_NEXT(te, entry) ==
+ s->selected_entry)
+ break;
+ }
+ }
+ }
+ } else {
+ if (view->searching == TOG_SEARCH_FORWARD)
+ entry = SIMPLEQ_FIRST(&s->entries->head);
+ else {
+ SIMPLEQ_FOREACH(te, &s->entries->head, entry)
+ entry = te;
+ }
+ }
+
+ while (1) {
+ if (entry == NULL) {
+ if (view->searching == TOG_SEARCH_FORWARD)
+ entry = SIMPLEQ_FIRST(&s->entries->head);
+ else {
+ SIMPLEQ_FOREACH(te, &s->entries->head, entry)
+ entry = te;
+ }
+ }
+
+ if (match_tree_entry(entry, &view->regex)) {
+ view->search_next_done = 1;
+ s->matched_entry = entry;
+ break;
+ }
+
+ if (view->searching == TOG_SEARCH_FORWARD)
+ entry = SIMPLEQ_NEXT(entry, entry);
+ else {
+ if (SIMPLEQ_FIRST(&s->entries->head) == entry)
+ entry = NULL;
+ else {
+ SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
+ if (SIMPLEQ_NEXT(te, entry) == entry) {
+ entry = te;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if (s->matched_entry) {
+ s->first_displayed_entry = s->matched_entry;
+ s->selected = 0;
+ }
+
+ return NULL;
+}
+
+static const struct got_error *
show_tree_view(struct tog_view *view)
{
const struct got_error *err = NULL;