X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/a6e6b3597a15b18dbb3b4b95b7361a361442cad0..3ae36d41f1c4d4778f767f5204f6b68aad6019e0:/disobedience/queue-generic.c diff --git a/disobedience/queue-generic.c b/disobedience/queue-generic.c index 913d9d3..54b11c5 100644 --- a/disobedience/queue-generic.c +++ b/disobedience/queue-generic.c @@ -40,18 +40,19 @@ #include "disobedience.h" #include "popup.h" #include "queue-generic.h" - -static struct queuelike *const queuelikes[] = { - &ql_queue, &ql_recent, &ql_added -}; -#define NQUEUELIKES (sizeof queuelikes / sizeof *queuelikes) +#include "multidrag.h" static const GtkTargetEntry queuelike_targets[] = { { - (char *)"text/x-disorder-track-data", /* drag type */ - GTK_TARGET_SAME_WIDGET, /* rearrangement only for now */ + (char *)"text/x-disorder-queued-tracks", /* drag type */ + GTK_TARGET_SAME_WIDGET, /* rearrangement within a widget */ 0 /* ID value */ }, + { + (char *)"text/x-disorder-playable-tracks", /* drag type */ + GTK_TARGET_SAME_APP|GTK_TARGET_OTHER_WIDGET, /* copying between widgets */ + 1 /* ID value */ + }, }; /* Track detail lookup ----------------------------------------------------- */ @@ -492,6 +493,8 @@ static void ql_drag_begin(GtkWidget attribute((unused)) *w, 0, y, /* dest coords */ pxw, pxh); /* size */ y += pxh; + gdk_drawable_unref(qdbs->pixmaps[n]); + qdbs->pixmaps[n] = NULL; } // TODO scale down a bit, the resulting icons are currently a bit on the // large side. @@ -501,6 +504,15 @@ static void ql_drag_begin(GtkWidget attribute((unused)) *w, NULL); } +/** @brief Called when a drag moves within a candidate destination + * @param w Destination widget + * @param dc Drag context + * @param x Current pointer location + * @param y Current pointer location + * @param time_ Current time + * @param user_data Pointer to queuelike + * @return TRUE in a dropzone, otherwise FALSE + */ static gboolean ql_drag_motion(GtkWidget *w, GdkDragContext *dc, gint x, @@ -517,18 +529,18 @@ static gboolean ql_drag_motion(GtkWidget *w, // then the lowest-numbered member of the intersection is chosen. // 3) otherwise no member is chosen and gdk_drag_status() is called // with action=0 to refuse the drop. - // Currently we can only accept _MOVE. But in the future we will - // need to accept _COPY in some cases. if(dc->suggested_action) { - if(dc->suggested_action == GDK_ACTION_MOVE) + if(dc->suggested_action & (GDK_ACTION_MOVE|GDK_ACTION_COPY)) action = dc->suggested_action; } else if(dc->actions & GDK_ACTION_MOVE) - action = dc->actions; + action = GDK_ACTION_MOVE; + else if(dc->actions & GDK_ACTION_COPY) + action = GDK_ACTION_COPY; /*fprintf(stderr, "suggested %#x actions %#x result %#x\n", dc->suggested_action, dc->actions, action);*/ if(action) { // If the action is acceptable then we see if this widget is acceptable - if(!gtk_drag_dest_find_target(w, dc, NULL)) + if(gtk_drag_dest_find_target(w, dc, NULL) == GDK_NONE) action = 0; } // Report the status @@ -563,6 +575,12 @@ static gboolean ql_drag_motion(GtkWidget *w, return TRUE; } +/** @brief Called when a drag moves leaves a candidate destination + * @param w Destination widget + * @param dc Drag context + * @param time_ Current time + * @param user_data Pointer to queuelike + */ static void ql_drag_leave(GtkWidget *w, GdkDragContext attribute((unused)) *dc, guint attribute((unused)) time_, @@ -614,6 +632,7 @@ static void ql_drag_data_get(GtkWidget attribute((unused)) *w, gtk_tree_selection_selected_foreach(ql->selection, ql_drag_data_get_collect, result); + // TODO must not be able to drag playing track! //fprintf(stderr, "drag-data-get: %.*s\n", // result->nvec, result->vec); /* gtk_selection_data_set_text() insists that data->target is one of a @@ -647,7 +666,7 @@ static void ql_drag_data_received(GtkWidget attribute((unused)) *w, struct vector ids[1], tracks[1]; int parity = 0; - //fprintf(stderr, "drag-data-received: %d,%d\n", x, y); + //fprintf(stderr, "drag-data-received: %d,%d info_=%u\n", x, y, info_); /* Get the selection string */ p = result = (char *)gtk_selection_data_get_text(data); if(!result) { @@ -707,9 +726,21 @@ static void ql_drag_data_received(GtkWidget attribute((unused)) *w, break; } } + /* Guarantee we never drop an empty list */ + if(!tracks->nvec) + return; /* Note that q->id can match one of ids[]. This doesn't matter for * moveafter but TODO may matter for playlist support. */ - ql->drop(ql, tracks->nvec, tracks->vec, ids->vec, q); + switch(info_) { + case 0: + /* Rearrangement. Send ID and track data. */ + ql->drop(ql, tracks->nvec, tracks->vec, ids->vec, q); + break; + case 1: + /* Copying between widgets. IDs mean nothing so don't send them. */ + ql->drop(ql, tracks->nvec, tracks->vec, NULL, q); + break; + } } /** @brief Initialize a @ref queuelike */ @@ -787,7 +818,7 @@ GtkWidget *init_queuelike(struct queuelike *ql) { GTK_DEST_DEFAULT_HIGHLIGHT|GTK_DEST_DEFAULT_DROP, queuelike_targets, sizeof queuelike_targets / sizeof *queuelike_targets, - GDK_ACTION_MOVE); + GDK_ACTION_MOVE|GDK_ACTION_COPY); g_signal_connect(ql->view, "drag-begin", G_CALLBACK(ql_drag_begin), ql); g_signal_connect(ql->view, "drag-motion", @@ -798,9 +829,19 @@ 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. */ + /* For queues that cannot accept a drop we still accept a copy out */ + gtk_drag_source_set(ql->view, + GDK_BUTTON1_MASK, + queuelike_targets, + sizeof queuelike_targets / sizeof *queuelike_targets, + GDK_ACTION_COPY); + g_signal_connect(ql->view, "drag-begin", + G_CALLBACK(ql_drag_begin), ql); + g_signal_connect(ql->view, "drag-data-get", + G_CALLBACK(ql_drag_data_get), ql); + make_treeview_multidrag(ql->view); } /* TODO style? */