X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fb009628568c52bfc82b1ed3ebf438762096307b..15837f6a85332fbebf28f839bf4009218342bdc6:/disobedience/choose.c diff --git a/disobedience/choose.c b/disobedience/choose.c index 0d2fc0b..ff5e72b 100644 --- a/disobedience/choose.c +++ b/disobedience/choose.c @@ -1,3 +1,4 @@ + /* * This file is part of DisOrder * Copyright (C) 2006-2008 Richard Kettlewell @@ -214,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); @@ -358,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; } @@ -423,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; } } @@ -449,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(). @@ -497,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) @@ -506,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; } @@ -678,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 */ @@ -766,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); } } @@ -780,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 */ @@ -1086,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. @@ -1160,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 @@ -1236,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 */ @@ -1251,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 ---------------------------------------------------- */ @@ -1284,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, @@ -1361,62 +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 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) { +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 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 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, - choose_selectnone_sensitive, + NULL/*choose_selectall_sensitive*/, + NULL/*choose_selectnone_sensitive*/, choose_properties_activate, - choose_selectall_activate, - choose_selectnone_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", "", @@ -1495,32 +1494,28 @@ GtkWidget *choose_widget(void) { NW(layout); chooselayout = gtk_layout_new(0, 0); gtk_widget_set_style(chooselayout, layout_style); - choose_reset(); - register_reset(choose_reset); + 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(); - gtk_widget_set_style(track_menu, tool_style); g_signal_connect(track_menu, "destroy", G_CALLBACK(gtk_widget_destroyed), &track_menu); for(n = 0; track_menuitems[n].name; ++n) { NW(menu_item); track_menuitems[n].w = gtk_menu_item_new_with_label(track_menuitems[n].name); - gtk_widget_set_style(track_menuitems[n].w, tool_style); gtk_menu_attach(GTK_MENU(track_menu), track_menuitems[n].w, 0, 1, n, n + 1); } NW(menu); dir_menu = gtk_menu_new(); - gtk_widget_set_style(dir_menu, tool_style); g_signal_connect(dir_menu, "destroy", G_CALLBACK(gtk_widget_destroyed), &dir_menu); for(n = 0; dir_menuitems[n].name; ++n) { NW(menu_item); dir_menuitems[n].w = gtk_menu_item_new_with_label(dir_menuitems[n].name); - gtk_widget_set_style(dir_menuitems[n].w, tool_style); gtk_menu_attach(GTK_MENU(dir_menu), dir_menuitems[n].w, 0, 1, n, n + 1); }