Multiple-track drag+drop queue rearrangement.

diff --git a/CHANGES.html b/CHANGES.html
index 8b0b28fa716ea2f452bf0009a32654d5668dde9d..38f14e94f40a5cfa0e22e0744d4f5eb261d14fb6 100644 (file)
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -82,6 +82,15 @@ span.command {
       
     </div>
       
+    <h3>Disobedience</h3>
+
+    <div class=section>
+
+      <p>Multiple tracks can now be dragged in the queue in a single
+      operation.</p>
+
+    </div>
+
     <h3>Web Interface</h3>
  
     <div class=section>

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index f8bdb140962dde17fa768bf4f75eac13625ca445..353b145ab5bd1eb7c5bd6e0f19782cb92a2efe0b 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -28,7 +28,7 @@ disobedience_SOURCES=disobedience.h disobedience.c client.c queue.c   \
        choose.c choose-menu.c choose-search.c popup.c misc.c           \
        control.c properties.c menu.c log.c progress.c login.c rtp.c    \
        help.c ../lib/memgc.c settings.c users.c lookup.c choose.h      \
-       popup.h playlists.c
+       popup.h playlists.c multidrag.c
 disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
        $(LIBASOUND) $(COREAUDIO) $(LIBDB) $(LIBICONV)
 disobedience_LDFLAGS=$(GTK_LIBS)

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index f4678c79d90fc8a0ba0dc875c9f011fe63f011e9..404358ad67fa7cf41a894864ab0434a1cc32ff2c 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -266,6 +266,8 @@ extern GtkWidget *playlists_menu;
 extern GtkWidget *editplaylists_widget;
 #endif
 
+void make_treeview_multidrag(GtkWidget *w);
+
 #endif /* DISOBEDIENCE_H */
 
 /*

diff --git a/disobedience/multidrag.c b/disobedience/multidrag.c
new file mode 100644 (file)
index 0000000..95a133a
--- /dev/null
+++ b/disobedience/multidrag.c
@@ -0,0 +1,121 @@
+/*
+ * This file is part of DisOrder
+ * Copyright (C) 2009 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file disobedience/multidrag.c
+ * @brief Drag multiple rows of a GtkTreeView
+ */
+#include "disobedience.h"
+
+static gboolean multidrag_selection_block(GtkTreeSelection attribute((unused)) *selection,
+                                         GtkTreeModel attribute((unused)) *model,
+                                         GtkTreePath attribute((unused)) *path,
+                                         gboolean attribute((unused)) path_currently_selected,
+                                         gpointer data) {
+  return *(gboolean *)data;
+}
+
+static void block_selection(GtkWidget *w, gboolean block,
+                           int x, int y) {
+  static gboolean which[] = { FALSE, TRUE };
+  GtkTreeSelection *s = gtk_tree_view_get_selection(GTK_TREE_VIEW(w));
+  gtk_tree_selection_set_select_function(s,
+                                        multidrag_selection_block,
+                                        &which[!!block],
+                                        NULL);
+  // Remember the pointer location
+  int *where = g_object_get_data(G_OBJECT(w), "multidrag-where");
+  if(!where) {
+    where = g_malloc(2 * sizeof (int));
+    g_object_set_data(G_OBJECT(w), "multidrag-where", where);
+  }
+  where[0] = x;
+  where[1] = y;
+}
+
+static gboolean multidrag_button_press_event(GtkWidget *w,
+                                            GdkEventButton *event,
+                                            gpointer attribute((unused)) user_data) {
+  /* By default we assume that anything this button press does should
+   * act as normal */
+  block_selection(w, TRUE, -1, -1);
+  /* We are only interested in left-button behavior */
+  if(event->button != 1)
+    return FALSE;
+  /* We are only interested in unmodified clicks (not SHIFT etc) */
+  if(event->state & GDK_MODIFIER_MASK)
+    return FALSE;
+  /* We are only interested if a well-defined path is clicked */
+  GtkTreePath *path;
+  if(!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(w),
+                                   event->x, event->y,
+                                   &path,
+                                   NULL,
+                                   NULL, NULL))
+    return FALSE;
+  //gtk_widget_grab_focus(w);    // TODO why??
+  /* We are only interested if a selected row is clicked */
+  GtkTreeSelection *s = gtk_tree_view_get_selection(GTK_TREE_VIEW(w));
+  if(!gtk_tree_selection_path_is_selected(s, path))
+    return FALSE;
+  /* We block subsequent selection changes and remember where the
+   * click was */
+  block_selection(w, FALSE, event->x, event->y);
+  return FALSE;                        /* propagate */
+}
+
+static gboolean multidrag_button_release_event(GtkWidget *w,
+                                              GdkEventButton *event,
+                                              gpointer attribute((unused)) user_data) {
+  int *where = g_object_get_data(G_OBJECT(w), "multidrag-where");
+
+  if(where && where[0] != -1) {
+    // Remember where the down-click was
+    const int x = where[0], y = where[1];
+    // Re-allow selections
+    block_selection(w, TRUE, -1, -1);
+    if(x == event->x && y == event->y) {
+      // If the up-click is at the same location as the down-click,
+      // it's not a drag.
+      GtkTreePath *path;
+      GtkTreeViewColumn *col;
+      if(gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(w),
+                                      event->x, event->y,
+                                      &path,
+                                      &col,
+                                      NULL, NULL)) {
+       gtk_tree_view_set_cursor(GTK_TREE_VIEW(w), path, col, FALSE);
+      }
+    }
+  }
+  return FALSE;                        /* propagate */
+}
+
+void make_treeview_multidrag(GtkWidget *w) {
+  g_signal_connect(w, "button-press-event",
+                  G_CALLBACK(multidrag_button_press_event), NULL);
+  g_signal_connect(w, "button-release-event",
+                  G_CALLBACK(multidrag_button_release_event), NULL);
+}
+
+/*
+Local Variables:
+c-basic-offset:2
+comment-column:40
+fill-column:79
+indent-tabs-mode:nil
+End:
+*/

diff --git a/disobedience/queue-generic.c b/disobedience/queue-generic.c
index 913d9d37d1afb73144872e9ef18181179fb51c3b..2db2e1dad40e5190a27df0896d859dbfc0d882c9 100644 (file)
--- a/disobedience/queue-generic.c
+++ b/disobedience/queue-generic.c
@@ -798,6 +798,7 @@ GtkWidget *init_queuelike(struct queuelike *ql) {
                      G_CALLBACK(ql_drag_data_get), ql);
     g_signal_connect(ql->view, "drag-data-received",
                      G_CALLBACK(ql_drag_data_received), ql);
+    make_treeview_multidrag(ql->view);
   } else {
     /* TODO: support copy-dragging out of non-rearrangeable queues.  Will need
      * to support copy dropping into the rearrangeable ones. */