*/
/** @file disobedience/search.c
* @brief Search support
- *
- * TODO:
- * - cleverer focus to implement typeahead find
- * - don't steal ^A
*/
#include "disobedience.h"
#include "choose.h"
-static GtkWidget *choose_search_entry;
+int choose_auto_expanding;
+
+GtkWidget *choose_search_entry;
static GtkWidget *choose_next;
static GtkWidget *choose_prev;
static GtkWidget *choose_clear;
} else {
//fprintf(stderr, " requesting expansion of %s\n", dir);
/* Track is below a non-expanded directory. So let's expand it.
- * choose_make_visible() will arrange a revisit in due course. */
+ * choose_make_visible() will arrange a revisit in due course.
+ *
+ * We mark the row as auto-expanded.
+ */
+ ++choose_auto_expanding;
gtk_tree_view_expand_row(GTK_TREE_VIEW(choose_view),
path,
FALSE/*open_all*/);
gtk_tree_path_free(path);
- /* TODO: the old version would remember which rows had been expanded
- * just to show search results and collapse them again. We should
- * probably do that. */
+ --choose_auto_expanding;
return 0;
}
} else
/** @brief Called with search results */
static void choose_search_completed(void attribute((unused)) *v,
- const char *error,
+ const char *err,
int nvec, char **vec) {
//fprintf(stderr, "choose_search_completed\n");
- if(error) {
- popup_protocol_error(0, error);
+ if(err) {
+ popup_protocol_error(0, err);
return;
}
choose_searching = 0;
return;
}
//fprintf(stderr, "*** %d search results\n", nvec);
+ /* We're actually going to use these search results. Autocollapse anything
+ * left over from the old search. */
+ choose_auto_collapse();
choose_search_hash = hash_new(1);
if(nvec) {
for(int n = 0; n < nvec; ++n)
} else {
gtk_widget_set_sensitive(choose_next, FALSE);
gtk_widget_set_sensitive(choose_prev, FALSE);
+ choose_n_search_results = 0;
+ choose_search_results = 0;
+ choose_n_search_references = 0;
+ choose_search_references = 0;
}
event_raise("search-results-changed", 0);
}
return TRUE;
}
-static void choose_next_clicked(GtkButton attribute((unused)) *button,
- gpointer attribute((unused)) userdata) {
- /* Find the last visible row */
- GtkTreePath *endpath;
- gboolean endvalid = choose_get_visible_range(GTK_TREE_VIEW(choose_view),
- NULL,
- &endpath);
- if(!endvalid)
+/** @brief Move to the next/prev match
+ * @param direction -1 for prev, +1 for next
+ */
+static void choose_move(int direction) {
+ /* Refocus the main view so typahead find continues to work */
+ gtk_widget_grab_focus(choose_view);
+ /* If there's no results we have nothing to do */
+ if(!choose_n_search_results)
+ return;
+ /* Compute bounds for searching over the array in the right direction */
+ const int first = direction > 0 ? 0 : choose_n_search_references - 1;
+ const int limit = direction > 0 ? choose_n_search_references : -1;
+ /* Find the first/last currently visible row */
+ GtkTreePath *limitpath;
+ if(!choose_get_visible_range(GTK_TREE_VIEW(choose_view),
+ direction < 0 ? &limitpath : 0,
+ direction > 0 ? &limitpath : 0))
return;
- /* Find a the first search result later than it. They're sorted so we could
- * actually do much better than this if necessary. */
- for(int n = 0; n < choose_n_search_references; ++n) {
+ /* Find a the first search result later/earlier than it. They're sorted so
+ * we could actually do much better than this if necessary. */
+ for(int n = first; n != limit; n += direction) {
GtkTreePath *path
= gtk_tree_row_reference_get_path(choose_search_references[n]);
if(!path)
continue;
- if(gtk_tree_path_compare(endpath, path) < 0) {
+ /* gtk_tree_path_compare returns -1, 0 or 1 so we compare naively with
+ * direction */
+ if(gtk_tree_path_compare(limitpath, path) + direction == 0) {
choose_make_path_visible(path, 0.5);
gtk_tree_path_free(path);
return;
}
gtk_tree_path_free(path);
}
-}
-
-static void choose_prev_clicked(GtkButton attribute((unused)) *button,
- gpointer attribute((unused)) userdata) {
- /* TODO can we de-dupe with choose_next_clicked? Probably yes. */
- /* Find the first visible row */
- GtkTreePath *startpath;
- gboolean startvalid = choose_get_visible_range(GTK_TREE_VIEW(choose_view),
- &startpath,
- NULL);
- if(!startvalid)
- return;
- /* Find a the last search result earlier than it. They're sorted so we could
- * actually do much better than this if necessary. */
- for(int n = choose_n_search_references - 1; n >= 0; --n) {
+ /* We didn't find one. Loop back to the first/las. */
+ for(int n = first; n != limit; n += direction) {
GtkTreePath *path
= gtk_tree_row_reference_get_path(choose_search_references[n]);
if(!path)
continue;
- if(gtk_tree_path_compare(startpath, path) > 0) {
- choose_make_path_visible(path, 0.5);
- gtk_tree_path_free(path);
- return;
- }
+ choose_make_path_visible(path, 0.5);
gtk_tree_path_free(path);
+ return;
}
}
+void choose_next_clicked(GtkButton attribute((unused)) *button,
+ gpointer attribute((unused)) userdata) {
+ choose_move(1);
+}
+
+void choose_prev_clicked(GtkButton attribute((unused)) *button,
+ gpointer attribute((unused)) userdata) {
+ choose_move(-1);
+}
+
/** @brief Called when the cancel search button is clicked */
static void choose_clear_clicked(GtkButton attribute((unused)) *button,
gpointer attribute((unused)) userdata) {
gtk_entry_set_text(GTK_ENTRY(choose_search_entry), "");
+ gtk_widget_grab_focus(choose_view);
/* We start things off straight away in this case */
initiate_search();
}
+/** @brief Called when the user hits ^F to start a new search */
+void choose_search_new(void) {
+ gtk_editable_select_region(GTK_EDITABLE(choose_search_entry), 0, -1);
+}
+
/** @brief Create the search widget */
GtkWidget *choose_search_widget(void) {
~mdw / disorder / blobdiff