From 487f69b2928dad34a2167fe24e8fc4788345f48c Mon Sep 17 00:00:00 2001
From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Thu, 12 Jun 2008 11:40:32 +0100
Subject: [PATCH] Complete choose tab popup support (also middle-click).

---
 disobedience/choose-menu.c | 62 ++++++++++++++++++++++++++++++++++++++++------
 disobedience/choose.c      |  1 -
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/disobedience/choose-menu.c b/disobedience/choose-menu.c
index 8ba78e7..460acc7 100644
--- a/disobedience/choose-menu.c
+++ b/disobedience/choose-menu.c
@@ -21,9 +21,37 @@
 #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;
+}
+
 static int choose_selectall_sensitive(void attribute((unused)) *extra) {
   return TRUE;
 }
@@ -43,21 +71,41 @@ static void choose_selectnone_activate(GtkMenuItem attribute((unused)) *item,
 }
   
 static int choose_play_sensitive(void attribute((unused)) *extra) {
-  return FALSE;                 /* TODO */
+  struct choosedata *cd, **cdp = choose_get_selected(NULL);
+  int counts[2] = { 0, 0 };
+  while((cd = *cdp++))
+    ++counts[cd->type];
+  return !counts[CHOOSE_DIRECTORY] && counts[CHOOSE_FILE];
+}
+
+static void choose_play_completed(void attribute((unused)) *v,
+                                  const char *error) {
+  if(error)
+    popup_protocol_error(0, error);
 }
   
 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 +157,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);
diff --git a/disobedience/choose.c b/disobedience/choose.c
index 1a51a06..a505478 100644
--- a/disobedience/choose.c
+++ b/disobedience/choose.c
@@ -38,7 +38,6 @@
  * TODO:
  * - sweep up contracted nodes
  * - update when content may have changed (e.g. after a rescan)
- * - popup menu (partially implemented now)
  * - playing state
  * - display length of tracks
  */
-- 
2.11.0