diff -rNu melys-0.0.16/ChangeLog melys-0.0.17/ChangeLog
--- melys-0.0.16/ChangeLog	Tue Oct 12 14:55:22 1999
+++ melys-0.0.17/ChangeLog	Wed Oct 13 19:02:48 1999
@@ -1,12 +1,23 @@
-1999-10-12  Steve Ratcliffe  <steve@parabola.demon.co.uk>
+1999-10-13  Steve Ratcliffe  <steve@parabola.demon.co.uk>
+
+	* widgets/melystrackdisplay.m: Implement the outlines for the
+	dragged parts.	Also fix for deleting a selected part.
 
 	* widgets/melystrackdisplay.m:
-	Handle the case where a distoyed part is present (which is a bug in
-	itself) more gracefully.
+	Re-build the selection list on the destination to cope with the case that
+	we have transfered selected parts from one window to another.
+
+1999-10-12  Steve Ratcliffe  <steve@parabola.demon.co.uk>
+
+	* midi/record.m: Free the event that was read after it has been used.
+
+	* version: Version 0.0.16
+
+	* widgets/melystrackdisplay.m: Handle the case where a distoyed
+	part is present (which is a bug in itself) more gracefully.
 
-	* md/mdadd.m:
-	Fixed a major bug where newly created parts would be getting freed
-	even though they were added to a track.
+	* md/mdadd.m: Fixed a major bug where newly created parts would
+	be getting freed even though they were added to a track.
 
 	* midi/record.m: Free the temporary container after use. Fixes
 	a leak.
diff -rNu melys-0.0.16/gui/trackprop.c melys-0.0.17/gui/trackprop.c
--- melys-0.0.16/gui/trackprop.c	Tue Oct 12 14:58:23 1999
+++ melys-0.0.17/gui/trackprop.c	Wed Oct 13 20:24:15 1999
@@ -309,11 +309,11 @@
 	num = gtk_spin_button_get_value_as_int(prop->channel);
 	num--; /* Really starts at 0 */
 	if (num != MD_CHAN(track))
-		md_set_devchan(MD_ELEMENT(track), MD_DEV(track), num);
+		md_set_devchan(MD_ELEMENT(track), MD_MK_DEVCHAN(MD_DEV(track), num));
 	num = gtk_spin_button_get_value_as_int(prop->devname);
 	num--; /* Really starts at 0 */
 	if (num != MD_DEV(track))
-		md_set_devchan(MD_ELEMENT(track), num, MD_CHAN(track));
+		md_set_devchan(MD_ELEMENT(track), MD_MK_DEVCHAN(num, MD_CHAN(track)));
 
 	num = gtk_spin_button_get_value_as_int(prop->instr);
 	program = num;
diff -rNu melys-0.0.16/gui/trackprop.m melys-0.0.17/gui/trackprop.m
--- melys-0.0.16/gui/trackprop.m	Mon Oct  4 22:20:28 1999
+++ melys-0.0.17/gui/trackprop.m	Wed Oct 13 13:26:30 1999
@@ -309,11 +309,11 @@
 	num = gtk_spin_button_get_value_as_int(prop->channel);
 	num--; /* Really starts at 0 */
 	if (num != MD_CHAN(track))
-		md_set_devchan(MD_ELEMENT(track), MD_DEV(track), num);
+		md_set_devchan(MD_ELEMENT(track), MD_MK_DEVCHAN(MD_DEV(track), num));
 	num = gtk_spin_button_get_value_as_int(prop->devname);
 	num--; /* Really starts at 0 */
 	if (num != MD_DEV(track))
-		md_set_devchan(MD_ELEMENT(track), num, MD_CHAN(track));
+		md_set_devchan(MD_ELEMENT(track), MD_MK_DEVCHAN(num, MD_CHAN(track)));
 
 	num = gtk_spin_button_get_value_as_int(prop->instr);
 	program = num;
diff -rNu melys-0.0.16/include/md.h melys-0.0.17/include/md.h
--- melys-0.0.16/include/md.h	Tue Oct 12 14:58:06 1999
+++ melys-0.0.17/include/md.h	Wed Oct 13 20:23:58 1999
@@ -180,7 +180,7 @@
 struct trackElement *md_track_nth(struct rootElement *root, int n);
 void md_ensure_track(struct rootElement *root, int n);
 struct tempomapElement *md_get_tempomap(struct rootElement *root);
-void md_set_devchan(struct element *base, int dev, int chan);
+void md_set_devchan(struct element *base, int devchan);
 void md_set_program(struct trackElement *track, int program, gboolean clear);
 void md_change_time(struct element *el, unsigned long t);
 void md_shrink(struct rootElement *root);
diff -rNu melys-0.0.16/include/meldnd.h melys-0.0.17/include/meldnd.h
--- melys-0.0.16/include/meldnd.h	Tue Oct 12 14:58:07 1999
+++ melys-0.0.17/include/meldnd.h	Wed Oct 13 20:23:59 1999
@@ -30,10 +30,13 @@
  * part within a part.
  */
 struct drag_element_data {
+	gint32	len;	/* Number of elements if this is the first */
+	gint32  data_size;	/* size of this structure */
+	gint32  tick_offset;		/* time offset of click into part */
+	gint32  track_offset;		/* track offset of click into part */
+	gint32  tick_len;		/* The length in ticks */
+
 	struct element *element;	/* The element being moved */
 	struct containerElement *con;	/* Containing element */
-
-	int  tick_offset;		/* time offset of click into part */
-	int  track_offset;		/* track offset of click into part */
 };
 
diff -rNu melys-0.0.16/include/melystrackdisplay.h melys-0.0.17/include/melystrackdisplay.h
--- melys-0.0.16/include/melystrackdisplay.h	Tue Oct 12 14:58:08 1999
+++ melys-0.0.17/include/melystrackdisplay.h	Wed Oct 13 20:24:00 1999
@@ -84,11 +84,11 @@
 	GList *sel_list;
 
 	/* Saved click position and state information */
-	struct partElement *click_part;	/* Part that was click on */
-	unsigned long  click_tick;	/* Clicked tick position */
+	struct partElement *click_part;		/* Part that was click on */
+	unsigned long  click_tick;		/* Clicked tick position */
 	struct trackElement *click_track;	/* Clicked track */
-	int  click_ntrack;	/* Clicked track position */
-	enum click_state  click_state;	/* State for mouse clicks and movement */
+	int  click_ntrack;			/* Clicked track position */
+	enum click_state  click_state;		/* mouse state */
 };
 
 struct _MelysTrackDisplayClass {
diff -rNu melys-0.0.16/md/mdutil.c melys-0.0.17/md/mdutil.c
--- melys-0.0.16/md/mdutil.c	Tue Oct 12 14:58:21 1999
+++ melys-0.0.17/md/mdutil.c	Wed Oct 13 20:24:12 1999
@@ -210,14 +210,11 @@
  * would normally call this with a track or part argument.
  */
 void 
-md_set_devchan(struct element *base, int dev, int chan)
+md_set_devchan(struct element *base, int devchan)
 {
 	struct element *el;
-	int devchan;
 	int i;
 
-	devchan = MD_MK_DEVCHAN(dev, chan);
-
 	MD_SET_DEVCHAN(base, devchan);
 
 	if (iscontainer(base)) {
@@ -225,7 +222,7 @@
 			el = MD_GET_INDEX(base, i);
 			MD_SET_DEVCHAN(el, devchan);
 			if (iscontainer(el))
-				md_set_devchan(el, dev, chan);
+				md_set_devchan(el, devchan);
 		}
 	}
 }
diff -rNu melys-0.0.16/md/mdutil.m melys-0.0.17/md/mdutil.m
--- melys-0.0.16/md/mdutil.m	Tue Oct 12 00:26:59 1999
+++ melys-0.0.17/md/mdutil.m	Wed Oct 13 13:26:35 1999
@@ -286,8 +286,7 @@
 >>function md_set_devchan
 void
 struct element *base;
-int  dev;
-int  chan;
+int  devchan;
 
 >>description
 Sets the channel on given element and all its children.
@@ -296,11 +295,8 @@
 
 >>code
 	struct element *el;
-	int devchan;
 	int i;
 
-	devchan = MD_MK_DEVCHAN(dev, chan);
-
 	MD_SET_DEVCHAN(base, devchan);
 
 	if (iscontainer(base)) {
@@ -308,7 +304,7 @@
 			el = MD_GET_INDEX(base, i);
 			MD_SET_DEVCHAN(el, devchan);
 			if (iscontainer(el))
-				md_set_devchan(el, dev, chan);
+				md_set_devchan(el, devchan);
 		}
 	}
 
diff -rNu melys-0.0.16/midi/record.c melys-0.0.17/midi/record.c
--- melys-0.0.16/midi/record.c	Tue Oct 12 14:58:26 1999
+++ melys-0.0.17/midi/record.c	Wed Oct 13 20:24:18 1999
@@ -287,6 +287,7 @@
 				add_io_cb(record, GDK_INPUT_WRITE);
 			}
 		}
+		snd_seq_free_event(ep);
 
 	}
 }
diff -rNu melys-0.0.16/midi/record.m melys-0.0.17/midi/record.m
--- melys-0.0.16/midi/record.m	Tue Oct 12 14:50:51 1999
+++ melys-0.0.17/midi/record.m	Wed Oct 13 00:32:49 1999
@@ -263,6 +263,7 @@
 				add_io_cb(record, GDK_INPUT_WRITE);
 			}
 		}
+		snd_seq_free_event(ep);
 
 	}
 
diff -rNu melys-0.0.16/version melys-0.0.17/version
--- melys-0.0.16/version	Tue Oct 12 14:57:41 1999
+++ melys-0.0.17/version	Wed Oct 13 19:03:05 1999
@@ -1 +1 @@
-#define MELYS_VERSION_STRING "0.0.16"
+#define MELYS_VERSION_STRING "0.0.17"
diff -rNu melys-0.0.16/widgets/melystrackdisplay.c melys-0.0.17/widgets/melystrackdisplay.c
--- melys-0.0.16/widgets/melystrackdisplay.c	Tue Oct 12 14:58:24 1999
+++ melys-0.0.17/widgets/melystrackdisplay.c	Wed Oct 13 20:24:16 1999
@@ -78,15 +78,15 @@
 	struct containerElement *con;
 };
 
+struct outline_data {
+	GnomeCanvasGroup *group;
+	int  xoffset;
+	int  yoffset;
+};
+
 /* Drag and drop types */
 const GtkTargetEntry targets[] = {
 	{MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID},
-
-	/* Junk... */
-	{"application/x-melys-track", GTK_TARGET_SAME_APP, 0},
-	{"STRING", 0, 0},
-	{"text/plain", 0, 0},
-	{"text/uri-list", 0, 0},
 };
 
 /* All the buttons that we deal with */
@@ -109,14 +109,14 @@
         GdkEventButton *event);
 static void button_motion(MelysTrackDisplay *mdisp, struct partElement *part, 
         GdkEventMotion *event);
-static void drag_begin(MelysTrackDisplay *mdisp, GdkEventMotion *event);
+static void drag_setup(MelysTrackDisplay *mdisp, GdkEventMotion *event);
 static void build_sel_list(MelysTrackDisplay *mdisp);
 static void build_sel1(MelysTrackDisplay *mdisp, struct containerElement *c, 
         struct element *base);
 static void sel_add_list(MelysTrackDisplay *mdisp, struct containerElement *c, 
         struct partElement *part);
 static void clear_all_part_sel(MelysTrackDisplay *mdisp, gboolean clear);
-static void clear_part_sel(MelysTrackDisplay *mdisp, struct partElement *part);
+static void sel_clear_part(MelysTrackDisplay *mdisp, struct partElement *part);
 static void disp_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
 static void set_scroll_region(MelysTrackDisplay *mdisp);
 static void set_hscroll(MelysTrackDisplay *mdisp);
@@ -133,11 +133,18 @@
 static void drag_data_send(GtkWidget *widget, GdkDragContext *context, 
         GtkSelectionData *selection_data, guint info, guint time, 
         gpointer data);
+static struct outline_data *drag_enter(MelysTrackDisplay *mdisp, 
+        GdkDragContext *context);
+static gboolean drag_motion(GtkWidget *widget, GdkDragContext *context, 
+        gint x, gint y, guint time, gpointer user_data);
+static void drag_leave(GtkWidget *widget, GdkDragContext *context, guint time, 
+        gpointer user_data);
 static void drag_data_received(GtkWidget *widget, GdkDragContext *context, 
         gint wx, gint wy, GtkSelectionData *data, guint info, guint time, 
         gpointer user_data);
 static void drag_end(GtkWidget *widget, GdkDragContext *drag_context, 
         gpointer user_data);
+static void outline_data_free(gpointer data);
 
 
 static gint melys_track_display_signals[LAST_SIGNAL];
@@ -152,16 +159,19 @@
 		(GnomeUIPixmapType)0, NULL, /* Pixmap and info */
 		0, (GdkModifierType)0,  /* Accel */
 		(GtkWidget*)0 },
+
 	{GNOME_APP_UI_ITEM, N_("_Join"), N_("Join this part and the next"),
 		join_cb, (gpointer)0, (gpointer)0, /* Callback and data */
 		(GnomeUIPixmapType)0, NULL, /* Pixmap and info */
 		0, (GdkModifierType)0,  /* Accel */
 		(GtkWidget*)0 },
+
 	{GNOME_APP_UI_ITEM, N_("Delete"), N_("Delete this part"),
 		delete_cb, (gpointer)0, (gpointer)0, /* Callback and data */
 		(GnomeUIPixmapType)0, NULL, /* Pixmap and info */
 		0, (GdkModifierType)0,  /* Accel */
 		(GtkWidget*)0 },
+
 	{GNOME_APP_UI_ITEM, N_("Properties..."), N_("Part property box"),
 		part_prop_cb, (gpointer)0, (gpointer)0, /* Callback and data */
 		(GnomeUIPixmapType)0, NULL, /* Pixmap and info */
@@ -268,6 +278,7 @@
 
 #undef AA
 #ifdef AA
+	/* The aa canvas is buggy at present Oct 1999 */
 	gtk_widget_push_visual(gdk_rgb_get_visual());
 	gtk_widget_push_colormap(gdk_rgb_get_cmap());
 	canvas = (GnomeCanvas *)gnome_canvas_new_aa();
@@ -305,6 +316,10 @@
 		GTK_SIGNAL_FUNC(drag_data_send), mdisp);
 	gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-received",
 		GTK_SIGNAL_FUNC(drag_data_received), mdisp);
+	gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-motion",
+		GTK_SIGNAL_FUNC(drag_motion), mdisp);
+	gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-leave",
+		GTK_SIGNAL_FUNC(drag_leave), mdisp);
 	gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-end",
 		GTK_SIGNAL_FUNC(drag_end), mdisp);
 }
@@ -328,7 +343,8 @@
 
 	parent_class = gtk_type_class(gtk_vbox_get_type());
 
-	gtk_object_class_add_signals(object_class, melys_track_display_signals, LAST_SIGNAL);
+	gtk_object_class_add_signals(object_class,
+		melys_track_display_signals, LAST_SIGNAL);
 
 	/* Set up all the overrides */
 	object_class->destroy = disp_destroy;
@@ -397,7 +413,8 @@
 		canvas = GNOME_CANVAS(mdisp->canvas);
 
 		gnome_canvas_scroll_to(canvas,
-			tick_to_x(mdisp, mdisp->hoffset), mdisp->voffset * mdisp->vspace);
+			tick_to_x(mdisp, mdisp->hoffset),
+			mdisp->voffset * mdisp->vspace);
 	}
 }
 
@@ -533,12 +550,8 @@
 	if (GTK_OBJECT_DESTROYED(mdisp))
 		return;
 
-#if 1
-	if (MD_MODIFIED(part) == FALSE) {
-		dprintf(0, "part not modified");
+	if (MD_MODIFIED(part) == FALSE)
 		return;
-	}
-#endif
 
 	/* Is this a reference to a part (drawn with dotted outline) */
 	if (MD_TYPE(part) == MD_TYPE_PARTREF)
@@ -550,6 +563,7 @@
 	else
 		state = GTK_STATE_NORMAL;
 
+	/* Get the name, or default to the track name */
 	pname = part->name;
 	if (pname && strcmp(pname, "") != 0)
 		;
@@ -558,7 +572,7 @@
 	else
 		pname = "";
 
-	dinfo = (struct display_info *) g_dataset_get_data(part, "display-info");
+	dinfo = (struct display_info *)g_dataset_get_data(part, "display-info");
 	if (dinfo == NULL) {
 		GnomeCanvasGroup *rgroup;
 		GnomeCanvasGroup *group;
@@ -578,6 +592,13 @@
 
 		pitem = MELYS_PART_ITEM(item);
 
+		/*
+		 * Set all the info we need to display a part into the
+		 * display_info structure.  Increase the reference counts
+		 * of everything that we hold.  Because there is a back
+		 * reference to the part, we use WREF calls to avoid
+		 * circular references.
+		 */
 		dinfo = g_new(struct display_info, 1);
 		gtk_object_ref((GtkObject*)group);
 		dinfo->group = group;
@@ -590,7 +611,8 @@
 		MD_WREF(track);
 		dinfo->track = track;
 
-		g_dataset_set_data_full(part, "display-info", dinfo, display_info_free);
+		g_dataset_set_data_full(part, "display-info",
+			dinfo, display_info_free);
 
 		MD_WREF(part);
 		gtk_object_set_data_full(GTK_OBJECT(group), "part", part,
@@ -759,9 +781,9 @@
 
 	case 3:
 		/*
-		 * We checked that we were in the correct state, but do not change
-		 * state as the popup menu takes control and we never
-		 * see a button release.
+		 * We checked that we were in the correct state, but
+		 * do not change state as the popup menu takes
+		 * control and we never see a button release.
 		 */
 		gnome_popup_menu_do_popup(mdisp->menu, NULL, NULL, event, mdisp);
 		break;
@@ -792,8 +814,8 @@
 		}
 
 		/*
-		 * We had an error, now if this is the last button to be released
-		 * then we can clear back to inactive state.
+		 * We had an error, now if this is the last button
+		 * to be released then we can clear back to inactive state.
 		 */
 		if (mask == 0)
 			mdisp->click_state = CLICK_INACTIVE;
@@ -809,7 +831,7 @@
 
 		if (MD_SELECTED(part)) {
 			MD_SET_SELECTED(part, FALSE);
-			clear_part_sel(mdisp, part);
+			sel_clear_part(mdisp, part);
 		} else {
 			MD_SET_SELECTED(part, TRUE);
 			sel_add_list(mdisp, MD_CONTAINER(dinfo->track), part);
@@ -820,10 +842,12 @@
 		if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON1_MASK)
 			mdisp->click_state = CLICK_INACTIVE;
 		break;
+
 	case 2:
 		if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK)
 			mdisp->click_state = CLICK_INACTIVE;
 		break;
+
 	case 3:
 		if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK)
 			mdisp->click_state = CLICK_INACTIVE;
@@ -842,7 +866,7 @@
 
 	switch (mdisp->click_state) {
 	case CLICK_BUTTON1_DOWN:
-		drag_begin(mdisp, event);
+		drag_setup(mdisp, event);
 		mdisp->click_state = CLICK_INACTIVE;
 		break;
 	default:
@@ -853,7 +877,7 @@
 /*
  */
 static void 
-drag_begin(MelysTrackDisplay *mdisp, GdkEventMotion *event)
+drag_setup(MelysTrackDisplay *mdisp, GdkEventMotion *event)
 {
 	GtkTargetList *tlist;
 	struct partElement *clickpart;
@@ -877,9 +901,15 @@
 		list = mdisp->sel_list;
 	} else {
 
+		/*
+		 * Not moving the selected parts.  Just create a
+		 * temporary list of the single part.
+		 */
 		len = 1;
 		selinfo.part = clickpart;
-		selinfo.con = (CONP) md_track_nth(mdisp->mdroot, mdisp->click_ntrack); 
+		selinfo.con = (CONP) md_track_nth(mdisp->mdroot,
+			mdisp->click_ntrack); 
+
 		list = g_list_append(NULL, &selinfo);
 	}
 
@@ -896,23 +926,24 @@
 		dragdata[i].con = sinfo->con;
 		dragdata[i].tick_offset = MD_TIME(sinfo->part) - mdisp->click_tick;
 		dragdata[i].track_offset = ntrack - mdisp->click_ntrack;
+		dragdata[i].tick_len = MD_DURATION(sinfo->part);
 	}
+	dragdata[0].len = len;
+	dragdata[0].data_size = sizeof(*dragdata);
 
 	if (list != mdisp->sel_list)
 		g_list_free(list);
 
-	gtk_object_set_data_full(GTK_OBJECT(mdisp), "melys-element-data",
+	gtk_object_set_data_full(GTK_OBJECT(mdisp->canvas), "drag-element-data",
 		dragdata, g_free);
-	gtk_object_set_data(GTK_OBJECT(mdisp), "melys-element-data-len",
+	gtk_object_set_data(GTK_OBJECT(mdisp->canvas), "drag-element-data-len",
 		GINT_TO_POINTER(len));
 
 	gtk_drag_begin(GTK_WIDGET(mdisp->canvas),
-		tlist,
-		GDK_ACTION_MOVE|GDK_ACTION_ASK,
-		1, /* The button number */
-		(GdkEvent*)event);
+		tlist, GDK_ACTION_MOVE|GDK_ACTION_ASK,
+		1 /* The button number */, (GdkEvent*)event);
 
-	//gtk_target_list_free(tlist);
+	gtk_target_list_unref(tlist);
 }
 
 /*
@@ -993,7 +1024,7 @@
 		info = list->data;
 		if (clear)
 			MD_SET_SELECTED(info->part, FALSE);
-		clear_part_sel(mdisp, info->part);
+		sel_clear_part(mdisp, info->part);
 	}
 }
 
@@ -1001,7 +1032,7 @@
  * Clear the selection status of the specified part .
  */
 static void 
-clear_part_sel(MelysTrackDisplay *mdisp, struct partElement *part)
+sel_clear_part(MelysTrackDisplay *mdisp, struct partElement *part)
 {
 	GList *list;
 	struct display_info *dinfo;
@@ -1022,7 +1053,9 @@
 
 	/* Now update the display */
 	if (!MD_IS_DESTROYED(part)) {
-		dinfo = (struct display_info *)g_dataset_get_data(part, "display-info");
+		dinfo = (struct display_info *)g_dataset_get_data(part,
+			"display-info");
+
 		update_part_item(mdisp, dinfo->track, dinfo->part);
 	}
 
@@ -1287,6 +1320,10 @@
 	part = mdisp->click_part;
 	track = mdisp->click_track;
 
+	/* have to unselect as this hold a reference to the on-screen part */
+	if (MD_SELECTED(part))
+		sel_clear_part(mdisp, part);
+
 	md_remove(MD_CONTAINER(track), MD_ELEMENT(part));
 }
 
@@ -1335,7 +1372,7 @@
  *    selection_data - The data is set into here
  *    info      - Identification of transfer type
  *    time      - The associated time
- *    data      - Not used
+ *    data      - The mdisp widget
  */
 static void 
 drag_data_send(GtkWidget *widget, GdkDragContext *context, 
@@ -1354,17 +1391,152 @@
 
 	part = mdisp->click_part;
 
-	dragdata = gtk_object_get_data(GTK_OBJECT(mdisp), "melys-element-data");
-	len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mdisp),
-		"melys-element-data-len"));
+	dragdata = gtk_object_get_data(GTK_OBJECT(mdisp->canvas),
+		"drag-element-data");
+	len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mdisp->canvas),
+		"drag-element-data-len"));
 
-	dprintf(2, "data_send from %p len %d\n", widget, len);
 	gtk_selection_data_set(selection_data,
 		selection_data->target, 8,
 		(guchar *)dragdata, len * sizeof(*dragdata));
 }
 
 /*
+ * When a drag enters this widget, we construct a set of
+ * outlines that represent the position of the drag. The
+ * following drag motion events will be used to move these
+ * outlines around.
+ * Keep in mind that the source of the drag could be a different
+ * type of widget. It could also be from a different
+ * application and even from a different machine, although
+ * this isn't supported yet.
+ */
+static struct outline_data *
+drag_enter(MelysTrackDisplay *mdisp, GdkDragContext *context)
+{
+	GtkWidget *srcw;
+	GnomeCanvasGroup *group;
+	struct outline_data *oldata;
+	struct drag_element_data *dragdata;
+	struct drag_element_data *dp;
+	long tick_offset;
+	int  track_offset;
+	int  i;
+	int  len;
+
+	srcw = gtk_drag_get_source_widget(context);
+	if (srcw == NULL) {
+		/* Another app probably which we don't yet deal with */
+		return NULL;
+	}
+
+	oldata = g_new(struct outline_data, 1);
+	dragdata = gtk_object_get_data(GTK_OBJECT(srcw), "drag-element-data");
+	len = dragdata[0].len;
+
+	track_offset = tick_offset = 0;
+
+	/*
+	 * Calculate the offset from the click point to the top left
+	 * hand corner of the rectangle that would enclose all the parts.
+	 */
+	for (i = 0; i < len; i++) {
+		dp = dragdata + i;
+
+		track_offset = MIN(track_offset, dp->track_offset);
+		tick_offset = MIN(tick_offset, dp->tick_offset);
+	}
+
+	/*
+	 * All the outlines are placed into this group so that they
+	 * can be moved as a unit to follow the cursor.
+	 */
+	group = (GnomeCanvasGroup *) gnome_canvas_item_new(
+		gnome_canvas_root((GnomeCanvas*)mdisp->canvas),
+		GNOME_TYPE_CANVAS_GROUP,
+		"x", 0.0,
+		"y", 0.0,
+		NULL);
+
+	/* We now have enough information to fill the outline data */
+	oldata->group = group;
+	oldata->xoffset = tick_to_x(mdisp, tick_offset);
+	oldata->yoffset = track_to_y(mdisp, track_offset);
+
+	/*
+	 * Create the individual outlines for each part that is being
+	 * moved.
+	 */
+	for (i = 0; i < len; i++) {
+		int x1, y1;
+
+		dp = dragdata + i;
+		x1 = tick_to_x(mdisp, dp->tick_offset - tick_offset);
+		y1 = track_to_y(mdisp, dp->track_offset - track_offset);
+
+		gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT,
+			"x1", (double) x1,
+			"y1", (double) y1,
+			"x2", (double) x1 + tick_to_x(mdisp, dp->tick_len),
+			"y2", (double) y1 + mdisp->height,
+			"width_pixels", 2,
+			"outline_color", "yellow",
+			NULL);
+	}
+
+	/* Save for later use */
+	gtk_object_set_data_full(GTK_OBJECT(mdisp), "outline-data", oldata,
+		(GtkDestroyNotify)outline_data_free);
+
+	return oldata;
+}
+
+/*
+ * Move around the drag outline group so that the user can tell
+ * where the drag will land.
+ */
+static gboolean 
+drag_motion(GtkWidget *widget, GdkDragContext *context, gint x, gint y, 
+        guint time, gpointer user_data)
+{
+	MelysTrackDisplay *mdisp = user_data;
+	struct outline_data *oldata;
+	double wx, wy;
+
+	gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas),
+		(double)x, (double)y, &wx, &wy);
+	
+	oldata = gtk_object_get_data(GTK_OBJECT(mdisp), "outline-data");
+	if (oldata == NULL)
+		oldata = drag_enter(mdisp, context);
+	if (oldata == NULL)
+		return FALSE;
+
+	wx += oldata->xoffset;
+	wy += oldata->yoffset - mdisp->height/2;
+
+	if (wx < 0) wx = 0;
+	if (wy < 0) wy = 0;
+
+	canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy);
+
+	return TRUE;
+}
+
+/*
+ * This gets called when the drag leaves our window and also at
+ * the end of the drag. So its a good place to tidy up in.
+ */
+static void 
+drag_leave(GtkWidget *widget, GdkDragContext *context, guint time, 
+        gpointer user_data)
+{
+	MelysTrackDisplay *mdisp = user_data;
+
+	gtk_object_remove_data(GTK_OBJECT(mdisp), "outline-data");
+}
+
+/*
  * This routine is called when a signal arrives on the
  * destination widget to say that data has actually been
  * received.
@@ -1402,7 +1574,9 @@
 
 	mdisp = MELYS_TRACK_DISPLAY(user_data);
 
-	gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas), wx, wy, &dx, &dy);
+	/* We are given window coordinate, so convert to world coords */
+	gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas),
+		wx, wy, &dx, &dy);
 	x = (int)dx;
 	y = (int)dy;
 
@@ -1417,7 +1591,10 @@
 
 	/*
 	 * Do a first pass through the elements.  We must either do
-	 * them all or do none of them.
+	 * them all or do none of them.  If the user has droped a set
+	 * of parts such that one of them would be before the start
+	 * of the canvas then we must offset them all by the exact amount
+	 * to keep all parts on the canvas.
 	 */
 	for (i = 0; i < len; i++) {
 		dp = dragdata+i;
@@ -1464,8 +1641,12 @@
 		t = drop_tick + dp->tick_offset - tick_start;
 		g_assert(t >= 0);
 
+		/*
+		 * The new part should have its time and devchan set to
+		 * the new values.  It is then added to the track.
+		 */
 		md_change_time(MD_ELEMENT(newpart), t);
-		md_set_devchan(MD_ELEMENT(newpart), MD_DEV(track), MD_CHAN(track));
+		md_set_devchan(MD_ELEMENT(newpart), MD_DEVCHAN(track));
 		md_add_sort(MD_CONTAINER(track), MD_ELEMENT(newpart));
 
 		MD_UNREF(newpart);
@@ -1477,6 +1658,8 @@
 	gtk_drag_finish(context, TRUE, needrm, time);
 	md_undo_end_set(MD_UNDO(mdisp->mdroot));
 	md_shrink(mdisp->mdroot);
+
+	build_sel_list(mdisp);
 	song_view_update(mdisp->song);
 	return;
 
@@ -1489,6 +1672,15 @@
 {
 	MelysTrackDisplay *mdisp = user_data;
 
-	gtk_object_remove_data(GTK_OBJECT(mdisp), "melys-element-data");
+	gtk_object_remove_data(GTK_OBJECT(mdisp), "drag-element-data");
 	build_sel_list(mdisp);
+}
+
+static void 
+outline_data_free(gpointer data)
+{
+	struct outline_data *od = data;
+
+	gtk_object_destroy(GTK_OBJECT(od->group));
+	g_free(od);
 }
diff -rNu melys-0.0.16/widgets/melystrackdisplay.m melys-0.0.17/widgets/melystrackdisplay.m
--- melys-0.0.16/widgets/melystrackdisplay.m	Tue Oct 12 14:53:52 1999
+++ melys-0.0.17/widgets/melystrackdisplay.m	Wed Oct 13 19:14:06 1999
@@ -108,11 +108,11 @@
 	GList *sel_list;
 
 	/* Saved click position and state information */
-	struct partElement *click_part;	/* Part that was click on */
-	unsigned long  click_tick;	/* Clicked tick position */
+	struct partElement *click_part;		/* Part that was click on */
+	unsigned long  click_tick;		/* Clicked tick position */
 	struct trackElement *click_track;	/* Clicked track */
-	int  click_ntrack;	/* Clicked track position */
-	enum click_state  click_state;	/* State for mouse clicks and movement */
+	int  click_ntrack;			/* Clicked track position */
+	enum click_state  click_state;		/* mouse state */
 };
 
 struct _MelysTrackDisplayClass {
@@ -139,11 +139,14 @@
  * part within a part.
  */
 struct drag_element_data {
+	gint32	len;	/* Number of elements if this is the first */
+	gint32  data_size;	/* size of this structure */
+	gint32  tick_offset;		/* time offset of click into part */
+	gint32  track_offset;		/* track offset of click into part */
+	gint32  tick_len;		/* The length in ticks */
+
 	struct element *element;	/* The element being moved */
 	struct containerElement *con;	/* Containing element */
-
-	int  tick_offset;		/* time offset of click into part */
-	int  track_offset;		/* track offset of click into part */
 };
 
 >>extern
@@ -174,15 +177,15 @@
 	struct containerElement *con;
 };
 
+struct outline_data {
+	GnomeCanvasGroup *group;
+	int  xoffset;
+	int  yoffset;
+};
+
 /* Drag and drop types */
 const GtkTargetEntry targets[] = {
 	{MELYS_ELEM_ATOM_NAME, GTK_TARGET_SAME_APP, MELYS_ELEM_ATOM_ID},
-
-	/* Junk... */
-	{"application/x-melys-track", GTK_TARGET_SAME_APP, 0},
-	{"STRING", 0, 0},
-	{"text/plain", 0, 0},
-	{"text/uri-list", 0, 0},
 };
 
 /* All the buttons that we deal with */
@@ -198,16 +201,19 @@
 		(GnomeUIPixmapType)0, NULL, /* Pixmap and info */
 		0, (GdkModifierType)0,  /* Accel */
 		(GtkWidget*)0 },
+
 	{GNOME_APP_UI_ITEM, N_("_Join"), N_("Join this part and the next"),
 		join_cb, (gpointer)0, (gpointer)0, /* Callback and data */
 		(GnomeUIPixmapType)0, NULL, /* Pixmap and info */
 		0, (GdkModifierType)0,  /* Accel */
 		(GtkWidget*)0 },
+
 	{GNOME_APP_UI_ITEM, N_("Delete"), N_("Delete this part"),
 		delete_cb, (gpointer)0, (gpointer)0, /* Callback and data */
 		(GnomeUIPixmapType)0, NULL, /* Pixmap and info */
 		0, (GdkModifierType)0,  /* Accel */
 		(GtkWidget*)0 },
+
 	{GNOME_APP_UI_ITEM, N_("Properties..."), N_("Part property box"),
 		part_prop_cb, (gpointer)0, (gpointer)0, /* Callback and data */
 		(GnomeUIPixmapType)0, NULL, /* Pixmap and info */
@@ -283,6 +289,7 @@
 
 #undef AA
 #ifdef AA
+	/* The aa canvas is buggy at present Oct 1999 */
 	gtk_widget_push_visual(gdk_rgb_get_visual());
 	gtk_widget_push_colormap(gdk_rgb_get_cmap());
 	canvas = (GnomeCanvas *)gnome_canvas_new_aa();
@@ -320,6 +327,10 @@
 		GTK_SIGNAL_FUNC(drag_data_send), mdisp);
 	gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-data-received",
 		GTK_SIGNAL_FUNC(drag_data_received), mdisp);
+	gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-motion",
+		GTK_SIGNAL_FUNC(drag_motion), mdisp);
+	gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-leave",
+		GTK_SIGNAL_FUNC(drag_leave), mdisp);
 	gtk_signal_connect(GTK_OBJECT(mdisp->canvas), "drag-end",
 		GTK_SIGNAL_FUNC(drag_end), mdisp);
 
@@ -341,7 +352,8 @@
 
 	parent_class = gtk_type_class(gtk_vbox_get_type());
 
-	gtk_object_class_add_signals(object_class, melys_track_display_signals, LAST_SIGNAL);
+	gtk_object_class_add_signals(object_class,
+		melys_track_display_signals, LAST_SIGNAL);
 
 	/* Set up all the overrides */
 	object_class->destroy = disp_destroy;
@@ -414,7 +426,8 @@
 		canvas = GNOME_CANVAS(mdisp->canvas);
 
 		gnome_canvas_scroll_to(canvas,
-			tick_to_x(mdisp, mdisp->hoffset), mdisp->voffset * mdisp->vspace);
+			tick_to_x(mdisp, mdisp->hoffset),
+			mdisp->voffset * mdisp->vspace);
 	}
 
 
@@ -554,12 +567,8 @@
 	if (GTK_OBJECT_DESTROYED(mdisp))
 		return;
 
-#if 1
-	if (MD_MODIFIED(part) == FALSE) {
-		dprintf(0, "part not modified");
+	if (MD_MODIFIED(part) == FALSE)
 		return;
-	}
-#endif
 
 	/* Is this a reference to a part (drawn with dotted outline) */
 	if (MD_TYPE(part) == MD_TYPE_PARTREF)
@@ -571,6 +580,7 @@
 	else
 		state = GTK_STATE_NORMAL;
 
+	/* Get the name, or default to the track name */
 	pname = part->name;
 	if (pname && strcmp(pname, "") != 0)
 		;
@@ -579,7 +589,7 @@
 	else
 		pname = "";
 
-	dinfo = (struct display_info *) g_dataset_get_data(part, "display-info");
+	dinfo = (struct display_info *)g_dataset_get_data(part, "display-info");
 	if (dinfo == NULL) {
 		GnomeCanvasGroup *rgroup;
 		GnomeCanvasGroup *group;
@@ -599,6 +609,13 @@
 
 		pitem = MELYS_PART_ITEM(item);
 
+		/*
+		 * Set all the info we need to display a part into the
+		 * display_info structure.  Increase the reference counts
+		 * of everything that we hold.  Because there is a back
+		 * reference to the part, we use WREF calls to avoid
+		 * circular references.
+		 */
 		dinfo = g_new(struct display_info, 1);
 		gtk_object_ref((GtkObject*)group);
 		dinfo->group = group;
@@ -611,7 +628,8 @@
 		MD_WREF(track);
 		dinfo->track = track;
 
-		g_dataset_set_data_full(part, "display-info", dinfo, display_info_free);
+		g_dataset_set_data_full(part, "display-info",
+			dinfo, display_info_free);
 
 		MD_WREF(part);
 		gtk_object_set_data_full(GTK_OBJECT(group), "part", part,
@@ -785,9 +803,9 @@
 
 	case 3:
 		/*
-		 * We checked that we were in the correct state, but do not change
-		 * state as the popup menu takes control and we never
-		 * see a button release.
+		 * We checked that we were in the correct state, but
+		 * do not change state as the popup menu takes
+		 * control and we never see a button release.
 		 */
 		gnome_popup_menu_do_popup(mdisp->menu, NULL, NULL, event, mdisp);
 		break;
@@ -821,8 +839,8 @@
 		}
 
 		/*
-		 * We had an error, now if this is the last button to be released
-		 * then we can clear back to inactive state.
+		 * We had an error, now if this is the last button
+		 * to be released then we can clear back to inactive state.
 		 */
 		if (mask == 0)
 			mdisp->click_state = CLICK_INACTIVE;
@@ -838,7 +856,7 @@
 
 		if (MD_SELECTED(part)) {
 			MD_SET_SELECTED(part, FALSE);
-			clear_part_sel(mdisp, part);
+			sel_clear_part(mdisp, part);
 		} else {
 			MD_SET_SELECTED(part, TRUE);
 			sel_add_list(mdisp, MD_CONTAINER(dinfo->track), part);
@@ -849,10 +867,12 @@
 		if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON1_MASK)
 			mdisp->click_state = CLICK_INACTIVE;
 		break;
+
 	case 2:
 		if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK)
 			mdisp->click_state = CLICK_INACTIVE;
 		break;
+
 	case 3:
 		if ((event->state & ALL_BUTTON_MASK) == GDK_BUTTON3_MASK)
 			mdisp->click_state = CLICK_INACTIVE;
@@ -869,11 +889,12 @@
 >>description
 Motion when a button is pressed down.
 Drag and drop on button 1, gesture based editing on button 2.
+
 >>code
 
 	switch (mdisp->click_state) {
 	case CLICK_BUTTON1_DOWN:
-		drag_begin(mdisp, event);
+		drag_setup(mdisp, event);
 		mdisp->click_state = CLICK_INACTIVE;
 		break;
 	default:
@@ -881,7 +902,7 @@
 	}
 
 
->>function drag_begin
+>>function drag_setup
 static void
 MelysTrackDisplay *mdisp;
 GdkEventMotion *event;
@@ -910,9 +931,15 @@
 		list = mdisp->sel_list;
 	} else {
 
+		/*
+		 * Not moving the selected parts.  Just create a
+		 * temporary list of the single part.
+		 */
 		len = 1;
 		selinfo.part = clickpart;
-		selinfo.con = (CONP) md_track_nth(mdisp->mdroot, mdisp->click_ntrack); 
+		selinfo.con = (CONP) md_track_nth(mdisp->mdroot,
+			mdisp->click_ntrack); 
+
 		list = g_list_append(NULL, &selinfo);
 	}
 
@@ -929,23 +956,24 @@
 		dragdata[i].con = sinfo->con;
 		dragdata[i].tick_offset = MD_TIME(sinfo->part) - mdisp->click_tick;
 		dragdata[i].track_offset = ntrack - mdisp->click_ntrack;
+		dragdata[i].tick_len = MD_DURATION(sinfo->part);
 	}
+	dragdata[0].len = len;
+	dragdata[0].data_size = sizeof(*dragdata);
 
 	if (list != mdisp->sel_list)
 		g_list_free(list);
 
-	gtk_object_set_data_full(GTK_OBJECT(mdisp), "melys-element-data",
+	gtk_object_set_data_full(GTK_OBJECT(mdisp->canvas), "drag-element-data",
 		dragdata, g_free);
-	gtk_object_set_data(GTK_OBJECT(mdisp), "melys-element-data-len",
+	gtk_object_set_data(GTK_OBJECT(mdisp->canvas), "drag-element-data-len",
 		GINT_TO_POINTER(len));
 
 	gtk_drag_begin(GTK_WIDGET(mdisp->canvas),
-		tlist,
-		GDK_ACTION_MOVE|GDK_ACTION_ASK,
-		1, /* The button number */
-		(GdkEvent*)event);
+		tlist, GDK_ACTION_MOVE|GDK_ACTION_ASK,
+		1 /* The button number */, (GdkEvent*)event);
 
-	//gtk_target_list_free(tlist);
+	gtk_target_list_unref(tlist);
 
 
 >>function build_sel_list
@@ -1035,11 +1063,11 @@
 		info = list->data;
 		if (clear)
 			MD_SET_SELECTED(info->part, FALSE);
-		clear_part_sel(mdisp, info->part);
+		sel_clear_part(mdisp, info->part);
 	}
 
 
->>function clear_part_sel
+>>function sel_clear_part
 static void
 MelysTrackDisplay *mdisp;
 struct partElement *part;
@@ -1068,7 +1096,9 @@
 
 	/* Now update the display */
 	if (!MD_IS_DESTROYED(part)) {
-		dinfo = (struct display_info *)g_dataset_get_data(part, "display-info");
+		dinfo = (struct display_info *)g_dataset_get_data(part,
+			"display-info");
+
 		update_part_item(mdisp, dinfo->track, dinfo->part);
 	}
 
@@ -1360,6 +1390,10 @@
 	part = mdisp->click_part;
 	track = mdisp->click_track;
 
+	/* have to unselect as this hold a reference to the on-screen part */
+	if (MD_SELECTED(part))
+		sel_clear_part(mdisp, part);
+
 	md_remove(MD_CONTAINER(track), MD_ELEMENT(part));
 
 
@@ -1411,7 +1445,7 @@
 GtkSelectionData *selection_data;   The data is set into here
 guint info;	Identification of transfer type
 guint time;	The associated time
-gpointer data;	Not used
+gpointer data;	The mdisp widget
 
 >>description
 This is a callback that is executed when the drag_data_get signal is
@@ -1434,16 +1468,166 @@
 
 	part = mdisp->click_part;
 
-	dragdata = gtk_object_get_data(GTK_OBJECT(mdisp), "melys-element-data");
-	len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mdisp),
-		"melys-element-data-len"));
+	dragdata = gtk_object_get_data(GTK_OBJECT(mdisp->canvas),
+		"drag-element-data");
+	len = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mdisp->canvas),
+		"drag-element-data-len"));
 
-	dprintf(2, "data_send from %p len %d\n", widget, len);
 	gtk_selection_data_set(selection_data,
 		selection_data->target, 8,
 		(guchar *)dragdata, len * sizeof(*dragdata));
 
 
+>>function drag_enter
+static struct outline_data *
+MelysTrackDisplay *mdisp;
+GdkDragContext *context;
+
+>>description
+When a drag enters this widget, we construct a set of outlines
+that represent the position of the drag.
+The following drag motion events will be used to move these
+outlines around.
+
+Keep in mind that the source of the drag could be a different type of
+widget.
+It could also be from a different application and even from a
+different machine, although this isn't supported yet.
+
+>>code
+	GtkWidget *srcw;
+	GnomeCanvasGroup *group;
+	struct outline_data *oldata;
+	struct drag_element_data *dragdata;
+	struct drag_element_data *dp;
+	long tick_offset;
+	int  track_offset;
+	int  i;
+	int  len;
+
+	srcw = gtk_drag_get_source_widget(context);
+	if (srcw == NULL) {
+		/* Another app probably which we don't yet deal with */
+		return NULL;
+	}
+
+	oldata = g_new(struct outline_data, 1);
+	dragdata = gtk_object_get_data(GTK_OBJECT(srcw), "drag-element-data");
+	len = dragdata[0].len;
+
+	track_offset = tick_offset = 0;
+
+	/*
+	 * Calculate the offset from the click point to the top left
+	 * hand corner of the rectangle that would enclose all the parts.
+	 */
+	for (i = 0; i < len; i++) {
+		dp = dragdata + i;
+
+		track_offset = MIN(track_offset, dp->track_offset);
+		tick_offset = MIN(tick_offset, dp->tick_offset);
+	}
+
+	/*
+	 * All the outlines are placed into this group so that they
+	 * can be moved as a unit to follow the cursor.
+	 */
+	group = (GnomeCanvasGroup *) gnome_canvas_item_new(
+		gnome_canvas_root((GnomeCanvas*)mdisp->canvas),
+		GNOME_TYPE_CANVAS_GROUP,
+		"x", 0.0,
+		"y", 0.0,
+		NULL);
+
+	/* We now have enough information to fill the outline data */
+	oldata->group = group;
+	oldata->xoffset = tick_to_x(mdisp, tick_offset);
+	oldata->yoffset = track_to_y(mdisp, track_offset);
+
+	/*
+	 * Create the individual outlines for each part that is being
+	 * moved.
+	 */
+	for (i = 0; i < len; i++) {
+		int x1, y1;
+
+		dp = dragdata + i;
+		x1 = tick_to_x(mdisp, dp->tick_offset - tick_offset);
+		y1 = track_to_y(mdisp, dp->track_offset - track_offset);
+
+		gnome_canvas_item_new(group, GNOME_TYPE_CANVAS_RECT,
+			"x1", (double) x1,
+			"y1", (double) y1,
+			"x2", (double) x1 + tick_to_x(mdisp, dp->tick_len),
+			"y2", (double) y1 + mdisp->height,
+			"width_pixels", 2,
+			"outline_color", "yellow",
+			NULL);
+	}
+
+	/* Save for later use */
+	gtk_object_set_data_full(GTK_OBJECT(mdisp), "outline-data", oldata,
+		(GtkDestroyNotify)outline_data_free);
+
+	return oldata;
+
+
+>>function drag_motion
+static gboolean
+GtkWidget *widget;
+GdkDragContext *context;
+gint x;
+gint y;
+guint time;
+gpointer user_data;
+
+>>description
+Move around the drag outline group so that the user
+can tell where the drag will land.
+
+>>code
+	MelysTrackDisplay *mdisp = user_data;
+	struct outline_data *oldata;
+	double wx, wy;
+
+	gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas),
+		(double)x, (double)y, &wx, &wy);
+	
+	oldata = gtk_object_get_data(GTK_OBJECT(mdisp), "outline-data");
+	if (oldata == NULL)
+		oldata = drag_enter(mdisp, context);
+	if (oldata == NULL)
+		return FALSE;
+
+	wx += oldata->xoffset;
+	wy += oldata->yoffset - mdisp->height/2;
+
+	if (wx < 0) wx = 0;
+	if (wy < 0) wy = 0;
+
+	canvas_item_move_abs(GNOME_CANVAS_ITEM(oldata->group), wx, wy);
+
+	return TRUE;
+
+
+>>function drag_leave
+static void
+GtkWidget *widget;
+GdkDragContext *context;
+guint time;
+gpointer user_data;
+
+>>description
+This gets called when the drag leaves our window and also
+at the end of the drag.
+So its a good place to tidy up in.
+
+>>code
+	MelysTrackDisplay *mdisp = user_data;
+
+	gtk_object_remove_data(GTK_OBJECT(mdisp), "outline-data");
+
+
 >>function drag_data_received
 static void
 GtkWidget *widget;       The destination widget
@@ -1478,7 +1662,9 @@
 
 	mdisp = MELYS_TRACK_DISPLAY(user_data);
 
-	gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas), wx, wy, &dx, &dy);
+	/* We are given window coordinate, so convert to world coords */
+	gnome_canvas_window_to_world(GNOME_CANVAS(mdisp->canvas),
+		wx, wy, &dx, &dy);
 	x = (int)dx;
 	y = (int)dy;
 
@@ -1493,7 +1679,10 @@
 
 	/*
 	 * Do a first pass through the elements.  We must either do
-	 * them all or do none of them.
+	 * them all or do none of them.  If the user has droped a set
+	 * of parts such that one of them would be before the start
+	 * of the canvas then we must offset them all by the exact amount
+	 * to keep all parts on the canvas.
 	 */
 	for (i = 0; i < len; i++) {
 		dp = dragdata+i;
@@ -1540,8 +1729,12 @@
 		t = drop_tick + dp->tick_offset - tick_start;
 		g_assert(t >= 0);
 
+		/*
+		 * The new part should have its time and devchan set to
+		 * the new values.  It is then added to the track.
+		 */
 		md_change_time(MD_ELEMENT(newpart), t);
-		md_set_devchan(MD_ELEMENT(newpart), MD_DEV(track), MD_CHAN(track));
+		md_set_devchan(MD_ELEMENT(newpart), MD_DEVCHAN(track));
 		md_add_sort(MD_CONTAINER(track), MD_ELEMENT(newpart));
 
 		MD_UNREF(newpart);
@@ -1553,6 +1746,8 @@
 	gtk_drag_finish(context, TRUE, needrm, time);
 	md_undo_end_set(MD_UNDO(mdisp->mdroot));
 	md_shrink(mdisp->mdroot);
+
+	build_sel_list(mdisp);
 	song_view_update(mdisp->song);
 	return;
 
@@ -1569,6 +1764,15 @@
 >>code
 	MelysTrackDisplay *mdisp = user_data;
 
-	gtk_object_remove_data(GTK_OBJECT(mdisp), "melys-element-data");
+	gtk_object_remove_data(GTK_OBJECT(mdisp), "drag-element-data");
 	build_sel_list(mdisp);
 
+>>function outline_data_free
+static void
+gpointer data;
+
+>>code
+	struct outline_data *od = data;
+
+	gtk_object_destroy(GTK_OBJECT(od->group));
+	g_free(od);