Playing checkbox in Disobedience choose tab is now only visible for

[disorder] / disobedience / choose-menu.c

diff --git a/disobedience/choose-menu.c b/disobedience/choose-menu.c
index 8ba78e7e1cbe4fdde2bdce1c395a8ffa4ed7f856..a4e5430f237b14ca4f3286db16193db34c0c3ed2 100644 (file)
--- a/disobedience/choose-menu.c
+++ b/disobedience/choose-menu.c
@@ -21,16 +21,120 @@
 #include "popup.h"
 #include "choose.h"
 
+VECTOR_TYPE(cdvector, struct choosedata *, xrealloc);
+
 /** @brief Popup menu */
 static GtkWidget *choose_menu;
 
+/** @brief Callback for choose_get_selected() */
+static void choose_gather_selected_callback(GtkTreeModel attribute((unused)) *model,
+                                            GtkTreePath attribute((unused)) *path,
+                                            GtkTreeIter *iter,
+                                            gpointer data) {
+  struct cdvector *v = data;
+  struct choosedata *cd = choose_iter_to_data(iter);
+
+  if(cd)
+    cdvector_append(v, cd);
+}
+
+/** @brief Get a list of all selected tracks and directories */
+static struct choosedata **choose_get_selected(int *nselected) {
+  struct cdvector v[1];
+
+  cdvector_init(v);
+  gtk_tree_selection_selected_foreach(choose_selection,
+                                      choose_gather_selected_callback,
+                                      v);
+  cdvector_terminate(v);
+  if(nselected)
+    *nselected = v->nvec;
+  return v->vec;
+}
+
+/** @brief Recursion step for choose_get_visible()
+ * @param parent A visible node, or NULL for the root
+ * @param cdv Visible nodes accumulated here
+ */
+static void choose_visible_recurse(GtkTreeIter *parent,
+                                   void (*callback)(GtkTreeIter *it,
+                                                    struct choosedata *cd,
+                                                    void *userdata),
+                                   void *userdata) {
+  struct choosedata *cd;
+  int expanded;
+  if(parent) {
+    cd = choose_iter_to_data(parent);
+    callback(parent, cd, userdata);
+    if(cd->type != CHOOSE_DIRECTORY)
+      /* Only directories can be expanded so we can avoid the more
+       * expensive test below */
+      return;
+    GtkTreePath *parent_path
+      = gtk_tree_model_get_path(GTK_TREE_MODEL(choose_store),
+                                parent);
+    expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(choose_view),
+                                          parent_path);
+    gtk_tree_path_free(parent_path);
+  } else
+    expanded = 1;
+  /* See if parent is expanded */
+  if(expanded) {
+    /* Parent is expanded, visit all its children */
+    GtkTreeIter it[1];
+    gboolean itv = gtk_tree_model_iter_children(GTK_TREE_MODEL(choose_store),
+                                                it,
+                                                parent);
+    while(itv) {
+      choose_visible_recurse(it, callback, userdata);
+      itv = gtk_tree_model_iter_next(GTK_TREE_MODEL(choose_store), it);
+    }
+  }
+}
+
+static void choose_visible_visit(void (*callback)(GtkTreeIter *it,
+                                                  struct choosedata *cd,
+                                                  void *userdata),
+                                 void *userdata) {
+  choose_visible_recurse(NULL, callback, userdata);
+}
+
+static void count_choosedatas(struct choosedata **cds,
+                              int counts[2]) {
+  struct choosedata *cd;
+  counts[CHOOSE_FILE] = counts[CHOOSE_DIRECTORY] = 0;
+  while((cd = *cds++))
+    ++counts[cd->type];
+}
+
+
+static void choose_selectall_sensitive_callback
+    (GtkTreeIter attribute((unused)) *it,
+     struct choosedata *cd,
+     void *userdata) {
+  if(cd->type == CHOOSE_FILE)
+    ++*(int *)userdata;
+}
+
 static int choose_selectall_sensitive(void attribute((unused)) *extra) {
-  return TRUE;
+  int files = 0;
+  choose_visible_visit(choose_selectall_sensitive_callback, &files);
+  return files > 0;
 }
-  
+
+static void choose_selectall_activate_callback
+    (GtkTreeIter *it,
+     struct choosedata *cd,
+     void attribute((unused)) *userdata) {
+  if(cd->type == CHOOSE_FILE)
+    gtk_tree_selection_select_iter(choose_selection, it);
+  else
+    gtk_tree_selection_unselect_iter(choose_selection, it);
+}
+
 static void choose_selectall_activate(GtkMenuItem attribute((unused)) *item,
                                       gpointer attribute((unused)) userdata) {
-  gtk_tree_selection_select_all(choose_selection);
+  choose_visible_visit(choose_selectall_activate_callback, 0);
 }
   
 static int choose_selectnone_sensitive(void attribute((unused)) *extra) {
@@ -43,21 +147,33 @@ static void choose_selectnone_activate(GtkMenuItem attribute((unused)) *item,
 }
   
 static int choose_play_sensitive(void attribute((unused)) *extra) {
-  return FALSE;                 /* TODO */
+  int counts[2];
+  count_choosedatas(choose_get_selected(NULL), counts);
+  return !counts[CHOOSE_DIRECTORY] && counts[CHOOSE_FILE];
 }
   
 static void choose_play_activate(GtkMenuItem attribute((unused)) *item,
                                  gpointer attribute((unused)) userdata) {
-  /* TODO */
+  struct choosedata *cd, **cdp = choose_get_selected(NULL);
+  while((cd = *cdp++)) {
+    if(cd->type == CHOOSE_FILE)
+      disorder_eclient_play(client, xstrdup(cd->track),
+                            choose_play_completed, 0);
+  }
 }
   
-static int choose_properties_sensitive(void attribute((unused)) *extra) {
-  return FALSE;                 /* TODO */
+static int choose_properties_sensitive(void *extra) {
+  return choose_play_sensitive(extra);
 }
   
 static void choose_properties_activate(GtkMenuItem attribute((unused)) *item,
                                        gpointer attribute((unused)) userdata) {
-  /* TODO */
+  struct choosedata *cd, **cdp = choose_get_selected(NULL);
+  struct vector v[1];
+  vector_init(v);
+  while((cd = *cdp++))
+    vector_append(v, xstrdup(cd->track));
+  properties(v->nvec, (const char **)v->vec);
 }
 
 /** @brief Pop-up menu for choose */
@@ -109,8 +225,8 @@ gboolean choose_button_event(GtkWidget attribute((unused)) *widget,
                              gpointer attribute((unused)) user_data) {
   if(event->type == GDK_BUTTON_RELEASE && event->button == 2) {
     /* Middle click release - play track */
-    //ensure_selected(choose_view, event);
-    /* TODO */
+    ensure_selected(GTK_TREE_VIEW(choose_view), event);
+    choose_play_activate(NULL, NULL);
   } else if(event->type == GDK_BUTTON_PRESS && event->button == 3) {
     /* Right click press - pop up the menu */
     ensure_selected(GTK_TREE_VIEW(choose_view), event);