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 */
+static int suppress_redisplay; /**< @brief suppress redisplay */
/* Forward Declarations */
static void expand_node(struct choosenode *cn, int contingent);
static void contract_node(struct choosenode *cn);
-static void updated_node(struct choosenode *cn, int redisplay);
+static void updated_node(struct choosenode *cn, int redisplay,
+ const char *why);
static void display_selection(struct choosenode *cn);
static void clear_selection(struct choosenode *cn);
-static void redisplay_tree(void);
+static void redisplay_tree(const char *why);
static struct displaydata display_tree(struct choosenode *cn, int x, int y);
static void undisplay_tree(struct choosenode *cn);
static void initiate_search(void);
/* Only bother updating when we've got the lot */
if(--cn->pending == 0) {
cn->flags &= ~CN_RESOLVING_FILES;
- updated_node(cn, 1);
+ updated_node(cn, 1, "got_resolved_file");
if(!(cn->flags & CN_GETTING_ANY))
filled(cn);
}
trackname_transform("dir", vec[n], "display"),
trackname_transform("dir", vec[n], "sort"),
CN_EXPANDABLE, fill_directory_node);
- updated_node(cn, 1);
+ updated_node(cn, 1, "got_dirs");
cn->flags &= ~CN_GETTING_DIRS;
if(!(cn->flags & CN_GETTING_ANY))
filled(cn);
++nsearchvisible;
progress_window_progress(spw, nsearchvisible, nsearchresults);
if(nsearchvisible == nsearchresults) {
+ if(suppress_redisplay) {
+ suppress_redisplay = 0;
+ redisplay_tree("all search results visible");
+ }
/* 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);
* anyone complains we can make it an option. */
clear_children(cn);
/* We can contract a node immediately. */
- redisplay_tree();
+ redisplay_tree("contract_node");
}
/** @brief qsort() callback for ordering choosenodes */
}
/** @brief Called when an expandable node is updated. */
-static void updated_node(struct choosenode *cn, int redisplay) {
+static void updated_node(struct choosenode *cn, int redisplay,
+ const char *why) {
D(("updated_node %s", cn->path));
assert(cn->flags & CN_EXPANDABLE);
/* It might be that the node has been de-expanded since we requested the
/* Sort children */
qsort(cn->children.vec, cn->children.nvec, sizeof (struct choosenode *),
compare_choosenode);
- if(redisplay)
- redisplay_tree();
+ if(redisplay) {
+ char whywhy[1024];
+
+ snprintf(whywhy, sizeof whywhy, "updated_node %s", why);
+ redisplay_tree(whywhy);
+ }
}
/* Searching --------------------------------------------------------------- */
search_in_flight = 0;
/* Contract any choosenodes that were only expanded to show search
* results */
+ suppress_redisplay = 1;
contract_contingent(root);
+ suppress_redisplay = 0;
if(search_obsolete) {
/* This search has been obsoleted by user input since it started.
* Therefore we throw away the result and search again. */
/* The search results buttons are usable */
gtk_widget_set_sensitive(nextsearch, 1);
gtk_widget_set_sensitive(prevsearch, 1);
+ suppress_redisplay = 1; /* avoid lots of redisplays */
} else {
searchhash = 0; /* for the gc */
- redisplay_tree(); /* remove search markers */
+ redisplay_tree("no search results"); /* remove search markers */
/* The search results buttons are not usable */
gtk_widget_set_sensitive(nextsearch, 0);
gtk_widget_set_sensitive(prevsearch, 0);
}
/** @brief Update the display */
-static void redisplay_tree(void) {
+static void redisplay_tree(const char *why) {
struct displaydata d;
guint oldwidth, oldheight;
- D(("redisplay_tree"));
+ D(("redisplay_tree %s", why));
+ if(suppress_redisplay) {
+ /*fprintf(stderr, "redisplay_tree %s suppressed\n", why);*/
+ return;
+ }
+ /*fprintf(stderr, "redisplay_tree %s *** NOT SUPPRESSED ***\n", why);*/
/* We'll count these up empirically each time */
files_selected = 0;
files_visible = 0;
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"
- : search_result ? "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),
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", "");
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);
* 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(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 */
/** @brief Called when something we care about here might have changed */
void choose_update(void) {
- redisplay_tree();
+ redisplay_tree("choose_update");
}
/*
~mdw / disorder / blobdiff