/*
* This file is part of DisOrder
- * Copyright (C) 2006, 2007 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*/
+/** @file disobedience/choose.c
+ * @brief Hierarchical track selection and search
+ *
+ * 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)
+ */
#include "disobedience.h"
+#include "choose.h"
-/* Choose track ------------------------------------------------------------ */
-
-WT(label);
-WT(event_box);
-WT(menu);
-WT(menu_item);
-WT(layout);
-WT(vbox);
-WT(arrow);
-WT(hbox);
-WT(button);
-WT(image);
-WT(entry);
-
-/* 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. */
-
-/* Types */
-
-struct choosenode;
-
-struct displaydata {
- guint width; /* total width required */
- guint height; /* total height required */
-};
-
-/* instantiate the node vector type */
-
-VECTOR_TYPE(nodevector, struct choosenode *, xrealloc);
-
-struct choosenode {
- struct choosenode *parent; /* parent node */
- const char *path; /* full path or 0 */
- const char *sort; /* sort key */
- const char *display; /* display name */
- int pending; /* pending resolve queries */
- unsigned flags;
-#define CN_EXPANDABLE 0x0001 /* node is expandable */
-#define CN_EXPANDED 0x0002 /* node is expanded */
-/* Expandable items are directories; non-expandable ones are files */
-#define CN_DISPLAYED 0x0004 /* widget is displayed in layout */
-#define CN_SELECTED 0x0008 /* node is selected */
- struct nodevector children; /* vector of children */
- void (*fill)(struct choosenode *); /* request child fill or 0 for leaf */
- GtkWidget *container; /* the container for this row */
- GtkWidget *hbox; /* the hbox for this row */
- GtkWidget *arrow; /* arrow widget or 0 */
- GtkWidget *label; /* text label for this node */
- GtkWidget *marker; /* queued marker */
-};
-
-struct menuitem {
- /* Parameters */
- const char *name; /* name */
-
- /* Callbacks */
- void (*activate)(GtkMenuItem *menuitem, gpointer user_data);
- /* Called to activate the menu item. The user data is the choosenode the
- * pointer is over. */
-
- gboolean (*sensitive)(struct choosenode *cn);
- /* Called to determine whether the menu item should be sensitive. TODO */
-
- /* State */
- gulong handlerid; /* signal handler ID */
- GtkWidget *w; /* menu item widget */
-};
-
-/* Variables */
-
-static GtkWidget *chooselayout;
-static GtkWidget *searchentry; /* search terms */
-static struct choosenode *root;
-static struct choosenode *realroot;
-static GtkWidget *menu; /* our popup menu */
-static struct choosenode *last_click; /* last clicked node for selection */
-static int files_visible; /* total files visible */
-static int files_selected; /* total files selected */
-static int search_in_flight; /* a search is underway */
-static int search_obsolete; /* the current search is void */
-static char **searchresults; /* search results */
-static int nsearchresults; /* number of results */
-
-/* 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_letter_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 expand_node(struct choosenode *cn);
-static void contract_node(struct choosenode *cn);
-static void updated_node(struct choosenode *cn, int redisplay);
-
-static void display_selection(struct choosenode *cn);
-static void clear_selection(struct choosenode *cn);
+/** @brief The current selection tree */
+GtkTreeStore *choose_store;
-static void redisplay_tree(void);
-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);
+/** @brief The view onto the selection tree */
+GtkWidget *choose_view;
-static void clicked_choosenode(GtkWidget attribute((unused)) *widget,
- GdkEventButton *event,
- gpointer user_data);
+/** @brief The selection tree's selection */
+GtkTreeSelection *choose_selection;
-static void activate_play(GtkMenuItem *menuitem, gpointer user_data);
-#if 0
-static void activate_remove(GtkMenuItem *menuitem, gpointer user_data);
-#endif
-static void activate_properties(GtkMenuItem *menuitem, gpointer user_data);
+/** @brief Map choosedata types to names */
+static const char *const choose_type_map[] = { "track", "dir" };
-static gboolean sensitive_play(struct choosenode *cn);
-#if 0
-static gboolean sensitive_remove(struct choosenode *cn);
-#endif
-static gboolean sensitive_properties(struct choosenode *cn);
-
-static struct menuitem menuitems[] = {
- { "Play track", activate_play, sensitive_play, 0, 0 },
-#if 0
- /* Not implemented yet */
- { "Remove", activate_remove, sensitive_remove, 0, 0 },
-#endif
- { "Track properties", activate_properties, sensitive_properties, 0, 0 },
-};
-
-#define NMENUITEMS (int)(sizeof menuitems / sizeof *menuitems)
-
-/* Maintaining the data structure ------------------------------------------ */
-
-/* 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 Return the choosedata given an interator */
+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;
}
-/* Fill the root */
-static void fill_root_node(struct choosenode *cn) {
- int ch;
- char *name;
- struct callbackdata *cbd;
-
- D(("fill_root_node"));
- clear_children(cn);
- if(choosealpha) {
- if(!cn->children.nvec) { /* Only need to do this once */
- for(ch = 'A'; ch <= 'Z'; ++ch) {
- byte_xasprintf(&name, "%c", ch);
- newnode(cn, "<letter>", name, name, CN_EXPANDABLE, fill_letter_node);
- }
- newnode(cn, "<letter>", "*", "~", CN_EXPANDABLE, fill_letter_node);
- }
- updated_node(cn, 1);
- } else {
- /* More de-duping possible here */
- 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);
- }
+struct choosedata *choose_path_to_data(GtkTreePath *path) {
+ GtkTreeIter it[1];
+ gboolean itv = gtk_tree_model_get_iter(GTK_TREE_MODEL(choose_store),
+ it, path);
+ assert(itv);
+ return choose_iter_to_data(it);
}
-static void delete_cn_widgets(struct choosenode *cn) {
- if(cn->arrow) {
- DW(arrow);
- gtk_widget_destroy(cn->arrow);
- cn->arrow = 0;
- }
- if(cn->label) {
- DW(label);
- gtk_widget_destroy(cn->label);
- cn->label = 0;
- }
- if(cn->marker) {
- DW(image);
- gtk_widget_destroy(cn->marker);
- cn->marker = 0;
- }
- if(cn->hbox) {
- DW(hbox);
- gtk_widget_destroy(cn->hbox);
- cn->hbox = 0;
+/** @brief Remove node @p it and all its children
+ * @param Iterator, updated to point to next
+ * @return True if iterator remains valid
+ */
+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);
}
- if(cn->container) {
- DW(event_box);
- gtk_widget_destroy(cn->container);
- cn->container = 0;
+ return gtk_tree_store_remove(choose_store, it);
+}
+
+/** @brief Update length and state fields */
+static gboolean choose_set_state_callback(GtkTreeModel attribute((unused)) *model,
+ GtkTreePath attribute((unused)) *path,
+ GtkTreeIter *it,
+ gpointer attribute((unused)) data) {
+ struct choosedata *cd = choose_iter_to_data(it);
+ if(!cd)
+ return FALSE; /* Skip placeholders*/
+ if(cd->type == CHOOSE_FILE) {
+ const long l = namepart_length(cd->track);
+ char length[64];
+ if(l > 0)
+ byte_snprintf(length, sizeof length, "%ld:%02ld", l / 60, l % 60);
+ else
+ length[0] = 0;
+ gtk_tree_store_set(choose_store, it,
+ LENGTH_COLUMN, length,
+ STATE_COLUMN, queued(cd->track),
+ -1);
}
+ return FALSE; /* continue walking */
}
-/* Clear all the children of 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 when the queue or playing track change */
+static void choose_set_state(const char attribute((unused)) *event,
+ void attribute((unused)) *eventdata,
+ void attribute((unused)) *callbackdata) {
+ gtk_tree_model_foreach(GTK_TREE_MODEL(choose_store),
+ choose_set_state_callback,
+ NULL);
}
-/* Fill a child node */
-static void fill_letter_node(struct choosenode *cn) {
- const char *regexp;
- struct callbackdata *cbd;
-
- D(("fill_letter_node %s", cn->display));
- switch(cn->display[0]) {
- default:
- byte_xasprintf((char **)®exp, "^(the )?%c", tolower(cn->display[0]));
- break;
- case 'T':
- regexp = "^(?!the [^t])t";
- break;
- case '*':
- regexp = "^[^a-z]";
- break;
+/** @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
+ *
+ * Adjusts the set of files (or directories) below @p parent_ref to match those
+ * listed in @p nvec and @p vec.
+ *
+ * @parent_ref will be destroyed.
+ */
+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 {
+ parent_path = 0;
+ parent_it = 0;
+ /*fprintf(stderr, "choose_populate %s: populating the root\n",
+ choose_type_map[type]);*/
}
- /* TODO: caching */
- /* TODO: de-dupe against fill_directory_node */
- 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, "", regexp, cbd);
- cbd = xmalloc(sizeof *cbd);
- cbd->u.choosenode = cn;
- disorder_eclient_files(client, got_files, "", regexp, cbd);
-}
-
-/* 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;
- int n;
-
- D(("got_files %d files for %s", nvec, cn->path));
- /* Complicated by the need to resolve aliases. We can save a bit of effort
- * by re-using cbd though. */
- cn->pending = nvec;
- for(n = 0; n < nvec; ++n)
- disorder_eclient_resolve(client, got_resolved_file, vec[n], cbd);
-}
-
-static void got_resolved_file(void *v, const char *track) {
- struct callbackdata *cbd = v;
- struct choosenode *cn = cbd->u.choosenode, *file_cn;
-
- file_cn = newnode(cn, track,
- trackname_transform("track", track, "display"),
- trackname_transform("track", track, "sort"),
- 0/*flags*/, 0/*fill*/);
- /* Only bother updating when we've got the lot */
- if(--cn->pending == 0)
- updated_node(cn, 1);
-}
-
-/* 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;
- int n;
-
- D(("got_dirs %d dirs for %s", nvec, cn->path));
- 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, 1);
-}
-
-/* Fill a child node */
-static void fill_directory_node(struct choosenode *cn) {
- struct callbackdata *cbd;
-
- D(("fill_directory_node %s", cn->path));
- /* TODO: caching */
- /* TODO: de-dupe against fill_letter_node */
- 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);
-}
-
-/* Expand a node */
-static void expand_node(struct choosenode *cn) {
- D(("expand_node %s", cn->path));
- 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;
- /* TODO: visual feedback */
- cn->fill(cn);
-}
-
-/* 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;
- /* 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();
-}
-
-/* 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);
-}
-
-/* Called when an expandable node is updated. */
-static void updated_node(struct choosenode *cn, int redisplay) {
- 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)
- redisplay_tree();
-}
-
-/* Searching --------------------------------------------------------------- */
-
-static int compare_track_for_qsort(const void *a, const void *b) {
- return compare_path(*(char **)a, *(char **)b);
-}
-
-/* Return true iff FILE is a child of DIR */
-static int is_child(const char *dir, const char *file) {
- const size_t dlen = strlen(dir);
-
- return (!strncmp(file, dir, dlen)
- && file[dlen] == '/'
- && strchr(file + dlen + 1, '/') == 0);
-}
-
-/* Return true iff FILE is a descendant of DIR */
-static int is_descendant(const char *dir, const char *file) {
- const size_t dlen = strlen(dir);
-
- return !strncmp(file, dir, dlen) && file[dlen] == '/';
-}
-
-/* Called to fill a node in the search results tree */
-static void fill_search_node(struct choosenode *cn) {
- int n;
- const size_t plen = strlen(cn->path);
- const char *s;
- char *dir, *last = 0;
-
- D(("fill_search_node %s", cn->path));
- /* We depend on the search results being sorted as by compare_path(). */
- clear_children(cn);
- for(n = 0; n < nsearchresults; ++n) {
- /* We only care about descendants of CN */
- if(!is_descendant(cn->path, searchresults[n]))
- continue;
- s = strchr(searchresults[n] + plen + 1, '/');
- if(s) {
- /* We've identified a subdirectory of CN. */
- dir = xstrndup(searchresults[n], s - searchresults[n]);
- if(!last || strcmp(dir, last)) {
- /* Not a duplicate */
- last = dir;
- newnode(cn, dir,
- trackname_transform("dir", dir, "display"),
- trackname_transform("dir", dir, "sort"),
- CN_EXPANDABLE, fill_search_node);
+ /* 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;
}
} else {
- /* We've identified a file in CN */
- newnode(cn, searchresults[n],
- trackname_transform("track", searchresults[n], "display"),
- trackname_transform("track", searchresults[n], "sort"),
- 0/*flags*/, 0/*fill*/);
+ /* Keep wrong-type entries */
+ //fprintf(stderr, " %s is a %s\n", cd->track, choose_type_map[cd->type]);
+ keep = 1;
}
+ if(keep)
+ itv = gtk_tree_model_iter_next(GTK_TREE_MODEL(choose_store), it);
+ else
+ itv = choose_remove_node(it);
}
- updated_node(cn, 1);
-}
-
-/* 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,
- int nvec, char **vec) {
- struct choosenode *cn;
- int n;
- const char *dir;
-
- search_in_flight = 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();
- } else {
- if(nvec) {
- /* We will replace the choose tree with a tree structured view of search
- * results. First we must disabled the choose tree's widgets. */
- delete_widgets(root);
- /* Put the tracks into order, grouped by directory. They'll probably
- * come back this way anyway in current versions of the server, but it's
- * cheap not to rely on it (compared with the massive effort we expend
- * later on) */
- qsort(vec, nvec, sizeof(char *), compare_track_for_qsort);
- searchresults = vec;
- nsearchresults = nvec;
- cn = root = newnode(0/*parent*/, "", "Search results", "",
- CN_EXPANDABLE|CN_EXPANDED, fill_search_node);
- /* Construct the initial tree. We do this in a single pass and expand
- * everything, so you can actually see your search results. */
- for(n = 0; n < nsearchresults; ++n) {
- /* Firstly we might need to go up a few directories to each an ancestor
- * of this track */
- while(!is_descendant(cn->path, searchresults[n])) {
- /* We report the update on each node the last time we see it (With
- * display=0, the main purpose of this is to get the order of the
- * children right.) */
- updated_node(cn, 0);
- cn = cn->parent;
- }
- /* Secondly we might need to insert some new directories */
- while(!is_child(cn->path, searchresults[n])) {
- /* Figure out the subdirectory */
- dir = xstrndup(searchresults[n],
- strchr(searchresults[n] + strlen(cn->path) + 1,
- '/') - searchresults[n]);
- cn = newnode(cn, dir,
- trackname_transform("dir", dir, "display"),
- trackname_transform("dir", dir, "sort"),
- CN_EXPANDABLE|CN_EXPANDED, fill_search_node);
- }
- /* Finally we can insert the track as a child of the current
- * directory */
- newnode(cn, searchresults[n],
- trackname_transform("track", searchresults[n], "display"),
- trackname_transform("track", searchresults[n], "sort"),
- 0/*flags*/, 0/*fill*/);
- }
- while(cn) {
- /* Update all the nodes back up to the root */
- updated_node(cn, 0);
- cn = cn->parent;
+ /* 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);
+ /* Update length and state; we expect this to kick off length lookups
+ * rather than necessarily get the right value the first time round. */
+ choose_set_state_callback(0, 0, it, 0);
+ ++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);
}
- /* Now it's worth displaying the tree */
- redisplay_tree();
- } else if(root != realroot) {
- delete_widgets(root);
- root = realroot;
- redisplay_tree();
}
}
-}
-
-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;
+ //fprintf(stderr, " %d nodes inserted\n", inserted);
+ if(inserted) {
+ /* TODO sort the children */
}
- 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);
- } else {
- search_in_flight = 1;
- }
- } else {
- /* No search terms - we want to see all tracks */
- search_completed(0, 0, 0);
+ 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);
}
}
-/* 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), "");
-}
-
-/* Display functions ------------------------------------------------------- */
-
-/* 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;
-}
-
-/* Update the display */
-static void redisplay_tree(void) {
- struct displaydata d;
- guint oldwidth, oldheight;
-
- D(("redisplay_tree"));
- /* 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 */
- MTAG_PUSH("display_tree");
- d = display_tree(root, 0, 0);
- MTAG_POP();
- /* 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);
- /* Notify the main menu of any recent changes */
- menu_update(-1);
-}
-
-/* Make sure all displayed widgets from CN down exist and are in their proper
- * place and return the vertical 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;
-
- 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) {
- MTAG_PUSH("make_widgets_1");
- /* Widgets need to be created */
- NW(hbox);
- cn->hbox = gtk_hbox_new(FALSE, 1);
- if(cn->flags & CN_EXPANDABLE) {
- NW(arrow);
- 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"))) {
- NW(image);
- cn->marker = gtk_image_new_from_pixbuf(pb);
- }
- }
- MTAG_POP();
- MTAG_PUSH("make_widgets_2");
- NW(label);
- 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);
- MTAG_POP();
- MTAG_PUSH("make_widgets_3");
- NW(event_box);
- 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);
- gtk_widget_set_name(cn->label, "choose");
- gtk_widget_set_name(cn->container, "choose");
- /* Show everything by default */
- gtk_widget_show_all(cn->container);
- MTAG_POP();
- }
- assert(cn->container);
- /* Make sure the icon is right */
- 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);
- /* Put the widget in the right place */
- 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);
- }
- /* Set the widget's selection status */
- if(!(cn->flags & CN_EXPANDABLE))
- display_selection(cn);
- /* 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;
- 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 {
- for(n = 0; n < cn->children.nvec; ++n)
- undisplay_tree(cn->children.vec[n]);
- }
- if(!(cn->flags & CN_EXPANDABLE)) {
- ++files_visible;
- if(cn->flags & CN_SELECTED)
- ++files_selected;
+static void choose_dirs_completed(void *v,
+ const char *error,
+ int nvec, char **vec) {
+ if(error) {
+ popup_protocol_error(0, error);
+ return;
}
- /* 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;
+ choose_populate(v, nvec, vec, CHOOSE_DIRECTORY);
}
-/* 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;
+static void choose_files_completed(void *v,
+ const char *error,
+ int nvec, char **vec) {
+ if(error) {
+ popup_protocol_error(0, error);
+ return;
}
- /* Remove children too */
- for(n = 0; n < cn->children.nvec; ++n)
- undisplay_tree(cn->children.vec[n]);
+ choose_populate(v, nvec, vec, CHOOSE_FILE);
}
-/* Selection --------------------------------------------------------------- */
-
-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));
-}
-
-/* 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_row_expanded(GtkTreeView attribute((unused)) *treeview,
+ GtkTreeIter *iter,
+ GtkTreePath *path,
+ gpointer attribute((unused)) user_data) {
+ /*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. */
+}
+
+/** @brief Create the choose tab */
+GtkWidget *choose_widget(void) {
+ /* Create the tree store. */
+ choose_store = gtk_tree_store_new(1 + CHOOSEDATA_COLUMN,
+ G_TYPE_BOOLEAN,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_POINTER);
+
+ /* Create the view */
+ choose_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(choose_store));
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(choose_view), TRUE);
+
+ /* Create cell renderers and columns */
+ /* TODO use a table */
+ {
+ GtkCellRenderer *r = gtk_cell_renderer_text_new();
+ GtkTreeViewColumn *c = gtk_tree_view_column_new_with_attributes
+ ("Track",
+ r,
+ "text", NAME_COLUMN,
+ (char *)0);
+ gtk_tree_view_column_set_resizable(c, TRUE);
+ gtk_tree_view_column_set_reorderable(c, TRUE);
+ g_object_set(c, "expand", TRUE, (char *)0);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c);
}
-}
-
-/* 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 ------------------------------------------------------------ */
-
-/* Clicked on something */
-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);
- 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;
- }
- }
- 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, 0, 0);
- last_click = 0;
- }
- } else if(event->type == GDK_BUTTON_PRESS
- && event->button == 3) {
- /* 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; n < NMENUITEMS; ++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);
- }
- /* Pop up the menu */
- gtk_widget_show_all(menu);
- gtk_menu_popup(GTK_MENU(menu), 0, 0, 0, 0,
- event->button, event->time);
+ {
+ GtkCellRenderer *r = gtk_cell_renderer_text_new();
+ GtkTreeViewColumn *c = gtk_tree_view_column_new_with_attributes
+ ("Length",
+ r,
+ "text", LENGTH_COLUMN,
+ (char *)0);
+ gtk_tree_view_column_set_resizable(c, TRUE);
+ gtk_tree_view_column_set_reorderable(c, TRUE);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c);
}
-}
-
-static void searchentry_changed(GtkEditable attribute((unused)) *editable,
- gpointer attribute((unused)) user_data) {
- initiate_search();
-}
-
-/* Menu items -------------------------------------------------------------- */
-
-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);
+ {
+ GtkCellRenderer *r = gtk_cell_renderer_toggle_new();
+ GtkTreeViewColumn *c = gtk_tree_view_column_new_with_attributes
+ ("Queued",
+ r,
+ "active", STATE_COLUMN,
+ (char *)0);
+ gtk_tree_view_column_set_resizable(c, TRUE);
+ gtk_tree_view_column_set_reorderable(c, TRUE);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c);
+ /* TODO make checkbox clickable to queue the track */
}
-}
-
-static char **gather_selected(int *ntracks) {
- struct vector v;
-
- vector_init(&v);
- recurse_selected(root, &v);
- vector_terminate(&v);
- if(ntracks) *ntracks = v.nvec;
- return v.vec;
-}
-
-static void activate_play(GtkMenuItem attribute((unused)) *menuitem,
- gpointer attribute((unused)) user_data) {
- 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], 0, 0);
-}
-
-#if 0
-static void activate_remove(GtkMenuItem attribute((unused)) *menuitem,
- gpointer attribute((unused)) user_data) {
- /* TODO remove all selected tracks */
-}
-#endif
-
-static void activate_properties(GtkMenuItem attribute((unused)) *menuitem,
- gpointer attribute((unused)) user_data) {
- int ntracks;
- char **tracks = gather_selected(&ntracks);
-
- properties(ntracks, tracks);
-}
-
-static gboolean sensitive_play(struct choosenode attribute((unused)) *cn) {
- return !!files_selected;
-}
-
-#if 0
-static gboolean sensitive_remove(struct choosenode attribute((unused)) *cn) {
- return FALSE; /* not implemented yet */
-}
-#endif
-
-static gboolean sensitive_properties(struct choosenode attribute((unused)) *cn) {
- return !!files_selected;
-}
-
-/* Main menu plumbing ------------------------------------------------------ */
-
-static int choose_properties_sensitive(GtkWidget attribute((unused)) *w) {
- return !!files_selected;
-}
-
-static int choose_selectall_sensitive(GtkWidget attribute((unused)) *w) {
- return FALSE; /* TODO */
-}
-
-static void choose_properties_activate(GtkWidget attribute((unused)) *w) {
- activate_properties(0, 0);
-}
-
-static void choose_selectall_activate(GtkWidget attribute((unused)) *w) {
- /* TODO */
-}
-
-static const struct tabtype tabtype_choose = {
- choose_properties_sensitive,
- choose_selectall_sensitive,
- choose_properties_activate,
- choose_selectall_activate,
-};
-
-/* Public entry points ----------------------------------------------------- */
-
-/* Create a track choice widget */
-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| | |
- * | | +-------------------------------------------------++--+ | |
- * | | +-------------------------------------------------+ | |
- * | | |< >| | |
- * | | +-------------------------------------------------+ | |
- * | +---------------------------------------------------------+ |
- * +-------------------------------------------------------------+
- */
+ /* 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_event), 0);
+ g_signal_connect(choose_view, "button-release-event",
+ G_CALLBACK(choose_button_event), 0);
+ /* Catch row expansions so we can fill in placeholders */
+ g_signal_connect(choose_view, "row-expanded",
+ G_CALLBACK(choose_row_expanded), 0);
+
+ event_register("queue-list-changed", choose_set_state, 0);
+ event_register("playing-track-changed", choose_set_state, 0);
- /* Text entry box for search terms */
- NW(entry);
- searchentry = gtk_entry_new();
- g_signal_connect(searchentry, "changed", G_CALLBACK(searchentry_changed), 0);
-
- /* Cancel button to clear the search */
- NW(button);
- clearsearch = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- g_signal_connect(G_OBJECT(clearsearch), "clicked",
- G_CALLBACK(clearsearch_clicked), 0);
-
- /* hbox packs the search box and the cancel button together on a line */
- NW(hbox);
- 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_end(GTK_BOX(hbox), clearsearch,
- FALSE/*expand*/, FALSE/*fill*/, 0/*padding*/);
+ /* Fill the root */
+ disorder_eclient_files(client, choose_files_completed, "", NULL, NULL);
+ disorder_eclient_dirs(client, choose_dirs_completed, "", NULL, NULL);
- /* chooselayout contains the currently visible subset of the track
- * namespace */
- NW(layout);
- chooselayout = gtk_layout_new(0, 0);
- root = newnode(0/*parent*/, "<root>", "All files", "",
- CN_EXPANDABLE, fill_root_node);
- realroot = root;
- expand_node(root); /* will call redisplay_tree */
- /* Create the popup menu */
- NW(menu);
- menu = gtk_menu_new();
- g_signal_connect(menu, "destroy", G_CALLBACK(gtk_widget_destroyed), &menu);
- for(n = 0; n < NMENUITEMS; ++n) {
- NW(menu_item);
- menuitems[n].w = gtk_menu_item_new_with_label(menuitems[n].name);
- gtk_menu_attach(GTK_MENU(menu), menuitems[n].w, 0, 1, n, n + 1);
- }
- /* The layout is scrollable */
- scrolled = scroll_widget(GTK_WIDGET(chooselayout), "choose");
-
- /* The scrollable layout and the search hbox go together in a vbox */
- NW(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;
-}
-
-/* Called when something we care about here might have changed */
-void choose_update(void) {
- redisplay_tree();
+ /* Make the widget scrollable */
+ GtkWidget *scrolled = scroll_widget(choose_view);
+ g_object_set_data(G_OBJECT(scrolled), "type", (void *)&choose_tabtype);
+ return scrolled;
}
/*
~mdw / disorder / blobdiff