when_filled_callback *whenfilled; /**< @brief called when filled or 0 */
void *wfu; /**< @brief passed to @c whenfilled */
+ int ymin; /**< @brief least Y value */
+ int ymax; /**< @brief greatest Y value */
};
/** @brief One item in the popup menu */
/* Variables */
static GtkWidget *chooselayout;
+static GtkAdjustment *vadjust;
static GtkWidget *searchentry; /**< @brief search terms */
+static GtkWidget *nextsearch; /**< @brief next search result */
+static GtkWidget *prevsearch; /**< @brief previous search result */
static struct choosenode *root;
static GtkWidget *track_menu; /**< @brief track popup menu */
static GtkWidget *dir_menu; /**< @brief directory popup menu */
static struct choosenode *last_click; /**< @brief last clicked node for selection */
static int files_visible; /**< @brief total files visible */
static int files_selected; /**< @brief total files selected */
+static int gets_in_flight; /**< @brief total gets in flight */
static int search_in_flight; /**< @brief a search is underway */
static int search_obsolete; /**< @brief the current search is void */
static char **searchresults; /**< @brief search results */
static int nsearchresults; /**< @brief number of results */
static int nsearchvisible; /**< @brief number of search results visible */
static struct hash *searchhash; /**< @brief hash of search results */
+static struct progress_window *spw; /**< @brief progress window */
+static struct choosenode **searchnodes; /**< @brief choosenodes of search results */
/* Forward Declarations */
unsigned flags,
void (*fill)(struct choosenode *));
static void fill_root_node(struct choosenode *cn);
-static void fill_letter_node(struct choosenode *cn);
static void fill_directory_node(struct choosenode *cn);
static void got_files(void *v, int nvec, char **vec);
static void got_resolved_file(void *v, const char *track);
static void initiate_search(void);
static void delete_widgets(struct choosenode *cn);
static void expand_from(struct choosenode *cn);
+static struct choosenode *first_search_result(struct choosenode *cn);
static void clicked_choosenode(GtkWidget attribute((unused)) *widget,
GdkEventButton *event,
/* Maintaining the data structure ------------------------------------------ */
-static char *flags(const struct choosenode *cn) {
+static char *cnflags(const struct choosenode *cn) {
unsigned f = cn->flags, n;
struct dynstr d[1];
D(("filled %s %d/%d", cn->path, nsearchvisible, nsearchresults));
expand_from(cn);
}
+ if(gets_in_flight == 0 && nsearchvisible < nsearchresults)
+ expand_from(root);
}
/** @brief Fill the root */
static void fill_root_node(struct choosenode *cn) {
- int ch;
- char *name;
struct callbackdata *cbd;
D(("fill_root_node"));
clear_children(cn);
- if(choosealpha) {
- if(!cn->children.nvec) { /* Only need to do this once */
- for(ch = 'A'; ch <= 'Z'; ++ch) {
- byte_xasprintf(&name, "%c", ch);
- newnode(cn, "<letter>", name, name, CN_EXPANDABLE, fill_letter_node);
- }
- newnode(cn, "<letter>", "*", "~", CN_EXPANDABLE, fill_letter_node);
- }
- updated_node(cn, 1);
- filled(cn);
- } else {
- /* More de-duping possible here */
- if(cn->flags & CN_GETTING_ANY)
- return;
- gtk_label_set_text(GTK_LABEL(report_label), "getting files");
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_dirs(client, got_dirs, "", 0, cbd);
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_files(client, got_files, "", 0, cbd);
- cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS;
- }
+ /* More de-duping possible here */
+ if(cn->flags & CN_GETTING_ANY)
+ return;
+ gtk_label_set_text(GTK_LABEL(report_label), "getting files");
+ cbd = xmalloc(sizeof *cbd);
+ cbd->u.choosenode = cn;
+ disorder_eclient_dirs(client, got_dirs, "", 0, cbd);
+ cbd = xmalloc(sizeof *cbd);
+ cbd->u.choosenode = cn;
+ disorder_eclient_files(client, got_files, "", 0, cbd);
+ cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS;
+ gets_in_flight += 2;
}
/** @brief Delete all the widgets owned by @p cn */
cn->children.nvec = 0;
}
-/** @brief Fill a letter node */
-static void fill_letter_node(struct choosenode *cn) {
- const char *regexp;
- struct callbackdata *cbd;
-
- D(("fill_letter_node %s", cn->display));
- if(cn->flags & CN_GETTING_ANY)
- return;
- switch(cn->display[0]) {
- default:
- byte_xasprintf((char **)®exp, "^(the )?%c", tolower(cn->display[0]));
- break;
- case 'T':
- regexp = "^(?!the [^t])t";
- break;
- case '*':
- regexp = "^[^a-z]";
- break;
- }
- /* TODO: caching */
- /* TODO: de-dupe against fill_directory_node */
- gtk_label_set_text(GTK_LABEL(report_label), "getting files");
- clear_children(cn);
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_dirs(client, got_dirs, "", regexp, cbd);
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_files(client, got_files, "", regexp, cbd);
- cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS;
-}
-
/** @brief Called with a list of files just below some node */
static void got_files(void *v, int nvec, char **vec) {
struct callbackdata *cbd = v;
struct choosenode *cn = cbd->u.choosenode;
int n;
- D(("got_files %d files for %s %s", nvec, cn->path, flags(cn)));
+ D(("got_files %d files for %s %s", nvec, cn->path, cnflags(cn)));
/* Complicated by the need to resolve aliases. We can save a bit of effort
* by re-using cbd though. */
cn->flags &= ~CN_GETTING_FILES;
+ --gets_in_flight;
if((cn->pending = nvec)) {
cn->flags |= CN_RESOLVING_FILES;
- for(n = 0; n < nvec; ++n)
+ for(n = 0; n < nvec; ++n) {
disorder_eclient_resolve(client, got_resolved_file, vec[n], cbd);
+ ++gets_in_flight;
+ }
}
/* If there are no files and the directories are all read by now, we're
* done */
struct callbackdata *cbd = v;
struct choosenode *cn = cbd->u.choosenode, *file_cn;
- D(("resolved %s %s %d left", cn->path, flags(cn), cn->pending - 1));
+ D(("resolved %s %s %d left", cn->path, cnflags(cn), cn->pending - 1));
/* TODO as below */
file_cn = newnode(cn, track,
trackname_transform("track", track, "display"),
trackname_transform("track", track, "sort"),
0/*flags*/, 0/*fill*/);
+ --gets_in_flight;
/* Only bother updating when we've got the lot */
if(--cn->pending == 0) {
cn->flags &= ~CN_RESOLVING_FILES;
struct choosenode *cn = cbd->u.choosenode;
int n;
- D(("got_dirs %d dirs for %s %s", nvec, cn->path, flags(cn)));
+ D(("got_dirs %d dirs for %s %s", nvec, cn->path, cnflags(cn)));
/* TODO this depends on local configuration for trackname_transform().
* This will work, since the defaults are now built-in, but it'll be
* (potentially) different to the server's configured settings.
* Really we want a variant of files/dirs that produces both the
* raw filename and the transformed name for a chosen context.
*/
+ --gets_in_flight;
for(n = 0; n < nvec; ++n)
newnode(cn, vec[n],
trackname_transform("dir", vec[n], "display"),
D(("fill_directory_node %s", cn->path));
/* TODO: caching */
- /* TODO: de-dupe against fill_letter_node */
if(cn->flags & CN_GETTING_ANY)
return;
assert(report_label != 0);
cbd->u.choosenode = cn;
disorder_eclient_files(client, got_files, cn->path, 0, cbd);
cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS;
+ gets_in_flight += 2;
}
/** @brief Expand a node */
static void expand_node(struct choosenode *cn, int contingent) {
- D(("expand_node %s %d %s", cn->path, contingent, flags(cn)));
+ D(("expand_node %s %d %s", cn->path, contingent, cnflags(cn)));
assert(cn->flags & CN_EXPANDABLE);
/* If node is already expanded do nothing. */
if(cn->flags & CN_EXPANDED) return;
*/
static void expand_from(struct choosenode *cn) {
int n;
- const size_t pathlen = strlen(cn->path);
if(nsearchvisible == nsearchresults)
/* We're done */
return;
/* Are any of the search tracks at/below this point? */
- if(cn != root) {
- for(n = 0; n < nsearchresults; ++n)
- if(strlen(searchresults[n]) >= pathlen
- && !strncmp(cn->path, searchresults[n], pathlen)
- && (searchresults[n][pathlen] == 0
- || searchresults[n][pathlen] == '/'))
- break;
- if(n >= nsearchresults)
- /* This is neither a search result nor an ancestor directory of one */
- return;
- }
+ if(!(cn == root || hash_find(searchhash, cn->path)))
+ return;
D(("expand_from %d/%d visible %s",
nsearchvisible, nsearchresults, cn->path));
if(cn->flags & CN_EXPANDABLE) {
/* This node is marked as expanded already. children.nvec might be 0,
* indicating that expansion is still underway. We should get another
* callback when it is expanded. */
- for(n = 0; n < cn->children.nvec; ++n)
+ for(n = 0; n < cn->children.nvec && gets_in_flight < 10; ++n)
expand_from(cn->children.vec[n]);
else {
/* This node is not expanded yet */
expand_node(cn, 1);
}
- } else
+ } else {
/* This is an actual search result */
++nsearchvisible;
+ progress_window_progress(spw, nsearchvisible, nsearchresults);
+ if(nsearchvisible == nsearchresults) {
+ /* We've got the lot. We make sure the first result is visible. */
+ cn = first_search_result(root);
+ gtk_adjustment_clamp_page(vadjust, cn->ymin, cn->ymax);
+ }
+ }
}
/** @brief Contract all contingently expanded nodes below @p cn */
/* Searching --------------------------------------------------------------- */
-/** @brief Return true if @p track is a search result */
+/** @brief Return true if @p track is a search result
+ *
+ * In particular the return value is one more than the index of the track
+ * @p searchresults.
+ */
static int is_search_result(const char *track) {
- return searchhash && hash_find(searchhash, track);
+ void *r;
+
+ if(searchhash && (r = hash_find(searchhash, track)))
+ return 1 + *(int *)r;
+ else
+ return 0;
+}
+
+/** @brief Return the first search result at or below @p cn */
+static struct choosenode *first_search_result(struct choosenode *cn) {
+ int n;
+ struct choosenode *r;
+
+ if(cn->flags & CN_EXPANDABLE) {
+ for(n = 0; n < cn->children.nvec; ++n)
+ if((r = first_search_result(cn->children.vec[n])))
+ return r;
+ } else if(is_search_result(cn->path))
+ return cn;
+ return 0;
}
/** @brief Called with a list of search results
static void search_completed(void attribute((unused)) *v,
int nvec, char **vec) {
int n;
+ char *s;
search_in_flight = 0;
/* Contract any choosenodes that were only expanded to show search
nsearchresults = nvec;
if(nvec) {
/* Create a new search hash for fast identification of results */
- searchhash = hash_new(1);
- for(n = 0; n < nvec; ++n)
- hash_add(searchhash, vec[n], "", HASH_INSERT_OR_REPLACE);
+ searchhash = hash_new(sizeof(int));
+ for(n = 0; n < nvec; ++n) {
+ int *const ip = xmalloc(sizeof (int *));
+ static const int minus_1 = -1;
+ *ip = n;
+ /* The filename itself lives in the hash */
+ hash_add(searchhash, vec[n], ip, HASH_INSERT_OR_REPLACE);
+ /* So do its ancestor directories */
+ for(s = vec[n] + 1; *s; ++s) {
+ if(*s == '/') {
+ *s = 0;
+ hash_add(searchhash, vec[n], &minus_1, HASH_INSERT_OR_REPLACE);
+ *s = '/';
+ }
+ }
+ }
/* We don't yet know that the results are visible */
nsearchvisible = 0;
+ if(spw) {
+ progress_window_progress(spw, 0, 0);
+ spw = 0;
+ }
+ if(nsearchresults > 50)
+ spw = progress_window_new("Fetching search results");
/* Initiate expansion */
expand_from(root);
+ /* The search results buttons are usable */
+ gtk_widget_set_sensitive(nextsearch, 1);
+ gtk_widget_set_sensitive(prevsearch, 1);
} else {
searchhash = 0; /* for the gc */
+ redisplay_tree(); /* remove search markers */
+ /* The search results buttons are not usable */
+ gtk_widget_set_sensitive(nextsearch, 0);
+ gtk_widget_set_sensitive(prevsearch, 0);
}
}
}
gtk_entry_set_text(GTK_ENTRY(searchentry), "");
}
+/** @brief Called when the 'next search result' button is clicked */
+static void next_clicked(GtkButton attribute((unused)) *button,
+ gpointer attribute((unused)) userdata) {
+ /* We want to find the highest (lowest ymax) track that is below the current
+ * visible range */
+ int n;
+ const gdouble bottom = gtk_adjustment_get_value(vadjust) + vadjust->page_size;
+ const struct choosenode *candidate = 0;
+
+ for(n = 0; n < nsearchresults; ++n) {
+ const struct choosenode *const cn = searchnodes[n];
+
+ if(cn
+ && cn->ymax > bottom
+ && (candidate == 0
+ || cn->ymax < candidate->ymax))
+ candidate = cn;
+ }
+ if(candidate)
+ gtk_adjustment_clamp_page(vadjust, candidate->ymin, candidate->ymax);
+}
+
+/** @brief Called when the 'previous search result' button is clicked */
+static void prev_clicked(GtkButton attribute((unused)) *button,
+ gpointer attribute((unused)) userdata) {
+ /* We want to find the lowest (greated ymax) track that is above the current
+ * visible range */
+ int n;
+ const gdouble top = gtk_adjustment_get_value(vadjust);
+ const struct choosenode *candidate = 0;
+
+ for(n = 0; n < nsearchresults; ++n) {
+ const struct choosenode *const cn = searchnodes[n];
+
+ if(cn
+ && cn->ymin < top
+ && (candidate == 0
+ || cn->ymax > candidate->ymax))
+ candidate = cn;
+ }
+ if(candidate)
+ gtk_adjustment_clamp_page(vadjust, candidate->ymin, candidate->ymax);
+}
+
/* Display functions ------------------------------------------------------- */
/** @brief Delete all the widgets in the tree */
files_visible = 0;
/* Correct the layout and find out how much space it uses */
MTAG_PUSH("display_tree");
+ searchnodes = nsearchresults ? xcalloc(nsearchresults,
+ sizeof (struct choosenode *)) : 0;
d = display_tree(root, 0, 0);
MTAG_POP();
/* We must set the total size or scrolling will not work (it wouldn't be hard
}
/** @brief Recursive step for redisplay_tree()
+ * @param cn Node to display
+ * @param x X coordinate for @p cn
+ * @param y Y coordinate for @p cn
*
* Makes sure all displayed widgets from CN down exist and are in their proper
* place and return the maximum space used.
GtkRequisition req;
struct displaydata d, cd;
GdkPixbuf *pb;
- const char *name;
+ const int search_result = is_search_result(cn->path);
D(("display_tree %s %d,%d", cn->path, x, y));
MTAG_POP();
}
assert(cn->container);
- /* Make sure the widget name is right */
- name = (cn->flags & CN_EXPANDABLE
- ? "choose-dir"
- : is_search_result(cn->path) ? "choose-search" : "choose");
- gtk_widget_set_name(cn->label, name);
- gtk_widget_set_name(cn->container, name);
+ /* Set colors */
+ if(search_result)
+ gtk_widget_modify_bg(cn->container, GTK_STATE_NORMAL, &search_bg);
+ else
+ gtk_widget_modify_bg(cn->container, GTK_STATE_NORMAL, &layout_bg);
+ gtk_widget_modify_bg(cn->container, GTK_STATE_SELECTED, &selected_bg);
+ gtk_widget_modify_bg(cn->container, GTK_STATE_PRELIGHT, &selected_bg);
+ gtk_widget_modify_fg(cn->label, GTK_STATE_NORMAL, &item_fg);
+ gtk_widget_modify_fg(cn->label, GTK_STATE_SELECTED, &selected_fg);
+ gtk_widget_modify_fg(cn->label, GTK_STATE_PRELIGHT, &selected_fg);
/* Make sure the icon is right */
if(cn->flags & CN_EXPANDABLE)
gtk_arrow_set(GTK_ARROW(cn->arrow),
gtk_widget_size_request(cn->container, &req);
d.width = x + req.width;
d.height = y + req.height;
+ cn->ymin = y;
+ cn->ymax = d.height;
if(cn->flags & CN_EXPANDED) {
/* We'll offset children by the size of the arrow whatever it might be. */
assert(cn->arrow);
if(cn->flags & CN_SELECTED)
++files_selected;
}
+ /* update the search results array */
+ if(search_result)
+ searchnodes[search_result - 1] = cn;
/* report back how much space we used */
D(("display_tree %s %d,%d total size %dx%d", cn->path, x, y,
d.width, d.height));
menuitems[n].handlerid = g_signal_connect
(menuitems[n].w, "activate", G_CALLBACK(menuitems[n].activate), cn);
}
+ set_tool_colors(menu);
/* Pop up the menu */
gtk_widget_show_all(menu);
gtk_menu_popup(GTK_MENU(menu), 0, 0, 0, 0,
/* Public entry points ----------------------------------------------------- */
+/** @brief Called to entirely reset the choose screen */
+static void choose_reset(void) {
+ if(root)
+ undisplay_tree(root);
+ root = newnode(0/*parent*/, "<root>", "All files", "",
+ CN_EXPANDABLE, fill_root_node);
+ expand_node(root, 0); /* will call redisplay_tree */
+}
+
/** @brief Create a track choice widget */
GtkWidget *choose_widget(void) {
int n;
/* Cancel button to clear the search */
NW(button);
clearsearch = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ gtk_widget_modify_bg(clearsearch, GTK_STATE_NORMAL, &tool_bg);
+ gtk_widget_modify_bg(clearsearch, GTK_STATE_ACTIVE, &tool_active);
+ gtk_widget_modify_bg(clearsearch, GTK_STATE_PRELIGHT, &tool_active);
+ gtk_widget_modify_bg(clearsearch, GTK_STATE_SELECTED, &tool_active);
g_signal_connect(G_OBJECT(clearsearch), "clicked",
G_CALLBACK(clearsearch_clicked), 0);
gtk_tooltips_set_tip(tips, clearsearch, "Clear search terms", "");
-
- /* hbox packs the search box and the cancel button together on a line */
+ /* Up and down buttons to find previous/next results; initially they are not
+ * usable as there are no search results. */
+ prevsearch = iconbutton("up.png", "Previous search result");
+ g_signal_connect(G_OBJECT(prevsearch), "clicked",
+ G_CALLBACK(prev_clicked), 0);
+ gtk_widget_set_sensitive(prevsearch, 0);
+ gtk_widget_modify_bg(prevsearch, GTK_STATE_NORMAL, &tool_bg);
+ gtk_widget_modify_bg(prevsearch, GTK_STATE_ACTIVE, &tool_active);
+ gtk_widget_modify_bg(prevsearch, GTK_STATE_PRELIGHT, &tool_active);
+ gtk_widget_modify_bg(prevsearch, GTK_STATE_SELECTED, &tool_active);
+ gtk_widget_modify_bg(prevsearch, GTK_STATE_INSENSITIVE, &tool_active);
+ nextsearch = iconbutton("down.png", "Next search result");
+ g_signal_connect(G_OBJECT(nextsearch), "clicked",
+ G_CALLBACK(next_clicked), 0);
+ gtk_widget_set_sensitive(nextsearch, 0);
+ gtk_widget_modify_bg(nextsearch, GTK_STATE_NORMAL, &tool_bg);
+ gtk_widget_modify_bg(nextsearch, GTK_STATE_ACTIVE, &tool_active);
+ gtk_widget_modify_bg(nextsearch, GTK_STATE_PRELIGHT, &tool_active);
+ gtk_widget_modify_bg(nextsearch, GTK_STATE_SELECTED, &tool_active);
+ gtk_widget_modify_bg(nextsearch, GTK_STATE_INSENSITIVE, &tool_active);
+
+ /* hbox packs the search tools button together on a line */
NW(hbox);
hbox = gtk_hbox_new(FALSE/*homogeneous*/, 1/*spacing*/);
gtk_box_pack_start(GTK_BOX(hbox), searchentry,
TRUE/*expand*/, TRUE/*fill*/, 0/*padding*/);
- gtk_box_pack_end(GTK_BOX(hbox), clearsearch,
- FALSE/*expand*/, FALSE/*fill*/, 0/*padding*/);
+ gtk_box_pack_start(GTK_BOX(hbox), prevsearch,
+ FALSE/*expand*/, FALSE/*fill*/, 0/*padding*/);
+ gtk_box_pack_start(GTK_BOX(hbox), nextsearch,
+ FALSE/*expand*/, FALSE/*fill*/, 0/*padding*/);
+ gtk_box_pack_start(GTK_BOX(hbox), clearsearch,
+ FALSE/*expand*/, FALSE/*fill*/, 0/*padding*/);
/* chooselayout contains the currently visible subset of the track
* namespace */
NW(layout);
chooselayout = gtk_layout_new(0, 0);
- root = newnode(0/*parent*/, "<root>", "All files", "",
- CN_EXPANDABLE, fill_root_node);
- expand_node(root, 0); /* will call redisplay_tree */
+ gtk_widget_modify_bg(chooselayout, GTK_STATE_NORMAL, &layout_bg);
+ choose_reset();
+ register_reset(choose_reset);
/* Create the popup menus */
NW(menu);
track_menu = gtk_menu_new();
0, 1, n, n + 1);
}
/* The layout is scrollable */
- scrolled = scroll_widget(GTK_WIDGET(chooselayout), "choose");
+ scrolled = scroll_widget(chooselayout);
+ vadjust = gtk_layout_get_vadjustment(GTK_LAYOUT(chooselayout));
/* The scrollable layout and the search hbox go together in a vbox */
NW(vbox);
~mdw / disorder / blobdiff