X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fcc8b9f7b5575b251110171941db742d620edc9f..8c3487524048510e3de4c8fbe90dc7f8cdc35858:/disobedience/choose.c diff --git a/disobedience/choose.c b/disobedience/choose.c index b7f77c4..731c7a2 100644 --- a/disobedience/choose.c +++ b/disobedience/choose.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2006, 2007 Richard Kettlewell + * Copyright (C) 2006-2008 Richard Kettlewell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,9 +26,72 @@ */ #include "disobedience.h" +#include "timeval.h" /* Choose track ------------------------------------------------------------ */ +#if TDEBUG +/* Timing */ +static struct { + struct timeval total; + struct timeval gtkbits; + struct timeval menuupdate; + struct timeval new_widgets; + struct timeval undisplay; + struct timeval colors; + struct timeval markers; + struct timeval location; + struct timeval selection; +} times; + +#define BEGIN(WHAT) do { \ + struct timeval started##WHAT, finished##WHAT; \ + xgettimeofday(&started##WHAT, 0) + +#define END(WHAT) \ + xgettimeofday(&finished##WHAT, 0); \ + times.WHAT = tvadd(times.WHAT, tvsub(finished##WHAT, started##WHAT)); \ +} while(0) + +#define INIT() memset(×, 0, sizeof times) + +#define REPORT() do { \ + fprintf(stderr, "total=%g\n" \ + "gtkbits=%g\n" \ + "menuupdate=%g\n" \ + "new_widgets=%g\n" \ + "undisplay=%g\n" \ + "colors=%g\n" \ + "markers=%g\n" \ + "location=%g\n" \ + "selection=%g\n" \ + "accumulation=%g\n" \ + "\n", \ + tvdouble(times.total), \ + tvdouble(times.gtkbits), \ + tvdouble(times.menuupdate), \ + tvdouble(times.new_widgets), \ + tvdouble(times.undisplay), \ + tvdouble(times.colors), \ + tvdouble(times.markers), \ + tvdouble(times.location), \ + tvdouble(times.selection), \ + (tvdouble(times.gtkbits) \ + + tvdouble(times.menuupdate) \ + + tvdouble(times.new_widgets) \ + + tvdouble(times.undisplay) \ + + tvdouble(times.colors) \ + + tvdouble(times.markers) \ + + tvdouble(times.location) \ + + tvdouble(times.selection))); \ +} while(0) +#else +#define BEGIN(WHAT) do { +#define END(WHAT) } while(0) +#define INIT() ((void)0) +#define REPORT() ((void)0) +#endif + WT(label); WT(event_box); WT(menu); @@ -138,6 +201,7 @@ 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 */ +static int suppress_redisplay; /**< @brief suppress redisplay */ /* Forward Declarations */ @@ -150,18 +214,19 @@ static struct choosenode *newnode(struct choosenode *parent, void (*fill)(struct choosenode *)); static void fill_root_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 got_dirs(void *v, int nvec, char **vec); +static void got_files(void *v, const char *error, int nvec, char **vec); +static void got_resolved_file(void *v, const char *error, const char *track); +static void got_dirs(void *v, const char *error, int nvec, char **vec); 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); @@ -293,20 +358,14 @@ static void filled(struct choosenode *cn) { /** @brief Fill the root */ static void fill_root_node(struct choosenode *cn) { - struct callbackdata *cbd; - D(("fill_root_node")); clear_children(cn); /* 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); + disorder_eclient_dirs(client, got_dirs, "", 0, cn); + disorder_eclient_files(client, got_files, "", 0, cn); cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS; gets_in_flight += 2; } @@ -358,20 +417,23 @@ static void clear_children(struct choosenode *cn) { } /** @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; +static void got_files(void *v, const char *error, int nvec, char **vec) { + struct choosenode *cn = v; int n; + if(error) { + popup_protocol_error(0, error); + return; + } + 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. */ + /* Complicated by the need to resolve aliases. */ cn->flags &= ~CN_GETTING_FILES; --gets_in_flight; if((cn->pending = nvec)) { cn->flags |= CN_RESOLVING_FILES; for(n = 0; n < nvec; ++n) { - disorder_eclient_resolve(client, got_resolved_file, vec[n], cbd); + disorder_eclient_resolve(client, got_resolved_file, vec[n], cn); ++gets_in_flight; } } @@ -379,34 +441,43 @@ static void got_files(void *v, int nvec, char **vec) { * done */ if(!(cn->flags & CN_GETTING_ANY)) filled(cn); + if(!gets_in_flight) + redisplay_tree("got_files"); } /** @brief Called with an alias resolved filename */ -static void got_resolved_file(void *v, const char *track) { - struct callbackdata *cbd = v; - struct choosenode *cn = cbd->u.choosenode, *file_cn; - - 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; - updated_node(cn, 1); - if(!(cn->flags & CN_GETTING_ANY)) - filled(cn); +static void got_resolved_file(void *v, const char *error, const char *track) { + struct choosenode *const cn = v, *file_cn; + + if(error) { + popup_protocol_error(0, error); + } else { + 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; + updated_node(cn, gets_in_flight == 0, "got_resolved_file"); + if(!(cn->flags & CN_GETTING_ANY)) + filled(cn); + } } } /** @brief Called with a list of directories just below some node */ -static void got_dirs(void *v, int nvec, char **vec) { - struct callbackdata *cbd = v; - struct choosenode *cn = cbd->u.choosenode; +static void got_dirs(void *v, const char *error, int nvec, char **vec) { + struct choosenode *cn = v; int n; + + if(error) { + popup_protocol_error(0, error); + return; + } D(("got_dirs %d dirs for %s %s", nvec, cn->path, cnflags(cn))); /* TODO this depends on local configuration for trackname_transform(). @@ -422,7 +493,7 @@ static void got_dirs(void *v, int nvec, char **vec) { trackname_transform("dir", vec[n], "display"), trackname_transform("dir", vec[n], "sort"), CN_EXPANDABLE, fill_directory_node); - updated_node(cn, 1); + updated_node(cn, gets_in_flight == 0, "got_dirs"); cn->flags &= ~CN_GETTING_DIRS; if(!(cn->flags & CN_GETTING_ANY)) filled(cn); @@ -430,8 +501,6 @@ static void got_dirs(void *v, int nvec, char **vec) { /** @brief Fill a child node */ static void fill_directory_node(struct choosenode *cn) { - struct callbackdata *cbd; - D(("fill_directory_node %s", cn->path)); /* TODO: caching */ if(cn->flags & CN_GETTING_ANY) @@ -439,12 +508,8 @@ static void fill_directory_node(struct choosenode *cn) { assert(report_label != 0); 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, cn->path, 0, cbd); - cbd = xmalloc(sizeof *cbd); - cbd->u.choosenode = cn; - disorder_eclient_files(client, got_files, cn->path, 0, cbd); + disorder_eclient_dirs(client, got_dirs, cn->path, 0, cn); + disorder_eclient_files(client, got_files, cn->path, 0, cn); cn->flags |= CN_GETTING_FILES|CN_GETTING_DIRS; gets_in_flight += 2; } @@ -506,6 +571,10 @@ static void expand_from(struct choosenode *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); @@ -539,7 +608,7 @@ static void contract_node(struct choosenode *cn) { * 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 */ @@ -553,7 +622,8 @@ static int compare_choosenode(const void *av, const void *bv) { } /** @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 @@ -562,8 +632,12 @@ static void updated_node(struct choosenode *cn, int redisplay) { /* 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 --------------------------------------------------------------- */ @@ -602,14 +676,22 @@ static struct choosenode *first_search_result(struct choosenode *cn) { * and also from initiate_seatch with an always empty list to indicate that * we're not searching for anything in particular. */ static void search_completed(void attribute((unused)) *v, + const char *error, int nvec, char **vec) { int n; char *s; + if(error) { + popup_protocol_error(0, error); + return; + } + 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. */ @@ -650,9 +732,10 @@ static void search_completed(void attribute((unused)) *v, /* 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); @@ -687,13 +770,13 @@ static void initiate_search(void) { /* The search terms are bad! We treat this as if there were no search * terms at all. Some kind of feedback would be handy. */ fprintf(stderr, "bad terms [%s]\n", terms); /* TODO */ - search_completed(0, 0, 0); + search_completed(0, 0, 0, 0); } else { search_in_flight = 1; } } else { /* No search terms - we want to see all tracks */ - search_completed(0, 0, 0); + search_completed(0, 0, 0, 0); } } @@ -761,11 +844,22 @@ static void delete_widgets(struct choosenode *cn) { } /** @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; + } + if(gets_in_flight) { + /*fprintf(stderr, "redisplay_tree %s suppressed (gets_in_flight)\n", why);*/ + return; + } + INIT(); + BEGIN(total); + /*fprintf(stderr, "redisplay_tree %s *** NOT SUPPRESSED ***\n", why);*/ /* We'll count these up empirically each time */ files_selected = 0; files_visible = 0; @@ -775,6 +869,8 @@ static void redisplay_tree(void) { sizeof (struct choosenode *)) : 0; d = display_tree(root, 0, 0); MTAG_POP(); + + BEGIN(gtkbits); /* We must set the total size or scrolling will not work (it wouldn't be hard * for GtkLayout to figure it out for itself but presumably you're supposed * to be able to have widgets off the edge of the layuot.) @@ -788,8 +884,13 @@ static void redisplay_tree(void) { if(oldwidth > d.width || oldheight > d.height) gtk_widget_queue_draw(chooselayout); gtk_layout_set_size(GTK_LAYOUT(chooselayout), d.width, d.height); + END(gtkbits); /* Notify the main menu of any recent changes */ + BEGIN(menuupdate); menu_update(-1); + END(menuupdate); + END(total); + REPORT(); } /** @brief Recursive step for redisplay_tree() @@ -805,7 +906,6 @@ static struct displaydata display_tree(struct choosenode *cn, int x, int y) { 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)); @@ -816,6 +916,7 @@ static struct displaydata display_tree(struct choosenode *cn, int x, int y) { * A non-expandable item has just a text label and no arrow. */ if(!cn->container) { + BEGIN(new_widgets); MTAG_PUSH("make_widgets_1"); /* Widgets need to be created */ NW(hbox); @@ -855,15 +956,21 @@ static struct displaydata display_tree(struct choosenode *cn, int x, int y) { /* Show everything by default */ gtk_widget_show_all(cn->container); MTAG_POP(); + END(new_widgets); } 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 */ + BEGIN(colors); + if(search_result) { + gtk_widget_set_style(cn->container, search_style); + gtk_widget_set_style(cn->label, search_style); + } else { + gtk_widget_set_style(cn->container, layout_style); + gtk_widget_set_style(cn->label, layout_style); + } + END(colors); /* Make sure the icon is right */ + BEGIN(markers); if(cn->flags & CN_EXPANDABLE) gtk_arrow_set(GTK_ARROW(cn->arrow), cn->flags & CN_EXPANDED ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT, @@ -872,7 +979,9 @@ static struct displaydata display_tree(struct choosenode *cn, int x, int y) { /* Make sure the queued marker is right */ /* TODO: doesn't always work */ (queued(cn->path) ? gtk_widget_show : gtk_widget_hide)(cn->marker); + END(markers); /* Put the widget in the right place */ + BEGIN(location); if(cn->flags & CN_DISPLAYED) gtk_layout_move(GTK_LAYOUT(chooselayout), cn->container, x, y); else { @@ -881,9 +990,12 @@ static struct displaydata display_tree(struct choosenode *cn, int x, int y) { /* Now chooselayout has a ref to the container */ g_object_unref(cn->container); } + END(location); /* Set the widget's selection status */ + BEGIN(selection); if(!(cn->flags & CN_EXPANDABLE)) display_selection(cn); + END(selection); /* Find the size used so we can get vertical positioning right. */ gtk_widget_size_request(cn->container, &req); d.width = x + req.width; @@ -902,8 +1014,10 @@ static struct displaydata display_tree(struct choosenode *cn, int x, int y) { d.height = cd.height; } } else { + BEGIN(undisplay); for(n = 0; n < cn->children.nvec; ++n) undisplay_tree(cn->children.vec[n]); + END(undisplay); } if(!(cn->flags & CN_EXPANDABLE)) { ++files_visible; @@ -976,6 +1090,13 @@ static void clear_selection(struct choosenode *cn) { /* User actions ------------------------------------------------------------ */ +/** @brief Called when disorder_eclient_play completes */ +void play_completed(void attribute((unused)) *v, + const char *error) { + if(error) + popup_protocol_error(0, error); +} + /** @brief Clicked on something * * This implements playing, all the modifiers for selection, etc. @@ -1050,7 +1171,7 @@ static void clicked_choosenode(GtkWidget attribute((unused)) *widget, clear_selection(root); set_selection(cn, 1); gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue"); - disorder_eclient_play(client, cn->path, 0, 0); + disorder_eclient_play(client, cn->path, play_completed, 0); last_click = 0; } } else if(event->type == GDK_BUTTON_PRESS @@ -1077,6 +1198,7 @@ static void clicked_choosenode(GtkWidget attribute((unused)) *widget, 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, @@ -1125,7 +1247,7 @@ static void activate_track_play(GtkMenuItem attribute((unused)) *menuitem, gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue"); for(n = 0; tracks[n]; ++n) - disorder_eclient_play(client, tracks[n], 0, 0); + disorder_eclient_play(client, tracks[n], play_completed, 0); } /** @brief Called when the menu's properties option is activated */ @@ -1173,7 +1295,7 @@ static void play_dir(struct choosenode *cn, gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue"); for(n = 0; n < ntracks; ++n) - disorder_eclient_play(client, tracks[n], 0, 0); + disorder_eclient_play(client, tracks[n], play_completed, 0); } static void properties_dir(struct choosenode *cn, @@ -1267,6 +1389,14 @@ static int choose_selectall_sensitive(GtkWidget attribute((unused)) *w) { return FALSE; } +/** @brief Determine whether the edit menu's select none option should be sensitive + * + * TODO not implemented, see also choose_selectnone_activate() + */ +static int choose_selectnone_sensitive(GtkWidget attribute((unused)) *w) { + return FALSE; +} + /** @brief Called when the edit menu's properties option is activated */ static void choose_properties_activate(GtkWidget attribute((unused)) *w) { activate_track_properties(0, 0); @@ -1278,16 +1408,33 @@ static void choose_properties_activate(GtkWidget attribute((unused)) *w) { static void choose_selectall_activate(GtkWidget attribute((unused)) *w) { } +/** @brief Called when the edit menu's select none option is activated + * + * TODO not implemented, see choose_selectnone_sensitive() */ +static void choose_selectnone_activate(GtkWidget attribute((unused)) *w) { +} + /** @brief Main menu callbacks for Choose screen */ static const struct tabtype tabtype_choose = { choose_properties_sensitive, choose_selectall_sensitive, + choose_selectnone_sensitive, choose_properties_activate, choose_selectall_activate, + choose_selectnone_activate, }; /* 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*/, "", "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; @@ -1317,12 +1464,14 @@ GtkWidget *choose_widget(void) { /* Text entry box for search terms */ NW(entry); searchentry = gtk_entry_new(); + gtk_widget_set_style(searchentry, tool_style); g_signal_connect(searchentry, "changed", G_CALLBACK(searchentry_changed), 0); gtk_tooltips_set_tip(tips, searchentry, "Enter search terms here; search is automatic", ""); /* Cancel button to clear the search */ NW(button); clearsearch = gtk_button_new_from_stock(GTK_STOCK_CANCEL); + gtk_widget_set_style(clearsearch, tool_style); g_signal_connect(G_OBJECT(clearsearch), "clicked", G_CALLBACK(clearsearch_clicked), 0); gtk_tooltips_set_tip(tips, clearsearch, "Clear search terms", ""); @@ -1332,10 +1481,12 @@ GtkWidget *choose_widget(void) { prevsearch = iconbutton("up.png", "Previous search result"); g_signal_connect(G_OBJECT(prevsearch), "clicked", G_CALLBACK(prev_clicked), 0); + gtk_widget_set_style(prevsearch, tool_style); gtk_widget_set_sensitive(prevsearch, 0); nextsearch = iconbutton("down.png", "Next search result"); g_signal_connect(G_OBJECT(nextsearch), "clicked", G_CALLBACK(next_clicked), 0); + gtk_widget_set_style(nextsearch, tool_style); gtk_widget_set_sensitive(nextsearch, 0); /* hbox packs the search tools button together on a line */ @@ -1354,9 +1505,9 @@ GtkWidget *choose_widget(void) { * namespace */ NW(layout); chooselayout = gtk_layout_new(0, 0); - root = newnode(0/*parent*/, "", "All files", "", - CN_EXPANDABLE, fill_root_node); - expand_node(root, 0); /* will call redisplay_tree */ + gtk_widget_set_style(chooselayout, layout_style); + choose_reset(); + register_reset(choose_reset); /* Create the popup menus */ NW(menu); track_menu = gtk_menu_new(); @@ -1381,7 +1532,7 @@ GtkWidget *choose_widget(void) { 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 */ @@ -1398,7 +1549,7 @@ GtkWidget *choose_widget(void) { /** @brief Called when something we care about here might have changed */ void choose_update(void) { - redisplay_tree(); + redisplay_tree("choose_update"); } /*