X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.h;h=3cfb38d02029d38e6e4569a9298be8b822f90a35;hb=bcd65def7da197a6f88eb1c4adb375f2b639f783;hp=941833d0c06a582bb02bb7ded5a0916186d8867a;hpb=e2981526ea4636411fb11c146900d6f6e0b9ba79;p=ardour.git

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index 941833d0c0..3cfb38d020 100644
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -27,40 +27,50 @@
 
 #include "ardour/types.h"
 
-#include "canvas.h"
 #include "editor_items.h"
 
 namespace ARDOUR {
 	class Location;
 }
 
+namespace PBD {
+	class StatefulDiffCommand;
+}
+
+class PatchChange;
 class Editor;
 class EditorCursor;
 class TimeAxisView;
+class MidiTimeAxisView;
+class Drag;
+class NoteBase;
 
-/** Abstract base class for dragging of things within the editor */
-class Drag
+/** Class to manage current drags */
+class DragManager
 {
-
 public:
-	Drag (Editor *, ArdourCanvas::Item *);
-	virtual ~Drag () {}
 
-	/** @return the canvas item being dragged */
-	ArdourCanvas::Item* item () const {
-		return _item;
-	}
+	DragManager (Editor* e);
+	~DragManager ();
 
-	void swap_grab (ArdourCanvas::Item *, Gdk::Cursor *, uint32_t);
-	void break_drag ();
+	bool motion_handler (GdkEvent *, bool);
 
-	bool motion_handler (GdkEvent*, bool);
+	void abort ();
+	void add (Drag *);
+	void set (Drag *, GdkEvent *, Gdk::Cursor* c = 0);
+	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
+	bool end_grab (GdkEvent *);
+	bool have_item (ArdourCanvas::Item *) const;
 
-	/** @return true if an end drag is in progress */
+	/** @return true if an end drag or abort is in progress */
 	bool ending () const {
 		return _ending;
 	}
 
+	bool active () const {
+		return !_drags.empty ();
+	}
+
 	/** @return current pointer x position in trackview coordinates */
 	double current_pointer_x () const {
 		return _current_pointer_x;
@@ -71,9 +81,44 @@ public:
 		return _current_pointer_y;
 	}
 
-	nframes64_t adjusted_frame (nframes64_t, GdkEvent const *, bool snap = true) const;
-	nframes64_t adjusted_current_frame (GdkEvent const *, bool snap = true) const;
-	
+	/** @return current pointer frame */
+	ARDOUR::framepos_t current_pointer_frame () const {
+		return _current_pointer_frame;
+	}
+
+private:
+	Editor* _editor;
+	std::list<Drag*> _drags;
+	bool _ending; ///< true if end_grab or abort is in progress, otherwise false
+	double _current_pointer_x; ///< trackview x of the current pointer
+	double _current_pointer_y; ///< trackview y of the current pointer
+	ARDOUR::framepos_t _current_pointer_frame; ///< frame that the pointer is now at
+	bool _old_follow_playhead; ///< state of Editor::follow_playhead() before the drags started
+};
+
+/** Abstract base class for dragging of things within the editor */
+class Drag
+{
+public:
+	Drag (Editor *, ArdourCanvas::Item *);
+	virtual ~Drag () {}
+
+	void set_manager (DragManager* m) {
+		_drags = m;
+	}
+
+	/** @return the canvas item being dragged */
+	ArdourCanvas::Item* item () const {
+		return _item;
+	}
+
+	void swap_grab (ArdourCanvas::Item *, Gdk::Cursor *, uint32_t);
+	bool motion_handler (GdkEvent*, bool);
+	void abort ();
+
+	ARDOUR::framepos_t adjusted_frame (ARDOUR::framepos_t, GdkEvent const *, bool snap = true) const;
+	ARDOUR::framepos_t adjusted_current_frame (GdkEvent const *, bool snap = true) const;
+
 	/** Called to start a grab of an item.
 	 *  @param e Event that caused the grab to start.
 	 *  @param c Cursor to use, or 0.
@@ -94,6 +139,12 @@ public:
 	 */
 	virtual void finished (GdkEvent* e, bool m) = 0;
 
+	/** Called to abort a drag and return things to how
+	 *  they were before it started.
+	 *  @param m true if some movement occurred, otherwise false.
+	 */
+	virtual void aborted (bool m) = 0;
+
 	/** @param m Mouse mode.
 	 *  @return true if this drag should happen in this mouse mode.
 	 */
@@ -102,7 +153,7 @@ public:
 	}
 
 	/** @return minimum number of frames (in x) and pixels (in y) that should be considered a movement */
-	virtual std::pair<nframes64_t, int> move_threshold () const {
+	virtual std::pair<ARDOUR::framecnt_t, int> move_threshold () const {
 		return std::make_pair (1, 1);
 	}
 
@@ -120,10 +171,10 @@ public:
 		return true;
 	}
 
-	/** @return current x extent of the thing being dragged; ie
-	 *  a pair of (leftmost_position, rightmost_position)
-	 */
-	virtual std::pair<nframes64_t, nframes64_t> extent () const;
+	/** Set up the _pointer_frame_offset */
+	virtual void setup_pointer_frame_offset () {
+		_pointer_frame_offset = 0;
+	}
 
 protected:
 
@@ -135,7 +186,11 @@ protected:
 		return _grab_y;
 	}
 
-	double grab_frame () const {
+	ARDOUR::framepos_t raw_grab_frame () const {
+		return _raw_grab_frame;
+	}
+
+	ARDOUR::framepos_t grab_frame () const {
 		return _grab_frame;
 	}
 
@@ -151,32 +206,56 @@ protected:
 		return _last_pointer_frame;
 	}
 
+	boost::shared_ptr<ARDOUR::Region> add_midi_region (MidiTimeAxisView*);
+
+	void show_verbose_cursor_time (framepos_t);
+	void show_verbose_cursor_duration (framepos_t, framepos_t, double xoffset = 0);
+	void show_verbose_cursor_text (std::string const &);
+
 	Editor* _editor; ///< our editor
+	DragManager* _drags;
 	ArdourCanvas::Item* _item; ///< our item
 	/** Offset from the mouse's position for the drag to the start of the thing that is being dragged */
-	nframes64_t _pointer_frame_offset;
+	ARDOUR::framecnt_t _pointer_frame_offset;
 	bool _x_constrained; ///< true if x motion is constrained, otherwise false
 	bool _y_constrained; ///< true if y motion is constrained, otherwise false
 	bool _was_rolling; ///< true if the session was rolling before the drag started, otherwise false
-	bool _have_transaction; ///< true if a transaction has been started, false otherwise. Must be set true by derived class.
 
 private:
 
-	bool _ending; ///< true if end_grab is in progress, otherwise false
 	bool _move_threshold_passed; ///< true if the move threshold has been passed, otherwise false
-	double _original_x; ///< original world x of the thing being dragged
-	double _original_y; ///< original world y of the thing being dragged
 	double _grab_x; ///< trackview x of the grab start position
 	double _grab_y; ///< trackview y of the grab start position
-	double _current_pointer_x; ///< trackview x of the current pointer
-	double _current_pointer_y; ///< trackview y of the current pointer
 	double _last_pointer_x; ///< trackview x of the pointer last time a motion occurred
 	double _last_pointer_y; ///< trackview y of the pointer last time a motion occurred
-	nframes64_t _grab_frame; ///< adjusted_frame that the mouse was at when start_grab was called, or 0
-	nframes64_t _last_pointer_frame; ///< adjusted_frame the last time a motion occurred
-	nframes64_t _current_pointer_frame; ///< frame that the pointer is now at
+	ARDOUR::framepos_t _raw_grab_frame; ///< unsnapped frame that the mouse was at when start_grab was called, or 0
+	ARDOUR::framepos_t _grab_frame; ///< adjusted_frame that the mouse was at when start_grab was called, or 0
+	ARDOUR::framepos_t _last_pointer_frame; ///< adjusted_frame the last time a motion occurred
 };
 
+class RegionDrag;
+
+/** Container for details about a region being dragged */
+class DraggingView
+{
+public:
+	DraggingView (RegionView *, RegionDrag *);
+
+	RegionView* view; ///< the view
+	/** index into RegionDrag::_time_axis_views of the view that this region is currently being displayed on,
+	 *  or -1 if it is not visible.
+	 */
+	int time_axis_view;
+	/** layer that this region is currently being displayed on.  This is a double
+	    rather than a layer_t as we use fractional layers during drags to allow the user
+	    to indicate a new layer to put a region on.
+	*/
+	double layer;
+	double initial_y; ///< the initial y position of the view before any reparenting
+	framepos_t initial_position; ///< initial position of the region
+	framepos_t initial_end; ///< initial end position of the region
+	boost::shared_ptr<ARDOUR::Playlist> initial_playlist;
+};
 
 /** Abstract base class for drags that involve region(s) */
 class RegionDrag : public Drag, public sigc::trackable
@@ -185,14 +264,22 @@ public:
 	RegionDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list<RegionView*> const &);
 	virtual ~RegionDrag () {}
 
-	std::pair<nframes64_t, nframes64_t> extent () const;
-
 protected:
 
 	RegionView* _primary; ///< the view that was clicked on (or whatever) to start the drag
-	std::list<RegionView*> _views; ///< all views that are being dragged
+	std::list<DraggingView> _views; ///< information about all views that are being dragged
+
+	/** a list of the non-hidden TimeAxisViews sorted by editor order key */
+	std::vector<TimeAxisView*> _time_axis_views;
+	int find_time_axis_view (TimeAxisView *) const;
+
+	int _visible_y_low;
+	int _visible_y_high;
+
+	friend class DraggingView;
 
 private:
+
 	void region_going_away (RegionView *);
 	PBD::ScopedConnection death_connection;
 };
@@ -208,35 +295,24 @@ public:
 
 	virtual void start_grab (GdkEvent *, Gdk::Cursor *);
 	virtual void motion (GdkEvent *, bool);
-	virtual void finished (GdkEvent *, bool) = 0;
-
-protected:
-	struct TimeAxisViewSummary {
-		TimeAxisViewSummary () : height_list(512) {}
+	virtual void finished (GdkEvent *, bool);
+	virtual void aborted (bool);
 
-		std::bitset<512> tracks;
-		std::vector<int32_t> height_list;
-		int visible_y_low;
-		int visible_y_high;
-	};
+	/** @return true if the regions being `moved' came from somewhere on the canvas;
+	 *  false if they came from outside (e.g. from the region list).
+	 */
+	virtual bool regions_came_from_canvas () const = 0;
 
-	void copy_regions (GdkEvent *);
-	bool y_movement_disallowed (int, int, int, TimeAxisViewSummary const &) const;
-	std::map<RegionView*, std::pair<RouteTimeAxisView*, int> > find_time_axis_views_and_layers ();
-	double compute_x_delta (GdkEvent const *, nframes64_t *);
-	bool compute_y_delta (
-		TimeAxisView const *, TimeAxisView*, int32_t, int32_t, TimeAxisViewSummary const &,
-		int32_t *, int32_t *, int32_t *
-		);
+protected:
 
-	TimeAxisViewSummary get_time_axis_view_summary ();
-	bool x_move_allowed () const;
+	double compute_x_delta (GdkEvent const *, ARDOUR::framepos_t *);
+	bool y_movement_allowed (int, double) const;
 
-	TimeAxisView* _dest_trackview;
-	ARDOUR::layer_t _dest_layer;
-	bool check_possible (RouteTimeAxisView **, ARDOUR::layer_t *);
 	bool _brushing;
-	nframes64_t _last_frame_position; ///< last position of the thing being dragged
+	ARDOUR::framepos_t _last_frame_position; ///< last position of the thing being dragged
+	double _total_x_delta;
+	int _last_pointer_time_axis_view;
+	double _last_pointer_layer;
 };
 
 
@@ -249,25 +325,69 @@ public:
 	RegionMoveDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list<RegionView*> const &, bool, bool);
 	virtual ~RegionMoveDrag () {}
 
-	virtual void start_grab (GdkEvent *, Gdk::Cursor *);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
-	std::pair<nframes64_t, int> move_threshold () const {
+	bool regions_came_from_canvas () const {
+		return true;
+	}
+
+	std::pair<ARDOUR::framecnt_t, int> move_threshold () const {
 		return std::make_pair (4, 4);
 	}
 
+	void setup_pointer_frame_offset ();
+
 private:
+	typedef std::set<boost::shared_ptr<ARDOUR::Playlist> > PlaylistSet;
+
+	void finished_no_copy (
+		bool const,
+		bool const,
+		ARDOUR::framecnt_t const
+		);
+
+	void finished_copy (
+		bool const,
+		bool const,
+		ARDOUR::framecnt_t const
+		);
+
+	RegionView* insert_region_into_playlist (
+		boost::shared_ptr<ARDOUR::Region>,
+		RouteTimeAxisView*,
+		ARDOUR::layer_t,
+		ARDOUR::framecnt_t,
+		PlaylistSet&
+		);
+
+	void remove_region_from_playlist (
+		boost::shared_ptr<ARDOUR::Region>,
+		boost::shared_ptr<ARDOUR::Playlist>,
+		PlaylistSet& modified_playlists
+		);
+
+	void add_stateful_diff_commands_for_playlists (PlaylistSet const &);
+
+	void collect_new_region_view (RegionView *);
+
 	bool _copy;
+	RegionView* _new_region_view;
 };
 
 /** Drag to insert a region from somewhere */
 class RegionInsertDrag : public RegionMotionDrag
 {
 public:
-	RegionInsertDrag (Editor *, boost::shared_ptr<ARDOUR::Region>, RouteTimeAxisView*, nframes64_t);
+	RegionInsertDrag (Editor *, boost::shared_ptr<ARDOUR::Region>, RouteTimeAxisView*, ARDOUR::framepos_t);
 
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
+
+	bool regions_came_from_canvas () const {
+		return false;
+	}
 };
 
 /** Region drag in splice mode */
@@ -278,6 +398,7 @@ public:
 
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 };
 
 /** Drags to create regions */
@@ -286,13 +407,13 @@ class RegionCreateDrag : public Drag
 public:
 	RegionCreateDrag (Editor *, ArdourCanvas::Item *, TimeAxisView *);
 
-	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 private:
-	TimeAxisView* _view;
-	TimeAxisView* _dest_trackview;
+	MidiTimeAxisView* _view;
+	boost::shared_ptr<ARDOUR::Region> _region;
 };
 
 /** Drags to resize MIDI notes */
@@ -304,6 +425,7 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 private:
 	MidiRegionView*     region;
@@ -311,6 +433,7 @@ private:
 	bool                at_front;
 };
 
+/** Drags to move MIDI notes */
 class NoteDrag : public Drag
 {
   public:
@@ -319,28 +442,103 @@ class NoteDrag : public Drag
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
   private:
-	MidiRegionView* region;
-	double last_x;
-	double last_y;
-	double drag_delta_x;
-	double drag_delta_note;
-	bool   was_selected;
+
+	ARDOUR::frameoffset_t total_dx () const;
+	int8_t total_dy () const;
+
+	MidiRegionView* _region;
+	NoteBase* _primary;
+	double _cumulative_dx;
+	double _cumulative_dy;
+	bool _was_selected;
+	double _note_height;
+};
+
+class NoteCreateDrag : public Drag
+{
+public:
+	NoteCreateDrag (Editor *, ArdourCanvas::Item *, MidiRegionView *);
+	~NoteCreateDrag ();
+
+	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
+	void motion (GdkEvent *, bool);
+	void finished (GdkEvent *, bool);
+	void aborted (bool);
+
+private:
+	double y_to_region (double) const;
+	framecnt_t grid_frames (framepos_t) const;
+	
+	MidiRegionView* _region_view;
+	ArdourCanvas::Rectangle* _drag_rect;
+	framepos_t _note[2];
+};
+
+/** Drag to move MIDI patch changes */
+class PatchChangeDrag : public Drag
+{
+public:
+	PatchChangeDrag (Editor *, PatchChange *, MidiRegionView *);
+
+	void motion (GdkEvent *, bool);
+	void finished (GdkEvent *, bool);
+	void aborted (bool);
+
+	bool y_movement_matters () const {
+		return false;
+	}
+
+	void setup_pointer_frame_offset ();
+
+private:
+	MidiRegionView* _region_view;
+	PatchChange* _patch_change;
+	double _cumulative_dx;
+};
+
+#ifdef WITH_VIDEOTIMELINE
+/** Container for details about audio regions being dragged along with video */
+class AVDraggingView
+{
+public:
+	AVDraggingView (RegionView *);
+
+	RegionView* view; ///< the view
+	framepos_t initial_position; ///< initial position of the region
 };
 
-/** Drag of region gain */
-class RegionGainDrag : public Drag
+/** Drag of video offset */
+class VideoTimeLineDrag : public Drag
+	//TODO , public sigc::trackable
 {
 public:
-	RegionGainDrag (Editor *e, ArdourCanvas::Item *i) : Drag (e, i) {}
+	VideoTimeLineDrag (Editor *e, ArdourCanvas::Item *i);
 
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
-	bool active (Editing::MouseMode m) {
-		return (m == Editing::MouseGain);
+	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
+
+	bool y_movement_matters () const {
+		return false;
+	}
+
+	bool allow_vertical_autoscroll () const {
+		return false;
 	}
+
+	void aborted (bool);
+
+protected:
+	std::list<AVDraggingView> _views; ///< information about all audio that are being dragged along
+
+private:
+	ARDOUR::frameoffset_t _startdrag_video_offset;
+	ARDOUR::frameoffset_t _max_backwards_drag;
 };
+#endif
 
 /** Drag to trim region(s) */
 class TrimDrag : public RegionDrag
@@ -352,19 +550,24 @@ public:
 		ContentsTrim,
 	};
 
-	TrimDrag (Editor *, ArdourCanvas::Item *, RegionView*, std::list<RegionView*> const &);
+	TrimDrag (Editor *, ArdourCanvas::Item *, RegionView*, std::list<RegionView*> const &, bool preserve_fade_anchor = false);
 
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool y_movement_matters () const {
 		return false;
 	}
 
+	void setup_pointer_frame_offset ();
+
 private:
 
 	Operation _operation;
+	
+	bool _preserve_fade_anchor;
 };
 
 /** Meter marker drag */
@@ -376,6 +579,7 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool allow_vertical_autoscroll () const {
 		return false;
@@ -384,10 +588,13 @@ public:
 	bool y_movement_matters () const {
 		return false;
 	}
-	
+
+	void setup_pointer_frame_offset ();
+
 private:
 	MeterMarker* _marker;
 	bool _copy;
+	XMLNode* before_state;
 };
 
 /** Tempo marker drag */
@@ -399,6 +606,7 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool allow_vertical_autoscroll () const {
 		return false;
@@ -408,13 +616,16 @@ public:
 		return false;
 	}
 
+	void setup_pointer_frame_offset ();
+
 private:
 	TempoMarker* _marker;
 	bool _copy;
+	XMLNode* before_state;
 };
 
 
-/** Drag of a cursor */
+/** Drag of the playhead cursor */
 class CursorDrag : public Drag
 {
 public:
@@ -423,6 +634,7 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool active (Editing::MouseMode) {
 		return true;
@@ -433,13 +645,14 @@ public:
 	}
 
 	bool y_movement_matters () const {
-		return false;
+		return true;
 	}
 
 private:
-	EditorCursor* _cursor; ///< cursor being dragged
-	bool _stop; ///< true to stop the transport on starting the drag, otherwise false
+	void fake_locate (framepos_t);
 
+	bool _stop; ///< true to stop the transport on starting the drag, otherwise false
+	double _grab_zoom; ///< editor frames per unit when our grab started
 };
 
 /** Region fade-in drag */
@@ -451,10 +664,13 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool y_movement_matters () const {
 		return false;
 	}
+
+	void setup_pointer_frame_offset ();
 };
 
 /** Region fade-out drag */
@@ -466,10 +682,13 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool y_movement_matters () const {
 		return false;
 	}
+
+	void setup_pointer_frame_offset ();
 };
 
 /** Marker drag */
@@ -482,6 +701,7 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool allow_vertical_autoscroll () const {
 		return false;
@@ -490,13 +710,23 @@ public:
 	bool y_movement_matters () const {
 		return false;
 	}
-	
+
+	void setup_pointer_frame_offset ();
+
 private:
 	void update_item (ARDOUR::Location *);
 
 	Marker* _marker; ///< marker being dragged
-	std::list<ARDOUR::Location*> _copied_locations;
-	ArdourCanvas::Line* _line;
+
+        struct CopiedLocationMarkerInfo {
+	    ARDOUR::Location* location;
+	    std::vector<Marker*> markers;
+	    bool    move_both;
+	    CopiedLocationMarkerInfo (ARDOUR::Location* l, Marker* m);
+	};
+
+        typedef std::list<CopiedLocationMarkerInfo> CopiedLocationInfo;
+        CopiedLocationInfo _copied_locations;
  	ArdourCanvas::Points _points;
 };
 
@@ -509,17 +739,20 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool active (Editing::MouseMode m);
 
 private:
 
 	ControlPoint* _point;
-	double _time_axis_view_grab_x;
-	double _time_axis_view_grab_y;
+	double _fixed_grab_x;
+	double _fixed_grab_y;
 	double _cumulative_x_drag;
 	double _cumulative_y_drag;
-	static double const _zero_gain_fraction;
+        bool     _pushing;
+        uint32_t _final_index;
+	static double _zero_gain_fraction;
 };
 
 /** Gain or automation line drag */
@@ -531,6 +764,7 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool active (Editing::MouseMode) {
 		return true;
@@ -539,44 +773,131 @@ public:
 private:
 
 	AutomationLine* _line;
-	double _time_axis_view_grab_x;
-	double _time_axis_view_grab_y;
+	double _fixed_grab_x;
+	double _fixed_grab_y;
 	uint32_t _before;
 	uint32_t _after;
 	double _cumulative_y_drag;
 };
 
+/** Transient feature line drags*/
+class FeatureLineDrag : public Drag
+{
+public:
+	FeatureLineDrag (Editor *e, ArdourCanvas::Item *i);
+
+	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
+	void motion (GdkEvent *, bool);
+	void finished (GdkEvent *, bool);
+	void aborted (bool);
+
+	bool active (Editing::MouseMode) {
+		return true;
+	}
+
+private:
+
+	ArdourCanvas::Line* _line;
+	AudioRegionView* _arv;
+
+	double _region_view_grab_x;
+	double _cumulative_x_drag;
+
+	float _before;
+	uint32_t _max_x;
+};
+
 /** Dragging of a rubberband rectangle for selecting things */
 class RubberbandSelectDrag : public Drag
 {
 public:
-	RubberbandSelectDrag (Editor *e, ArdourCanvas::Item *i) : Drag (e, i) {}
+	RubberbandSelectDrag (Editor *, ArdourCanvas::Item *);
 
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
+
+	std::pair<ARDOUR::framecnt_t, int> move_threshold () const {
+		return std::make_pair (8, 1);
+	}
+
+	void do_select_things (GdkEvent *, bool);
+
+	/** Select some things within a rectangle.
+	 *  @param button_state The button state from the GdkEvent.
+	 *  @param x1 The left-hand side of the rectangle in session frames.
+	 *  @param x2 The right-hand side of the rectangle in session frames.
+	 *  @param y1 The top of the rectangle in trackview coordinates.
+	 *  @param y2 The bottom of the rectangle in trackview coordinates.
+	 *  @param drag_in_progress true if the drag is currently happening.
+	 */
+	virtual void select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress) = 0;
+	
+	virtual void deselect_things () = 0;
+
+  protected:
+	bool _vertical_only;
+};
+
+/** A general editor RubberbandSelectDrag (for regions, automation points etc.) */
+class EditorRubberbandSelectDrag : public RubberbandSelectDrag
+{
+public:
+	EditorRubberbandSelectDrag (Editor *, ArdourCanvas::Item *);
+
+	void select_things (int, framepos_t, framepos_t, double, double, bool);
+	void deselect_things ();
+};
+
+/** A RubberbandSelectDrag for selecting MIDI notes */
+class MidiRubberbandSelectDrag : public RubberbandSelectDrag
+{
+public:
+	MidiRubberbandSelectDrag (Editor *, MidiRegionView *);
+
+	void select_things (int, framepos_t, framepos_t, double, double, bool);
+	void deselect_things ();
+
+private:
+	MidiRegionView* _region_view;
+};
+
+/** A RubberbandSelectDrag for selecting MIDI notes but with no horizonal component */
+class MidiVerticalSelectDrag : public RubberbandSelectDrag
+{
+public:
+	MidiVerticalSelectDrag (Editor *, MidiRegionView *);
+
+	void select_things (int, framepos_t, framepos_t, double, double, bool);
+	void deselect_things ();
+
+private:
+	MidiRegionView* _region_view;
 };
 
 /** Region drag in time-FX mode */
 class TimeFXDrag : public RegionDrag
 {
 public:
-	TimeFXDrag (Editor *e, ArdourCanvas::Item *i, RegionView* p, std::list<RegionView*> const & v) : RegionDrag (e, i, p, v) {}
+	TimeFXDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list<RegionView*> const &);
 
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 };
 
 /** Scrub drag in audition mode */
 class ScrubDrag : public Drag
 {
 public:
-	ScrubDrag (Editor *e, ArdourCanvas::Item *i) : Drag (e, i) {}
+	ScrubDrag (Editor *, ArdourCanvas::Item *);
 
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 };
 
 /** Drag in range select mode */
@@ -587,7 +908,8 @@ public:
 		CreateSelection,
 		SelectionStartTrim,
 		SelectionEndTrim,
-		SelectionMove
+		SelectionMove,
+		SelectionExtend
 	};
 
 	SelectionDrag (Editor *, ArdourCanvas::Item *, Operation);
@@ -595,13 +917,20 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
+
+	void setup_pointer_frame_offset ();
 
 private:
 	Operation _operation;
-	bool _copy;
+	bool _add;
+	bool _extend;
 	int _original_pointer_time_axis;
 	int _last_pointer_time_axis;
 	std::list<TimeAxisView*> _added_time_axes;
+	bool _time_selection_at_start;
+        framepos_t start_at_start;
+        framepos_t end_at_start;
 };
 
 /** Range marker drag */
@@ -619,6 +948,7 @@ public:
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool allow_vertical_autoscroll () const {
 		return false;
@@ -632,7 +962,7 @@ private:
 	void update_item (ARDOUR::Location *);
 
 	Operation _operation;
-	ArdourCanvas::SimpleRect* _drag_rect;
+	ArdourCanvas::Rectangle* _drag_rect;
 	bool _copy;
 };
 
@@ -640,33 +970,87 @@ private:
 class MouseZoomDrag : public Drag
 {
 public:
-	MouseZoomDrag (Editor* e, ArdourCanvas::Item *i) : Drag (e, i) {}
+	MouseZoomDrag (Editor *, ArdourCanvas::Item *);
 
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
+
+	std::pair<ARDOUR::framecnt_t, int> move_threshold () const {
+		return std::make_pair (4, 4);
+	}
+
+private:
+	bool _zoom_out;
 };
 
-/** Drag of a range of automation data, changing value but not position */
+/** Drag of a range of automation data (either on an automation track or region gain),
+ *  changing value but not position.
+ */
 class AutomationRangeDrag : public Drag
 {
 public:
-	AutomationRangeDrag (Editor *, ArdourCanvas::Item *, std::list<ARDOUR::AudioRange> const &);
+	AutomationRangeDrag (Editor *, AutomationTimeAxisView *, std::list<ARDOUR::AudioRange> const &);
+	AutomationRangeDrag (Editor *, AudioRegionView *, std::list<ARDOUR::AudioRange> const &);
 
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
 	void motion (GdkEvent *, bool);
 	void finished (GdkEvent *, bool);
+	void aborted (bool);
 
 	bool x_movement_matters () const {
 		return false;
 	}
 
+	bool active (Editing::MouseMode) {
+		return true;
+	}
+
 private:
+	void setup (std::list<boost::shared_ptr<AutomationLine> > const &);
+        double y_fraction (boost::shared_ptr<AutomationLine>, double global_y_position) const;
+
 	std::list<ARDOUR::AudioRange> _ranges;
-	AutomationTimeAxisView* _atav;
-	boost::shared_ptr<AutomationLine> _line;
+
+	/** A line that is part of the drag */
+	struct Line {
+		boost::shared_ptr<AutomationLine> line; ///< the line
+		std::list<ControlPoint*> points; ///< points to drag on the line
+		std::pair<ARDOUR::framepos_t, ARDOUR::framepos_t> range; ///< the range of all points on the line, in session frames
+		XMLNode* state; ///< the XML state node before the drag
+      	        double original_fraction; ///< initial y-fraction before the drag
+	};
+
+	std::list<Line> _lines;
+        double y_origin;
 	bool _nothing_to_drag;
 };
 
+/** Drag of one edge of an xfade
+ */
+class CrossfadeEdgeDrag : public Drag
+{
+  public:
+	CrossfadeEdgeDrag (Editor*, AudioRegionView*, ArdourCanvas::Item*, bool start);
+
+	void start_grab (GdkEvent*, Gdk::Cursor* c = 0);
+	void motion (GdkEvent*, bool);
+	void finished (GdkEvent*, bool);
+	void aborted (bool);
+	
+	bool y_movement_matters () const {
+		return false;
+	}
+
+	virtual std::pair<ARDOUR::framecnt_t, int> move_threshold () const {
+		return std::make_pair (4, 4);
+	}
+
+  private:
+	AudioRegionView* arv;
+	bool start;
+};
+
 #endif /* __gtk2_ardour_editor_drag_h_ */