X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/cf1f8eef576a3ef7af7053fc7337836ad34ca00a..15837f6a85332fbebf28f839bf4009218342bdc6:/disobedience/choose.c diff --git a/disobedience/choose.c b/disobedience/choose.c index 7ce30da..ff5e72b 100644 --- a/disobedience/choose.c +++ b/disobedience/choose.c @@ -1,6 +1,7 @@ + /* * 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 +27,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); @@ -151,9 +215,9 @@ 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); @@ -295,20 +359,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; } @@ -360,20 +418,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; } } @@ -386,31 +447,38 @@ static void got_files(void *v, int nvec, char **vec) { } /** @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, gets_in_flight == 0, "got_resolved_file"); - 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(). @@ -434,8 +502,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) @@ -443,12 +509,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; } @@ -615,10 +677,16 @@ 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 */ @@ -703,13 +771,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); } } @@ -717,6 +785,8 @@ static void initiate_search(void) { static void clearsearch_clicked(GtkButton attribute((unused)) *button, gpointer attribute((unused)) userdata) { gtk_entry_set_text(GTK_ENTRY(searchentry), ""); + /* Put the input focus back */ + gtk_widget_grab_focus(searchentry); } /** @brief Called when the 'next search result' button is clicked */ @@ -786,6 +856,12 @@ static void redisplay_tree(const char *why) { /*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; @@ -796,6 +872,8 @@ static void redisplay_tree(const char *why) { 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.) @@ -809,8 +887,13 @@ static void redisplay_tree(const char *why) { 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() @@ -836,6 +919,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); @@ -875,19 +959,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); /* 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); + 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, @@ -896,7 +982,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 { @@ -905,9 +993,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; @@ -926,8 +1017,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; @@ -1000,6 +1093,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. @@ -1074,7 +1174,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 @@ -1150,7 +1250,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 */ @@ -1165,12 +1265,15 @@ static void activate_track_properties(GtkMenuItem attribute((unused)) *menuitem, /** @brief Determine whether the menu's play option should be sensitive */ static gboolean sensitive_track_play(struct choosenode attribute((unused)) *cn) { return (!!files_selected - && (disorder_eclient_state(client) & DISORDER_CONNECTED)); + && (disorder_eclient_state(client) & DISORDER_CONNECTED) + && (last_rights & RIGHT_PLAY)); } /** @brief Determine whether the menu's properties option should be sensitive */ static gboolean sensitive_track_properties(struct choosenode attribute((unused)) *cn) { - return !!files_selected && (disorder_eclient_state(client) & DISORDER_CONNECTED); + return (!!files_selected + && (disorder_eclient_state(client) & DISORDER_CONNECTED) + && (last_rights & RIGHT_PREFS)); } /* Directory menu items ---------------------------------------------------- */ @@ -1198,7 +1301,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, @@ -1275,46 +1378,44 @@ static gboolean sensitive_dir_select(struct choosenode attribute((unused)) *cn) return TRUE; } - - /* Main menu plumbing ------------------------------------------------------ */ /** @brief Determine whether the edit menu's properties option should be sensitive */ -static int choose_properties_sensitive(GtkWidget attribute((unused)) *w) { +static int choose_properties_sensitive(void attribute((unused)) *extra) { return !!files_selected && (disorder_eclient_state(client) & DISORDER_CONNECTED); } -/** @brief Determine whether the edit menu's select all option should be sensitive - * - * TODO not implemented, see also choose_selectall_activate() - */ -static int choose_selectall_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) { +static void choose_properties_activate(void attribute((unused)) *extra) { activate_track_properties(0, 0); } -/** @brief Called when the edit menu's select all option is activated - * - * TODO not implemented, see choose_selectall_sensitive() */ -static void choose_selectall_activate(GtkWidget attribute((unused)) *w) { +/** @brief Called when the choose tab is selected */ +static void choose_tab_selected(void) { + gtk_widget_grab_focus(searchentry); } /** @brief Main menu callbacks for Choose screen */ static const struct tabtype tabtype_choose = { choose_properties_sensitive, - choose_selectall_sensitive, + NULL/*choose_selectall_sensitive*/, + NULL/*choose_selectnone_sensitive*/, choose_properties_activate, - choose_selectall_activate, + NULL/*choose_selectall_activate*/, + NULL/*choose_selectnone_activate*/, + choose_tab_selected, + 0 }; /* Public entry points ----------------------------------------------------- */ -/** @brief Called to entirely reset the choose screen */ -static void choose_reset(void) { +/** @brief Called when we have just logged in + * + * Entirely resets the choose tab. + */ +static void choose_logged_in(const char attribute((unused)) *event, + void attribute((unused)) *eventdata, + void attribute((unused)) *callbackdata) { if(root) undisplay_tree(root); root = newnode(0/*parent*/, "", "All files", "", @@ -1351,16 +1452,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_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); + 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", ""); @@ -1370,21 +1469,13 @@ 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); - 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_style(nextsearch, tool_style); 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); @@ -1402,9 +1493,9 @@ GtkWidget *choose_widget(void) { * namespace */ NW(layout); chooselayout = gtk_layout_new(0, 0); - gtk_widget_modify_bg(chooselayout, GTK_STATE_NORMAL, &layout_bg); - choose_reset(); - register_reset(choose_reset); + gtk_widget_set_style(chooselayout, layout_style); + choose_logged_in(0, 0, 0); + event_register("logged-in", choose_logged_in, 0); /* Create the popup menus */ NW(menu); track_menu = gtk_menu_new();