From ebcfbfefdd8ba3bae79daf5e4a2385c012aa7591 Mon Sep 17 00:00:00 2001 From: Richard Kettlewell Date: Thu, 12 Jun 2008 10:32:34 +0100 Subject: [PATCH] Start rewriting Disobedience choose tab using native tree. Much simpler so far though there is a shopping list of TODOs left yet. --- disobedience/choose.c | 1695 ++++++++----------------------------------------- 1 file changed, 272 insertions(+), 1423 deletions(-) diff --git a/disobedience/choose.c b/disobedience/choose.c index 269a0cd..569b8b7 100644 --- a/disobedience/choose.c +++ b/disobedience/choose.c @@ -1,7 +1,6 @@ - /* * This file is part of DisOrder - * Copyright (C) 2006-2008 Richard Kettlewell + * Copyright (C) 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 @@ -21,1484 +20,334 @@ /** @file disobedience/choose.c * @brief Hierarchical track selection and search * - * We don't use the built-in tree widgets because they require that you know - * the children of a node on demand, and we have to wait for the server to tell - * us. + * We now use an ordinary GtkTreeStore/GtkTreeView. + * + * We have an extra column with per-row data. This isn't referenced from + * anywhere the GC can see so explicit memory management is required. + * (TODO perhaps we could fix this using a gobject?) + * + * We don't want to pull the entire tree in memory, but we want directories to + * show up as having children. Therefore we give directories a placeholder + * child and replace their children when they are opened. Placeholders have a + * null choosedata pointer. + * + * TODO We do a period sweep which kills contracted nodes, putting back + * placeholders, and updating expanded nodes to keep up with server-side + * changes. (We could trigger the latter off rescan complete notifications?) + * + * TODO: + * - sweep up contracted nodes + * - update when content may have changed (e.g. after a rescan) + * - popup menu + * - playing state + * - display length of tracks */ #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 - -/* Types */ - -struct choosenode; - -/** @brief Accumulated information about the tree widget */ -struct displaydata { - /** @brief Maximum width required */ - guint width; - /** @brief Maximum height required */ - guint height; -}; - -/* instantiate the node vector type */ - -VECTOR_TYPE(nodevector, struct choosenode *, xrealloc); - -/** @brief Signature of function called when a choosenode is filled */ -typedef void (when_filled_callback)(struct choosenode *cn, - void *wfu); - -/** @brief One node in the virtual filesystem */ -struct choosenode { - struct choosenode *parent; /**< @brief parent node */ - const char *path; /**< @brief full path or 0 */ - const char *sort; /**< @brief sort key */ - const char *display; /**< @brief display name */ - int pending; /**< @brief pending resolve queries */ - unsigned flags; -#define CN_EXPANDABLE 0x0001 /**< @brief node is expandable */ -#define CN_EXPANDED 0x0002 /**< @brief node is expanded - * - * Expandable items are directories; - * non-expandable ones are files. */ -#define CN_DISPLAYED 0x0004 /**< @brief widget is displayed in layout */ -#define CN_SELECTED 0x0008 /**< @brief node is selected */ -#define CN_GETTING_FILES 0x0010 /**< @brief files inbound */ -#define CN_RESOLVING_FILES 0x0020 /**< @brief resolved files inbound */ -#define CN_GETTING_DIRS 0x0040 /**< @brief directories inbound */ -#define CN_GETTING_ANY 0x0070 /**< @brief getting something */ -#define CN_CONTINGENT 0x0080 /**< @brief expansion contingent on search */ - struct nodevector children; /**< @brief vector of children */ - void (*fill)(struct choosenode *); /**< @brief request child fill or 0 for leaf */ - GtkWidget *container; /**< @brief the container for this row */ - GtkWidget *hbox; /**< @brief the hbox for this row */ - GtkWidget *arrow; /**< @brief arrow widget or 0 */ - GtkWidget *label; /**< @brief text label for this node */ - GtkWidget *marker; /**< @brief queued marker */ - 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 */ -struct choose_menuitem { - /* Parameters */ - const char *name; /**< @brief name */ - - /* Callbacks */ - void (*activate)(GtkMenuItem *menuitem, gpointer user_data); - /**< @brief Called to activate the menu item. - * - * @p user_data is the choosenode the mouse pointer is over. */ +/** @brief Extra data at each node */ +struct choosedata { + /** @brief Node type */ + int type; - gboolean (*sensitive)(struct choosenode *cn); - /* @brief Called to determine whether the menu item should be sensitive. - * - * TODO? */ + /** @brief Full track or directory name */ + gchar *track; - /* State */ - gulong handlerid; /**< @brief signal handler ID */ - GtkWidget *w; /**< @brief menu item widget */ + /** @brief Sort key */ + gchar *sort; }; -/* 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 */ -static int suppress_redisplay; /**< @brief suppress redisplay */ - -/* Forward Declarations */ - -static void clear_children(struct choosenode *cn); -static struct choosenode *newnode(struct choosenode *parent, - const char *path, - const char *display, - const char *sort, - unsigned flags, - 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, 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, - const char *why); - -static void display_selection(struct choosenode *cn); -static void clear_selection(struct choosenode *cn); - -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); -static void delete_widgets(struct choosenode *cn); -static void expand_from(struct choosenode *cn); -static struct choosenode *first_search_result(struct choosenode *cn); +/** @brief Track name column number */ +#define NAME_COLUMN 0 -static void clicked_choosenode(GtkWidget attribute((unused)) *widget, - GdkEventButton *event, - gpointer user_data); +/** @brief Hidden column number */ +#define CHOOSEDATA_COLUMN 1 -static void activate_track_play(GtkMenuItem *menuitem, gpointer user_data); -static void activate_track_properties(GtkMenuItem *menuitem, gpointer user_data); +/** @brief @ref choosedata node is a file */ +#define CHOOSE_FILE 0 -static gboolean sensitive_track_play(struct choosenode *cn); -static gboolean sensitive_track_properties(struct choosenode *cn); +/** @brief @ref choosedata node is a directory */ +#define CHOOSE_DIRECTORY 1 -static void activate_dir_play(GtkMenuItem *menuitem, gpointer user_data); -static void activate_dir_properties(GtkMenuItem *menuitem, gpointer user_data); -static void activate_dir_select(GtkMenuItem *menuitem, gpointer user_data); +/** @brief The current selection tree */ +static GtkTreeStore *choose_store; -static gboolean sensitive_dir_play(struct choosenode *cn); -static gboolean sensitive_dir_properties(struct choosenode *cn); -static gboolean sensitive_dir_select(struct choosenode *cn); +/** @brief The view onto the selection tree */ +static GtkWidget *choose_view; -/** @brief Track menu items */ -static struct choose_menuitem track_menuitems[] = { - { "Play track", activate_track_play, sensitive_track_play, 0, 0 }, - { "Track properties", activate_track_properties, sensitive_track_properties, 0, 0 }, - { 0, 0, 0, 0, 0 } -}; +/** @brief The selection tree's selection */ +static GtkTreeSelection *choose_selection; -/** @brief Directory menu items */ -static struct choose_menuitem dir_menuitems[] = { - { "Play all tracks", activate_dir_play, sensitive_dir_play, 0, 0 }, - { "Track properties", activate_dir_properties, sensitive_dir_properties, 0, 0 }, - { "Select all tracks", activate_dir_select, sensitive_dir_select, 0, 0 }, - { 0, 0, 0, 0, 0 } -}; +/** @brief Popup menu */ +//static GtkWidget *choose_menu; -/* Maintaining the data structure ------------------------------------------ */ +/** @brief Map choosedata types to names */ +static const char *const choose_type_map[] = { "track", "dir" }; -static char *cnflags(const struct choosenode *cn) { - unsigned f = cn->flags, n; - struct dynstr d[1]; - - static const char *bits[] = { - "expandable", - "expanded", - "displayed", - "selected", - "getting_files", - "resolving_files", - "getting_dirs", - "contingent" - }; -#define NBITS (sizeof bits / sizeof *bits) - - dynstr_init(d); - if(!f) - dynstr_append(d, '0'); - else { - for(n = 0; n < NBITS; ++n) { - const unsigned bit = 1 << n; - if(f & bit) { - if(d->nvec) - dynstr_append(d, '|'); - dynstr_append_string(d, bits[n]); - f ^= bit; - } - } - if(f) { - char buf[32]; - if(d->nvec) - dynstr_append(d, '|'); - sprintf(buf, "%#x", f); - dynstr_append_string(d, buf); - } - } - dynstr_terminate(d); - return d->vec; +/** @brief Return the choosedata given an interator */ +static struct choosedata *choose_iter_to_data(GtkTreeIter *iter) { + GValue v[1]; + memset(v, 0, sizeof v); + gtk_tree_model_get_value(GTK_TREE_MODEL(choose_store), iter, CHOOSEDATA_COLUMN, v); + assert(G_VALUE_TYPE(v) == G_TYPE_POINTER); + struct choosedata *const cd = g_value_get_pointer(v); + g_value_unset(v); + return cd; } -/** @brief Create a new node */ -static struct choosenode *newnode(struct choosenode *parent, - const char *path, - const char *display, - const char *sort, - unsigned flags, - void (*fill)(struct choosenode *)) { - struct choosenode *const n = xmalloc(sizeof *n); - - D(("newnode %s %s", path, display)); - if(flags & CN_EXPANDABLE) - assert(fill); - else - assert(!fill); - n->parent = parent; - n->path = path; - n->display = display; - n->sort = sort; - n->flags = flags; - nodevector_init(&n->children); - n->fill = fill; - if(parent) - nodevector_append(&parent->children, n); - return n; -} - -/** @brief Called when a node has been filled - * - * Response for calling @c whenfilled. +/** @brief Remove node @p it and all its children + * @param Iterator, updated to point to next + * @return True if iterator remains valid */ -static void filled(struct choosenode *cn) { - when_filled_callback *const whenfilled = cn->whenfilled; - - if(whenfilled) { - cn->whenfilled = 0; - whenfilled(cn, cn->wfu); - } - if(nsearchvisible < nsearchresults) { - /* There is still search expansion work to do */ - 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) { - 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"); - 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; -} - -/** @brief Delete all the widgets owned by @p cn */ -static void delete_cn_widgets(struct choosenode *cn) { - if(cn->arrow) { - gtk_widget_destroy(cn->arrow); - cn->arrow = 0; - } - if(cn->label) { - gtk_widget_destroy(cn->label); - cn->label = 0; - } - if(cn->marker) { - gtk_widget_destroy(cn->marker); - cn->marker = 0; - } - if(cn->hbox) { - gtk_widget_destroy(cn->hbox); - cn->hbox = 0; - } - if(cn->container) { - gtk_widget_destroy(cn->container); - cn->container = 0; - } -} - -/** @brief Recursively clear all the children of @p cn +static gboolean choose_remove_node(GtkTreeIter *it) { + GtkTreeIter child[1]; + gboolean childv = gtk_tree_model_iter_children(GTK_TREE_MODEL(choose_store), + child, + it); + while(childv) + childv = choose_remove_node(child); + struct choosedata *cd = choose_iter_to_data(it); + if(cd) { + g_free(cd->track); + g_free(cd->sort); + g_free(cd); + } + return gtk_tree_store_remove(choose_store, it); +} + +/** @brief (Re-)populate a node + * @param parent_ref Node to populate or NULL to fill root + * @param nvec Number of children to add + * @param vec Children + * @param dirs True if children are directories * - * All the widgets at or below @p cn are deleted. All choosenodes below - * it are emptied. i.e. we prune the tree at @p cn. - */ -static void clear_children(struct choosenode *cn) { - int n; - - D(("clear_children %s", cn->path)); - /* Recursively clear subtrees */ - for(n = 0; n < cn->children.nvec; ++n) { - clear_children(cn->children.vec[n]); - delete_cn_widgets(cn->children.vec[n]); - } - cn->children.nvec = 0; -} - -/** @brief Called with a list of files just below some node */ -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. */ - 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], cn); - ++gets_in_flight; - } - } - /* If there are no files and the directories are all read by now, we're - * 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 *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, 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(). - * 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"), - trackname_transform("dir", vec[n], "sort"), - CN_EXPANDABLE, fill_directory_node); - updated_node(cn, gets_in_flight == 0, "got_dirs"); - cn->flags &= ~CN_GETTING_DIRS; - if(!(cn->flags & CN_GETTING_ANY)) - filled(cn); -} - -/** @brief Fill a child node */ -static void fill_directory_node(struct choosenode *cn) { - D(("fill_directory_node %s", cn->path)); - /* TODO: caching */ - if(cn->flags & CN_GETTING_ANY) - return; - assert(report_label != 0); - gtk_label_set_text(GTK_LABEL(report_label), "getting files"); - clear_children(cn); - 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; -} - -/** @brief Expand a node */ -static void expand_node(struct choosenode *cn, int contingent) { - 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; - /* We mark the node as expanded and request that it fill itself. When it has - * completed it will called updated_node() and we can redraw at that - * point. */ - cn->flags |= CN_EXPANDED; - if(contingent) - cn->flags |= CN_CONTINGENT; - else - cn->flags &= ~CN_CONTINGENT; - /* If this node is not contingently expanded, mark all its parents back to - * the root as not contingent either, so they won't be contracted when the - * search results change */ - if(!contingent) { - struct choosenode *cnp; - - for(cnp = cn->parent; cnp; cnp = cnp->parent) - cnp->flags &= ~CN_CONTINGENT; - } - /* TODO: visual feedback */ - cn->fill(cn); -} - -/** @brief Make sure all the search results below @p cn are expanded - * @param cn Node to start at - */ -static void expand_from(struct choosenode *cn) { - int n; - - if(nsearchvisible == nsearchresults) - /* We're done */ - return; - /* Are any of the search tracks at/below this point? */ - 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) { - if(cn->flags & CN_EXPANDED) - /* 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 && gets_in_flight < 10; ++n) - expand_from(cn->children.vec[n]); - else { - /* This node is not expanded yet */ - expand_node(cn, 1); - } - } else { - /* This is an actual search result */ - ++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); - } - } -} - -/** @brief Contract all contingently expanded nodes below @p cn */ -static void contract_contingent(struct choosenode *cn) { - int n; - - if(cn->flags & CN_CONTINGENT) - contract_node(cn); - else - for(n = 0; n < cn->children.nvec; ++n) - contract_contingent(cn->children.vec[n]); -} - -/** @brief Contract a node */ -static void contract_node(struct choosenode *cn) { - D(("contract_node %s", cn->path)); - assert(cn->flags & CN_EXPANDABLE); - /* If node is already contracted do nothing. */ - if(!(cn->flags & CN_EXPANDED)) return; - cn->flags &= ~(CN_EXPANDED|CN_CONTINGENT); - /* Clear selection below this node */ - clear_selection(cn); - /* Zot children. We never used to do this but the result would be that over - * time you'd end up with the entire tree pulled into memory. If the server - * is over a slow network it will make interactivity slightly worse; if - * anyone complains we can make it an option. */ - clear_children(cn); - /* We can contract a node immediately. */ - redisplay_tree("contract_node"); -} - -/** @brief qsort() callback for ordering choosenodes */ -static int compare_choosenode(const void *av, const void *bv) { - const struct choosenode *const *aa = av, *const *bb = bv; - const struct choosenode *a = *aa, *b = *bb; - - return compare_tracks(a->sort, b->sort, - a->display, b->display, - a->path, b->path); -} - -/** @brief Called when an expandable node is updated. */ -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 - * update. In that case we ignore this notification. */ - if(!(cn->flags & CN_EXPANDED)) return; - /* Sort children */ - qsort(cn->children.vec, cn->children.nvec, sizeof (struct choosenode *), - compare_choosenode); - if(redisplay) { - char whywhy[1024]; - - snprintf(whywhy, sizeof whywhy, "updated_node %s", why); - redisplay_tree(whywhy); - } -} - -/* Searching --------------------------------------------------------------- */ - -/** @brief Return true if @p track is a search result + * Adjusts the set of files (or directories) below @p parent_ref to match those + * listed in @p nvec and @p vec. * - * In particular the return value is one more than the index of the track - * @p searchresults. + * @parent_ref will be destroyed. */ -static int is_search_result(const char *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 - * - * This is called from eclient with a (possibly empty) list of search results, - * 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. */ - search_obsolete = 0; - initiate_search(); +static void choose_populate(GtkTreeRowReference *parent_ref, + int nvec, char **vec, + int type) { + /* Compute parent_* */ + GtkTreeIter pit[1], *parent_it; + GtkTreePath *parent_path; + if(parent_ref) { + parent_path = gtk_tree_row_reference_get_path(parent_ref); + parent_it = pit; + gboolean pitv = gtk_tree_model_get_iter(GTK_TREE_MODEL(choose_store), + pit, parent_path); + assert(pitv); + /*fprintf(stderr, "choose_populate %s: parent path is [%s]\n", + choose_type_map[type], + gtk_tree_path_to_string(parent_path));*/ } else { - /* Stash the search results */ - searchresults = vec; - nsearchresults = nvec; - if(nvec) { - /* Create a new search hash for fast identification of results */ - 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 = '/'; - } - } + parent_path = 0; + parent_it = 0; + /*fprintf(stderr, "choose_populate %s: populating the root\n", + choose_type_map[type]);*/ + } + /* Remove unwanted nodes and find out which we must add */ + //fprintf(stderr, " trimming unwanted %s nodes\n", choose_type_map[type]); + char *found = xmalloc(nvec); + GtkTreeIter it[1]; + gboolean itv = gtk_tree_model_iter_children(GTK_TREE_MODEL(choose_store), + it, + parent_it); + while(itv) { + struct choosedata *cd = choose_iter_to_data(it); + int keep; + + if(!cd) { + /* Always kill placeholders */ + //fprintf(stderr, " kill a placeholder\n"); + keep = 0; + } else if(cd->type == type) { + /* This is the type we care about */ + //fprintf(stderr, " %s is a %s\n", cd->track, choose_type_map[cd->type]); + int n; + for(n = 0; n < nvec && strcmp(vec[n], cd->track); ++n) + ; + if(n < nvec) { + //fprintf(stderr, " ... and survives\n"); + found[n] = 1; + keep = 1; + } else { + //fprintf(stderr, " ... and is to be removed\n"); + keep = 0; } - /* 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); - suppress_redisplay = 1; /* avoid lots of redisplays */ } else { - searchhash = 0; /* for the gc */ - 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); + /* Keep wrong-type entries */ + //fprintf(stderr, " %s is a %s\n", cd->track, choose_type_map[cd->type]); + keep = 1; } - } -} - -/** @brief Initiate a search - * - * If a search is underway we set @ref search_obsolete and restart the search - * in search_completed() above. - */ -static void initiate_search(void) { - char *terms, *e; - - /* Find out what the user is after */ - terms = xstrdup(gtk_entry_get_text(GTK_ENTRY(searchentry))); - /* Strip leading and trailing space */ - while(*terms == ' ') ++terms; - e = terms + strlen(terms); - while(e > terms && e[-1] == ' ') --e; - *e = 0; - /* If a search is already underway then mark it as obsolete. We'll revisit - * when it returns. */ - if(search_in_flight) { - search_obsolete = 1; - return; - } - if(*terms) { - /* There's still something left. Initiate the search. */ - if(disorder_eclient_search(client, search_completed, terms, 0)) { - /* 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, 0); - } else { - search_in_flight = 1; - } - } else { - /* No search terms - we want to see all tracks */ - search_completed(0, 0, 0, 0); - } -} - -/** @brief Called when the cancel search button is clicked */ -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 */ -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 */ -static void delete_widgets(struct choosenode *cn) { - int n; - - delete_cn_widgets(cn); - for(n = 0; n < cn->children.nvec; ++n) - delete_widgets(cn->children.vec[n]); - cn->flags &= ~(CN_DISPLAYED|CN_SELECTED); - files_selected = 0; -} - -/** @brief Update the display */ -static void redisplay_tree(const char *why) { - struct displaydata d; - guint oldwidth, oldheight; - - 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; - /* Correct the layout and find out how much space it uses */ - searchnodes = nsearchresults ? xcalloc(nsearchresults, - sizeof (struct choosenode *)) : 0; - d = display_tree(root, 0, 0); - - 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.) - * - * There is a problem: if we shrink the size then the part of the screen that - * is outside the new size but inside the old one is not updated. I think - * this is arguably bug in GTK+ but it's easy to force a redraw if this - * region is nonempty. - */ - gtk_layout_get_size(GTK_LAYOUT(chooselayout), &oldwidth, &oldheight); - 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() - * @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. - */ -static struct displaydata display_tree(struct choosenode *cn, int x, int y) { - int n, aw; - GtkRequisition req; - struct displaydata d, cd; - GdkPixbuf *pb; - const int search_result = is_search_result(cn->path); - - D(("display_tree %s %d,%d", cn->path, x, y)); - - /* An expandable item contains an arrow and a text label. When you press the - * button it flips its expand state. - * - * A non-expandable item has just a text label and no arrow. - */ - if(!cn->container) { - BEGIN(new_widgets); - /* Widgets need to be created */ - cn->hbox = gtk_hbox_new(FALSE, 1); - if(cn->flags & CN_EXPANDABLE) { - cn->arrow = gtk_arrow_new(cn->flags & CN_EXPANDED ? GTK_ARROW_DOWN - : GTK_ARROW_RIGHT, - GTK_SHADOW_NONE); - cn->marker = 0; - } else { - cn->arrow = 0; - if((pb = find_image("notes.png"))) { - cn->marker = gtk_image_new_from_pixbuf(pb); + if(keep) + itv = gtk_tree_model_iter_next(GTK_TREE_MODEL(choose_store), it); + else + itv = choose_remove_node(it); + } + /* Add nodes we don't have */ + int inserted = 0; + //fprintf(stderr, " inserting new %s nodes\n", choose_type_map[type]); + for(int n = 0; n < nvec; ++n) { + if(!found[n]) { + //fprintf(stderr, " %s was not found\n", vec[n]); + struct choosedata *cd = g_malloc0(sizeof *cd); + cd->type = type; + cd->track = g_strdup(vec[n]); + cd->sort = g_strdup(trackname_transform(choose_type_map[type], + vec[n], + "sort")); + gtk_tree_store_append(choose_store, it, parent_it); + gtk_tree_store_set(choose_store, it, + NAME_COLUMN, trackname_transform(choose_type_map[type], + vec[n], + "display"), + CHOOSEDATA_COLUMN, cd, + -1); + ++inserted; + /* If we inserted a directory, insert a placeholder too, so it appears to + * have children; it will be deleted when we expand the directory. */ + if(type == CHOOSE_DIRECTORY) { + //fprintf(stderr, " inserting a placeholder\n"); + GtkTreeIter placeholder[1]; + + gtk_tree_store_append(choose_store, placeholder, it); + gtk_tree_store_set(choose_store, placeholder, + NAME_COLUMN, "Waddling...", + CHOOSEDATA_COLUMN, (void *)0, + -1); } } - cn->label = gtk_label_new(cn->display); - if(cn->arrow) - gtk_container_add(GTK_CONTAINER(cn->hbox), cn->arrow); - gtk_container_add(GTK_CONTAINER(cn->hbox), cn->label); - if(cn->marker) - gtk_container_add(GTK_CONTAINER(cn->hbox), cn->marker); - cn->container = gtk_event_box_new(); - gtk_container_add(GTK_CONTAINER(cn->container), cn->hbox); - g_signal_connect(cn->container, "button-release-event", - G_CALLBACK(clicked_choosenode), cn); - g_signal_connect(cn->container, "button-press-event", - G_CALLBACK(clicked_choosenode), cn); - g_object_ref(cn->container); - /* Show everything by default */ - gtk_widget_show_all(cn->container); - END(new_widgets); } - assert(cn->container); - /* 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); + //fprintf(stderr, " %d nodes inserted\n", inserted); + if(inserted) { + /* TODO sort the children */ } - 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, - GTK_SHADOW_NONE); - else if(cn->marker) - /* 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 { - gtk_layout_put(GTK_LAYOUT(chooselayout), cn->container, x, y); - cn->flags |= CN_DISPLAYED; - /* Now chooselayout has a ref to the container */ - g_object_unref(cn->container); + if(parent_ref) { + /* If we deleted a placeholder then we must re-expand the row */ + gtk_tree_view_expand_row(GTK_TREE_VIEW(choose_view), parent_path, FALSE); + gtk_tree_row_reference_free(parent_ref); + gtk_tree_path_free(parent_path); } - 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; - 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); - gtk_widget_size_request(cn->arrow, &req); - aw = req.width; - for(n = 0; n < cn->children.nvec; ++n) { - cd = display_tree(cn->children.vec[n], x + aw, d.height); - if(cd.width > d.width) - d.width = cd.width; - 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; - 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)); - return d; -} - -/** @brief Remove widgets for newly hidden nodes */ -static void undisplay_tree(struct choosenode *cn) { - int n; - - D(("undisplay_tree %s", cn->path)); - /* Remove this widget from the display */ - if(cn->flags & CN_DISPLAYED) { - gtk_container_remove(GTK_CONTAINER(chooselayout), cn->container); - cn->flags ^= CN_DISPLAYED; - } - /* Remove children too */ - for(n = 0; n < cn->children.nvec; ++n) - undisplay_tree(cn->children.vec[n]); -} - -/* Selection --------------------------------------------------------------- */ - -/** @brief Mark the widget @p cn according to its selection state */ -static void display_selection(struct choosenode *cn) { - /* Need foreground and background colors */ - gtk_widget_set_state(cn->label, (cn->flags & CN_SELECTED - ? GTK_STATE_SELECTED : GTK_STATE_NORMAL)); - gtk_widget_set_state(cn->container, (cn->flags & CN_SELECTED - ? GTK_STATE_SELECTED : GTK_STATE_NORMAL)); } -/** @brief Set the selection state of a widget - * - * Directories can never be selected, we just ignore attempts to do so. */ -static void set_selection(struct choosenode *cn, int selected) { - unsigned f = selected ? CN_SELECTED : 0; - - D(("set_selection %d %s", selected, cn->path)); - if(!(cn->flags & CN_EXPANDABLE) && (cn->flags & CN_SELECTED) != f) { - cn->flags ^= CN_SELECTED; - /* Maintain selection count */ - if(selected) - ++files_selected; - else - --files_selected; - display_selection(cn); - /* Update main menu sensitivity */ - menu_update(-1); +static void choose_dirs_completed(void *v, + const char *error, + int nvec, char **vec) { + if(error) { + popup_protocol_error(0, error); + return; } + choose_populate(v, nvec, vec, CHOOSE_DIRECTORY); } -/** @brief Recursively clear all selection bits from CN down */ -static void clear_selection(struct choosenode *cn) { - int n; - - set_selection(cn, 0); - for(n = 0; n < cn->children.nvec; ++n) - clear_selection(cn->children.vec[n]); -} - -/* User actions ------------------------------------------------------------ */ - -/** @brief Called when disorder_eclient_play completes */ -void play_completed(void attribute((unused)) *v, - const char *error) { - if(error) +static void choose_files_completed(void *v, + const char *error, + int nvec, char **vec) { + if(error) { popup_protocol_error(0, error); -} - -/** @brief Clicked on something - * - * This implements playing, all the modifiers for selection, etc. - */ -static void clicked_choosenode(GtkWidget attribute((unused)) *widget, - GdkEventButton *event, - gpointer user_data) { - struct choosenode *cn = user_data; - int ind, last_ind, n; - - D(("clicked_choosenode %s", cn->path)); - if(event->type == GDK_BUTTON_RELEASE - && event->button == 1) { - /* Left click */ - if(cn->flags & CN_EXPANDABLE) { - /* This is a directory. Flip its expansion status. */ - if(cn->flags & CN_EXPANDED) - contract_node(cn); - else - expand_node(cn, 0/*!contingent*/); - last_click = 0; - } else { - /* This is a file. Adjust selection status */ - /* TODO the basic logic here is essentially the same as that in queue.c. - * Can we share code at all? */ - switch(event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)) { - case 0: - clear_selection(root); - set_selection(cn, 1); - last_click = cn; - break; - case GDK_CONTROL_MASK: - set_selection(cn, !(cn->flags & CN_SELECTED)); - last_click = cn; - break; - case GDK_SHIFT_MASK: - case GDK_SHIFT_MASK|GDK_CONTROL_MASK: - if(last_click && last_click->parent == cn->parent) { - /* Figure out where the current and last clicks are in the list */ - ind = last_ind = -1; - for(n = 0; n < cn->parent->children.nvec; ++n) { - if(cn->parent->children.vec[n] == cn) - ind = n; - if(cn->parent->children.vec[n] == last_click) - last_ind = n; - } - /* Test shouldn't ever fail, but still */ - if(ind >= 0 && last_ind >= 0) { - if(!(event->state & GDK_CONTROL_MASK)) { - for(n = 0; n < cn->parent->children.nvec; ++n) - set_selection(cn->parent->children.vec[n], 0); - } - if(ind > last_ind) - for(n = last_ind; n <= ind; ++n) - set_selection(cn->parent->children.vec[n], 1); - else - for(n = ind; n <= last_ind; ++n) - set_selection(cn->parent->children.vec[n], 1); - if(event->state & GDK_CONTROL_MASK) - last_click = cn; - } - } - /* TODO trying to select a range that doesn't share a single parent - * currently does not work, but it ought to. */ - break; - } - } - } else if(event->type == GDK_BUTTON_RELEASE - && event->button == 2) { - /* Middle click - play the pointed track */ - if(!(cn->flags & CN_EXPANDABLE)) { - 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, play_completed, 0); - last_click = 0; - } - } else if(event->type == GDK_BUTTON_PRESS - && event->button == 3) { - struct choose_menuitem *const menuitems = - (cn->flags & CN_EXPANDABLE ? dir_menuitems : track_menuitems); - GtkWidget *const menu = - (cn->flags & CN_EXPANDABLE ? dir_menu : track_menu); - /* Right click. Pop up a menu. */ - /* If the current file isn't selected, switch the selection to just that. - * (If we're looking at a directory then leave the selection alone.) */ - if(!(cn->flags & CN_EXPANDABLE) && !(cn->flags & CN_SELECTED)) { - clear_selection(root); - set_selection(cn, 1); - last_click = cn; - } - /* Set the item sensitivity and callbacks */ - for(n = 0; menuitems[n].name; ++n) { - if(menuitems[n].handlerid) - g_signal_handler_disconnect(menuitems[n].w, - menuitems[n].handlerid); - gtk_widget_set_sensitive(menuitems[n].w, - menuitems[n].sensitive(cn)); - 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, - event->button, event->time); + return; } + choose_populate(v, nvec, vec, CHOOSE_FILE); } -/** @brief Called BY GTK+ to tell us the search entry box has changed */ -static void searchentry_changed(GtkEditable attribute((unused)) *editable, +static void choose_row_expanded(GtkTreeView attribute((unused)) *treeview, + GtkTreeIter *iter, + GtkTreePath *path, gpointer attribute((unused)) user_data) { - initiate_search(); -} - -/* Track menu items -------------------------------------------------------- */ - -/** @brief Recursive step for gather_selected() */ -static void recurse_selected(struct choosenode *cn, struct vector *v) { - int n; - - if(cn->flags & CN_EXPANDABLE) { - if(cn->flags & CN_EXPANDED) - for(n = 0; n < cn->children.nvec; ++n) - recurse_selected(cn->children.vec[n], v); - } else { - if((cn->flags & CN_SELECTED) && cn->path) - vector_append(v, (char *)cn->path); - } -} - -/*** @brief Get a list of all the selected tracks */ -static const char **gather_selected(int *ntracks) { - struct vector v; - - vector_init(&v); - recurse_selected(root, &v); - vector_terminate(&v); - if(ntracks) *ntracks = v.nvec; - return (const char **)v.vec; + /*fprintf(stderr, "row-expanded path=[%s]\n", + gtk_tree_path_to_string(path));*/ + /* We update a node's contents whenever it is expanded, even if it was + * already populated; the effect is that contracting and expanding a node + * suffices to update it to the latest state on the server. */ + struct choosedata *cd = choose_iter_to_data(iter); + disorder_eclient_files(client, choose_files_completed, + xstrdup(cd->track), + NULL, + gtk_tree_row_reference_new(GTK_TREE_MODEL(choose_store), + path)); + disorder_eclient_dirs(client, choose_dirs_completed, + xstrdup(cd->track), + NULL, + gtk_tree_row_reference_new(GTK_TREE_MODEL(choose_store), + path)); + /* The row references are destroyed in the _completed handlers. */ +} + +static int choose_tab_selectall_sensitive(void attribute((unused)) *extra) { + return TRUE; } - -/** @brief Called when the track menu's play option is activated */ -static void activate_track_play(GtkMenuItem attribute((unused)) *menuitem, - gpointer attribute((unused)) user_data) { - const char **tracks = gather_selected(0); - int n; - gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue"); - for(n = 0; tracks[n]; ++n) - disorder_eclient_play(client, tracks[n], play_completed, 0); +static void choose_tab_selectall_activate(void attribute((unused)) *extra) { + gtk_tree_selection_select_all(choose_selection); } - -/** @brief Called when the menu's properties option is activated */ -static void activate_track_properties(GtkMenuItem attribute((unused)) *menuitem, - gpointer attribute((unused)) user_data) { - int ntracks; - const char **tracks = gather_selected(&ntracks); - - properties(ntracks, tracks); -} - -/** @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) - && (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) - && (last_rights & RIGHT_PREFS)); -} - -/* Directory menu items ---------------------------------------------------- */ - -/** @brief Return the file children of @p cn - * - * The list is terminated by a null pointer. - */ -static const char **dir_files(struct choosenode *cn, int *nfiles) { - const char **files = xcalloc(cn->children.nvec + 1, sizeof (char *)); - int n, m; - - for(n = m = 0; n < cn->children.nvec; ++n) - if(!(cn->children.vec[n]->flags & CN_EXPANDABLE)) - files[m++] = cn->children.vec[n]->path; - files[m] = 0; - if(nfiles) *nfiles = m; - return files; -} - -static void play_dir(struct choosenode *cn, - void attribute((unused)) *wfu) { - int ntracks, n; - const char **tracks = dir_files(cn, &ntracks); - gtk_label_set_text(GTK_LABEL(report_label), "adding track to queue"); - for(n = 0; n < ntracks; ++n) - disorder_eclient_play(client, tracks[n], play_completed, 0); +static int choose_tab_selectnone_sensitive(void attribute((unused)) *extra) { + return gtk_tree_selection_count_selected_rows(choose_selection) > 0; } - -static void properties_dir(struct choosenode *cn, - void attribute((unused)) *wfu) { - int ntracks; - const char **tracks = dir_files(cn, &ntracks); - properties(ntracks, tracks); -} - -static void select_dir(struct choosenode *cn, - void attribute((unused)) *wfu) { - int n; - - clear_selection(root); - for(n = 0; n < cn->children.nvec; ++n) - set_selection(cn->children.vec[n], 1); -} - -/** @brief Ensure @p cn is expanded and then call @p callback */ -static void call_with_dir(struct choosenode *cn, - when_filled_callback *whenfilled, - void *wfu) { - if(!(cn->flags & CN_EXPANDABLE)) - return; /* something went wrong */ - if(cn->flags & CN_EXPANDED) - /* @p cn is already open */ - whenfilled(cn, wfu); - else { - /* @p cn is not open, arrange for the callback to go off when it is - * opened */ - cn->whenfilled = whenfilled; - cn->wfu = wfu; - expand_node(cn, 0/*not contingnet upon search*/); - } -} - -/** @brief Called when the directory menu's play option is activated */ -static void activate_dir_play(GtkMenuItem attribute((unused)) *menuitem, - gpointer user_data) { - struct choosenode *const cn = (struct choosenode *)user_data; - - call_with_dir(cn, play_dir, 0); -} - -/** @brief Called when the directory menu's properties option is activated */ -static void activate_dir_properties(GtkMenuItem attribute((unused)) *menuitem, - gpointer user_data) { - struct choosenode *const cn = (struct choosenode *)user_data; - - call_with_dir(cn, properties_dir, 0); +static void choose_tab_selectnone_activate(void attribute((unused)) *extra) { + gtk_tree_selection_unselect_all(choose_selection); } - -/** @brief Called when the directory menu's select option is activated */ -static void activate_dir_select(GtkMenuItem attribute((unused)) *menuitem, - gpointer user_data) { - struct choosenode *const cn = (struct choosenode *)user_data; - - call_with_dir(cn, select_dir, 0); -} - -/** @brief Determine whether the directory menu's play option should be sensitive */ -static gboolean sensitive_dir_play(struct choosenode attribute((unused)) *cn) { - return !!(disorder_eclient_state(client) & DISORDER_CONNECTED); -} - -/** @brief Determine whether the directory menu's properties option should be sensitive */ -static gboolean sensitive_dir_properties(struct choosenode attribute((unused)) *cn) { - return !!(disorder_eclient_state(client) & DISORDER_CONNECTED); -} - -/** @brief Determine whether the directory menu's select option should be sensitive */ -static gboolean sensitive_dir_select(struct choosenode attribute((unused)) *cn) { + +static int choose_tab_properties_sensitive(void attribute((unused)) *extra) { return TRUE; } - -/* Main menu plumbing ------------------------------------------------------ */ - -/** @brief Determine whether the edit menu's properties option should be sensitive */ -static int choose_properties_sensitive(void attribute((unused)) *extra) { - return !!files_selected && (disorder_eclient_state(client) & DISORDER_CONNECTED); -} - -/** @brief Called when the edit menu's properties option is activated */ -static void choose_properties_activate(void attribute((unused)) *extra) { - activate_track_properties(0, 0); -} - -/** @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, - NULL/*choose_selectall_sensitive*/, - NULL/*choose_selectnone_sensitive*/, - choose_properties_activate, - NULL/*choose_selectall_activate*/, - NULL/*choose_selectnone_activate*/, - choose_tab_selected, + +static void choose_tab_properties_activate(void attribute((unused)) *extra) { + fprintf(stderr, "TODO choose_tab_properties_activate\n"); +} + +static const struct tabtype choose_tabtype = { + choose_tab_properties_sensitive, + choose_tab_selectall_sensitive, + choose_tab_selectnone_sensitive, + choose_tab_properties_activate, + choose_tab_selectall_activate, + choose_tab_selectnone_activate, + 0, 0 }; -/* Public entry points ----------------------------------------------------- */ - -/** @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", "", - CN_EXPANDABLE, fill_root_node); - expand_node(root, 0); /* will call redisplay_tree */ -} - -/** @brief Create a track choice widget */ +/** @brief Create the choose tab */ GtkWidget *choose_widget(void) { - int n; - GtkWidget *scrolled; - GtkWidget *vbox, *hbox, *clearsearch; - - /* - * +--vbox-------------------------------------------------------+ - * | +-hbox----------------------------------------------------+ | - * | | searchentry | clearsearch | | - * | +---------------------------------------------------------+ | - * | +-scrolled------------------------------------------------+ | - * | | +-chooselayout------------------------------------++--+ | | - * | | | Tree structure is manually layed out in here ||^^| | | - * | | | || | | | - * | | | || | | | - * | | | || | | | - * | | | ||vv| | | - * | | +-------------------------------------------------++--+ | | - * | | +-------------------------------------------------+ | | - * | | |< >| | | - * | | +-------------------------------------------------+ | | - * | +---------------------------------------------------------+ | - * +-------------------------------------------------------------+ - */ + /* Create the tree store. */ + choose_store = gtk_tree_store_new(1 + CHOOSEDATA_COLUMN, + G_TYPE_STRING, + G_TYPE_POINTER); + + /* Create the view */ + choose_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(choose_store)); + + /* Create cell renderers and columns */ + GtkCellRenderer *r = gtk_cell_renderer_text_new(); + GtkTreeViewColumn *c = gtk_tree_view_column_new_with_attributes + ("Track", + r, + "text", 0, + (char *)0); + gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c); - /* Text entry box for search terms */ - 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 */ - 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", ""); - - /* 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_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 */ - 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_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*/); + /* The selection should support multiple things being selected */ + choose_selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(choose_view)); + gtk_tree_selection_set_mode(choose_selection, GTK_SELECTION_MULTIPLE); + + /* Catch button presses */ + /*g_signal_connect(choose_view, "button-press-event", + G_CALLBACK(choose_button_release), 0);*/ + /* Catch row expansions so we can fill in placeholders */ + g_signal_connect(choose_view, "row-expanded", + G_CALLBACK(choose_row_expanded), 0); - /* chooselayout contains the currently visible subset of the track - * namespace */ - chooselayout = gtk_layout_new(0, 0); - 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 */ - track_menu = gtk_menu_new(); - g_signal_connect(track_menu, "destroy", G_CALLBACK(gtk_widget_destroyed), - &track_menu); - for(n = 0; track_menuitems[n].name; ++n) { - track_menuitems[n].w = - gtk_menu_item_new_with_label(track_menuitems[n].name); - gtk_menu_attach(GTK_MENU(track_menu), track_menuitems[n].w, - 0, 1, n, n + 1); - } - dir_menu = gtk_menu_new(); - g_signal_connect(dir_menu, "destroy", G_CALLBACK(gtk_widget_destroyed), - &dir_menu); - for(n = 0; dir_menuitems[n].name; ++n) { - dir_menuitems[n].w = - gtk_menu_item_new_with_label(dir_menuitems[n].name); - gtk_menu_attach(GTK_MENU(dir_menu), dir_menuitems[n].w, - 0, 1, n, n + 1); - } - /* The layout is scrollable */ - scrolled = scroll_widget(chooselayout); - vadjust = gtk_layout_get_vadjustment(GTK_LAYOUT(chooselayout)); - - /* The scrollable layout and the search hbox go together in a vbox */ - vbox = gtk_vbox_new(FALSE/*homogenous*/, 1/*spacing*/); - gtk_box_pack_start(GTK_BOX(vbox), hbox, - FALSE/*expand*/, FALSE/*fill*/, 0/*padding*/); - gtk_box_pack_end(GTK_BOX(vbox), scrolled, - TRUE/*expand*/, TRUE/*fill*/, 0/*padding*/); - - g_object_set_data(G_OBJECT(vbox), "type", (void *)&tabtype_choose); - return vbox; -} - -/** @brief Called when something we care about here might have changed */ -void choose_update(void) { - redisplay_tree("choose_update"); + /* Fill the root */ + disorder_eclient_files(client, choose_files_completed, "", NULL, NULL); + disorder_eclient_dirs(client, choose_dirs_completed, "", NULL, NULL); + + /* Make the widget scrollable */ + GtkWidget *scrolled = scroll_widget(choose_view); + g_object_set_data(G_OBJECT(scrolled), "type", (void *)&choose_tabtype); + return scrolled; } /* -- 2.11.0