X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_selection.cc;h=065cfdbcba42fb323049b0b5cf4dd8f0e8a692d6;hb=d1f45e9b3d6a7e272e5563cc50175dfb6d904361;hp=5b29d8439f99ecacc24e0499434069daae1fb659;hpb=db8b575c30845bafc34b87bacd52129c95d1c478;p=ardour.git

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 5b29d8439f..065cfdbcba 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -22,11 +22,13 @@
 
 #include "pbd/stacktrace.h"
 
-#include "ardour/session.h"
-#include "ardour/diskstream.h"
+#include "ardour/midi_region.h"
 #include "ardour/playlist.h"
-#include "ardour/route_group.h"
 #include "ardour/profile.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+
+#include "control_protocol/control_protocol.h"
 
 #include "editor.h"
 #include "actions.h"
@@ -36,6 +38,8 @@
 #include "automation_line.h"
 #include "control_point.h"
 #include "editor_regions.h"
+#include "editor_cursors.h"
+#include "midi_region_view.h"
 
 #include "i18n.h"
 
@@ -49,9 +53,9 @@ using namespace Editing;
 
 struct TrackViewByPositionSorter
 {
-    bool operator() (const TimeAxisView* a, const TimeAxisView *b) {
-	    return a->y_position() < b->y_position();
-    }
+	bool operator() (const TimeAxisView* a, const TimeAxisView *b) {
+		return a->y_position() < b->y_position();
+	}
 };
 
 bool
@@ -171,23 +175,95 @@ Editor::select_all_tracks ()
 	selection->set (visible_views);
 }
 
-/** Select clicked_routeview, unless there are no currently selected
+/** Select clicked_axisview, unless there are no currently selected
  *  tracks, in which case nothing will happen unless `force' is true.
  */
 void
-Editor::set_selected_track_as_side_effect (bool force)
+Editor::set_selected_track_as_side_effect (Selection::Operation op)
 {
+	if (!clicked_axisview) {
+		return;
+	}
+
 	if (!clicked_routeview) {
 		return;
 	}
 
-	if (!selection->tracks.empty()) {
-		if (!selection->selected (clicked_routeview)) {
-			selection->add (clicked_routeview);
+	bool had_tracks = !selection->tracks.empty();
+	RouteGroup* group = clicked_routeview->route()->route_group();
+	RouteGroup& arg (_session->all_route_group());
+
+	switch (op) {
+	case Selection::Toggle:
+		if (selection->selected (clicked_axisview)) {
+			if (arg.is_select() && arg.is_active()) {
+				for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+					selection->remove(*i);
+				}
+			} else if (group && group->is_active()) {
+				for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+					if ((*i)->route_group() == group)
+						selection->remove(*i);
+				}
+			} else {
+				selection->remove (clicked_axisview);
+			}
+		} else {
+			if (arg.is_select() && arg.is_active()) {
+				for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+					selection->add(*i);
+				}
+			} else if (group && group->is_active()) {
+				for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+					if ( (*i)->route_group() == group)
+						selection->add(*i);
+				}
+			} else {
+				selection->add (clicked_axisview);
+			}
+		}
+		break;
+
+	case Selection::Add:
+		if (!had_tracks && arg.is_select() && arg.is_active()) {
+			/* nothing was selected already, and all group is active etc. so use
+			   all tracks.
+			*/
+			for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+				selection->add(*i);
+			}
+		} else if (group && group->is_active()) {
+			for (TrackViewList::iterator i  = track_views.begin(); i != track_views.end (); ++i) {
+				if ((*i)->route_group() == group)
+					selection->add(*i);
+			}
+		} else {
+			selection->add (clicked_axisview);
 		}
+		break;
 
-	} else if (force) {
-		selection->set (clicked_routeview);
+	case Selection::Set:
+		selection->clear();
+		if (!had_tracks && arg.is_select() && arg.is_active()) {
+			/* nothing was selected already, and all group is active etc. so use
+			   all tracks.
+			*/
+			for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
+				selection->add(*i);
+			}
+		} else if (group && group->is_active()) {
+			for (TrackViewList::iterator i  = track_views.begin(); i != track_views.end (); ++i) {
+				if ((*i)->route_group() == group)
+					selection->add(*i);
+			}
+		} else {
+			selection->set (clicked_axisview);
+		}
+		break;
+
+	case Selection::Extend:
+		selection->clear();
+		break;
 	}
 }
 
@@ -236,51 +312,62 @@ Editor::set_selected_track_from_click (bool press, Selection::Operation op, bool
 }
 
 bool
-Editor::set_selected_control_point_from_click (Selection::Operation op, bool /*no_remove*/)
+Editor::set_selected_control_point_from_click (bool press, Selection::Operation op)
 {
 	if (!clicked_control_point) {
 		return false;
 	}
 
-	if (clicked_control_point->selected()) {
-		/* the clicked control point is already selected; others may be as well, so
-		   don't change the selection.
+	switch (op) {
+	case Selection::Set:
+		if (press) {
+			selection->set (clicked_control_point);
+		}
+		break;
+	case Selection::Add:
+		if (press) {
+			selection->add (clicked_control_point);
+		}
+		break;
+	case Selection::Toggle:
+		/* This is a bit of a hack; if we Primary-Click-Drag a control
+		   point (for push drag) we want the point we clicked on to be
+		   selected, otherwise we end up confusingly dragging an
+		   unselected point.  So here we ensure that the point is selected
+		   after the press, and if we subsequently get a release (meaning no
+		   drag occurred) we set things up so that the toggle has happened.
 		*/
-		return true;
+		if (press && !selection->selected (clicked_control_point)) {
+			/* This is the button press, and the control point is not selected; make it so,
+			   in case this press leads to a drag.  Also note that having done this, we don't
+			   need to toggle again on release.
+			*/
+			selection->toggle (clicked_control_point);
+			_control_point_toggled_on_press = true;
+		} else if (!press && !_control_point_toggled_on_press) {
+			/* This is the release, and the point wasn't toggled on the press, so do it now */
+			selection->toggle (clicked_control_point);
+		} else {
+			/* Reset our flag */
+			_control_point_toggled_on_press = false;
+		}
+		break;
+	case Selection::Extend:
+		/* XXX */
+		break;
 	}
 
-	/* We know the ControlPoint that was clicked, but (as discussed in automation_selectable.h)
-	 * selected automation data are described by areas on the AutomationLine.  A ControlPoint
-	 * represents any model points in the space that it takes up, so the AutomationSelectable
-	 * needs to be the size of the ControlPoint.
-	 */
-
-	double const size = clicked_control_point->size ();
-	
-	nframes64_t const x1 = pixel_to_frame (clicked_control_point->get_x() - size / 2);
-	nframes64_t const x2 = pixel_to_frame (clicked_control_point->get_x() + size / 2);
- 	double y1 = clicked_control_point->get_y() - size / 2;
-	double y2 = clicked_control_point->get_y() + size / 2;
-
-	/* convert the y values to trackview space */
-	double dummy = 0;
-	clicked_control_point->line().parent_group().i2w (dummy, y1);
-	clicked_control_point->line().parent_group().i2w (dummy, y2);
-	_trackview_group->w2i (dummy, y1);
-	_trackview_group->w2i (dummy, y2);
-
-	/* and set up the selection */
-	return select_all_within (x1, x2, y1, y2, selection->tracks, Selection::Set);
+	return true;
 }
 
 void
 Editor::get_onscreen_tracks (TrackViewList& tvl)
 {
- 	for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- 		if ((*i)->y_position() < _canvas_height) {
- 			tvl.push_back (*i);
- 		}
- 	}
+	for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+		if ((*i)->y_position() < _visible_canvas_height) {
+			tvl.push_back (*i);
+		}
+	}
 }
 
 /** Call a slot for a given `basis' track and also for any track that is in the same
@@ -295,6 +382,7 @@ void
 Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis, PBD::PropertyID prop) const
 {
 	RouteTimeAxisView* route_basis = dynamic_cast<RouteTimeAxisView*> (basis);
+
 	if (route_basis == 0) {
 		return;
 	}
@@ -303,7 +391,8 @@ Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeA
 	tracks.insert (route_basis);
 
 	RouteGroup* group = route_basis->route()->route_group();
-	if (group && group->enabled_property (prop)) {
+
+	if (group && group->enabled_property(prop) && group->enabled_property (Properties::active.property_id) ) {
 
 		/* the basis is a member of an active route group, with the appropriate
 		   properties; find other members */
@@ -318,6 +407,64 @@ Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeA
 
 	/* call the slots */
 	uint32_t const sz = tracks.size ();
+
+	for (set<RouteTimeAxisView*>::iterator i = tracks.begin(); i != tracks.end(); ++i) {
+		sl (**i, sz);
+	}
+}
+
+/** Call a slot for a given `basis' track and also for any track that is in the same
+ *  active route group with a particular set of properties.
+ *
+ *  @param sl Slot to call.
+ *  @param basis Basis track.
+ *  @param prop Properties that active edit groups must share to be included in the map.
+ */
+
+void
+Editor::mapover_tracks_with_unique_playlists (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis, PBD::PropertyID prop) const
+{
+	RouteTimeAxisView* route_basis = dynamic_cast<RouteTimeAxisView*> (basis);
+	set<boost::shared_ptr<Playlist> > playlists;
+
+	if (route_basis == 0) {
+		return;
+	}
+
+	set<RouteTimeAxisView*> tracks;
+	tracks.insert (route_basis);
+
+	RouteGroup* group = route_basis->route()->route_group(); // could be null, not a problem
+
+	if (group && group->enabled_property(prop) && group->enabled_property (Properties::active.property_id) ) {
+
+		/* the basis is a member of an active route group, with the appropriate
+		   properties; find other members */
+
+		for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
+			RouteTimeAxisView* v = dynamic_cast<RouteTimeAxisView*> (*i);
+
+			if (v && v->route()->route_group() == group) {
+				
+				boost::shared_ptr<Track> t = v->track();
+				if (t) {
+					if (playlists.insert (t->playlist()).second) {
+						/* haven't seen this playlist yet */
+						tracks.insert (v);
+					}
+				} else {
+					/* not actually a "Track", but a timeaxis view that
+					   we should mapover anyway.
+					*/
+					tracks.insert (v);
+				}
+			}
+		}
+	}
+
+	/* call the slots */
+	uint32_t const sz = tracks.size ();
+
 	for (set<RouteTimeAxisView*>::iterator i = tracks.begin(); i != tracks.end(); ++i) {
 		sl (**i, sz);
 	}
@@ -329,9 +476,9 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t, RegionVi
 	boost::shared_ptr<Playlist> pl;
 	vector<boost::shared_ptr<Region> > results;
 	RegionView* marv;
-	boost::shared_ptr<Diskstream> ds;
+	boost::shared_ptr<Track> tr;
 
-	if ((ds = tv.get_diskstream()) == 0) {
+	if ((tr = tv.track()) == 0) {
 		/* bus */
 		return;
 	}
@@ -341,7 +488,7 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t, RegionVi
 		return;
 	}
 
-	if ((pl = ds->playlist()) != 0) {
+	if ((pl = tr->playlist()) != 0) {
 		pl->get_equivalent_regions (basis->region(), results);
 	}
 
@@ -355,7 +502,7 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t, RegionVi
 void
 Editor::get_equivalent_regions (RegionView* basis, vector<RegionView*>& equivalent_regions, PBD::PropertyID property) const
 {
-	mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_trackview(), property);
+	mapover_tracks_with_unique_playlists (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_time_axis_view(), property);
 
 	/* add clicked regionview since we skipped all other regions in the same track as the one it was in */
 
@@ -371,10 +518,9 @@ Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) c
 
 		vector<RegionView*> eq;
 
-		mapover_tracks (
+		mapover_tracks_with_unique_playlists (
 			sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), *i, &eq),
-			&(*i)->get_trackview(), prop
-			);
+			&(*i)->get_time_axis_view(), prop);
 
 		for (vector<RegionView*>::iterator j = eq.begin(); j != eq.end(); ++j) {
 			equivalent.add (*j);
@@ -386,7 +532,6 @@ Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) c
 	return equivalent;
 }
 
-
 int
 Editor::get_regionview_count_from_region_list (boost::shared_ptr<Region> region)
 {
@@ -401,14 +546,14 @@ Editor::get_regionview_count_from_region_list (boost::shared_ptr<Region> region)
 			boost::shared_ptr<Playlist> pl;
 			vector<boost::shared_ptr<Region> > results;
 			RegionView* marv;
-			boost::shared_ptr<Diskstream> ds;
+			boost::shared_ptr<Track> tr;
 
-			if ((ds = tatv->get_diskstream()) == 0) {
+			if ((tr = tatv->track()) == 0) {
 				/* bus */
 				continue;
 			}
 
-			if ((pl = (ds->playlist())) != 0) {
+			if ((pl = (tr->playlist())) != 0) {
 				pl->get_region_list_equivalent_regions (region, results);
 			}
 
@@ -426,7 +571,7 @@ Editor::get_regionview_count_from_region_list (boost::shared_ptr<Region> region)
 
 
 bool
-Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, bool /*no_track_remove*/)
+Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
 {
 	vector<RegionView*> all_equivalent_regions;
 	bool commit = false;
@@ -441,10 +586,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 
 	if (op == Selection::Toggle || op == Selection::Set) {
 
-
 		switch (op) {
 		case Selection::Toggle:
-
 			if (selection->selected (clicked_regionview)) {
 				if (press) {
 
@@ -455,7 +598,6 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 					button_release_can_deselect = true;
 
 				} else {
-
 					if (button_release_can_deselect) {
 
 						/* just remove this one region, but only on a permitted button release */
@@ -511,14 +653,14 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 	} else if (op == Selection::Extend) {
 
 		list<Selectable*> results;
-		nframes64_t last_frame;
-		nframes64_t first_frame;
+		framepos_t last_frame;
+		framepos_t first_frame;
 		bool same_track = false;
 
 		/* 1. find the last selected regionview in the track that was clicked in */
 
 		last_frame = 0;
-		first_frame = max_frames;
+		first_frame = max_framepos;
 
 		for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
 			if (&(*x)->get_time_axis_view() == &clicked_regionview->get_time_axis_view()) {
@@ -540,7 +682,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 			/* 2. figure out the boundaries for our search for new objects */
 
 			switch (clicked_regionview->region()->coverage (first_frame, last_frame)) {
-			case OverlapNone:
+			case Evoral::OverlapNone:
 				if (last_frame < clicked_regionview->region()->first_frame()) {
 					first_frame = last_frame;
 					last_frame = clicked_regionview->region()->last_frame();
@@ -550,7 +692,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 				}
 				break;
 
-			case OverlapExternal:
+			case Evoral::OverlapExternal:
 				if (last_frame < clicked_regionview->region()->first_frame()) {
 					first_frame = last_frame;
 					last_frame = clicked_regionview->region()->last_frame();
@@ -560,7 +702,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 				}
 				break;
 
-			case OverlapInternal:
+			case Evoral::OverlapInternal:
 				if (last_frame < clicked_regionview->region()->first_frame()) {
 					first_frame = last_frame;
 					last_frame = clicked_regionview->region()->last_frame();
@@ -570,8 +712,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 				}
 				break;
 
-			case OverlapStart:
-			case OverlapEnd:
+			case Evoral::OverlapStart:
+			case Evoral::OverlapEnd:
 				/* nothing to do except add clicked region to selection, since it
 				   overlaps with the existing selection in this track.
 				*/
@@ -586,8 +728,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 			*/
 
 
-			first_frame = entered_regionview->region()->position();
-			last_frame = entered_regionview->region()->last_frame();
+			first_frame = clicked_regionview->region()->position();
+			last_frame = clicked_regionview->region()->last_frame();
 
 			for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
 				if ((*i)->region()->position() < first_frame) {
@@ -609,7 +751,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 				relevant_tracks.insert (r);
 			}
 		}
-		
+
 		set<RouteTimeAxisView*> already_in_selection;
 
 		if (relevant_tracks.empty()) {
@@ -621,9 +763,9 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 			   any selected ones.
 			*/
 
-			if (!selection->selected (entered_regionview)) {
+			if (!selection->selected (clicked_regionview)) {
 
-				RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&entered_regionview->get_time_axis_view());
+				RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&clicked_regionview->get_time_axis_view());
 
 				if (rtv) {
 
@@ -637,7 +779,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 
 					RouteTimeAxisView* closest = 0;
 					int distance = INT_MAX;
-					int key = rtv->route()->order_key ("editor");
+					int key = rtv->route()->order_key (EditorSort);
 
 					for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
 
@@ -652,7 +794,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 							if (result.second) {
 								/* newly added to already_in_selection */
 
-								int d = artv->route()->order_key ("editor");
+								int d = artv->route()->order_key (EditorSort);
 
 								d -= key;
 
@@ -668,7 +810,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 
 						/* now add all tracks between that one and this one */
 
-						int okey = closest->route()->order_key ("editor");
+						int okey = closest->route()->order_key (EditorSort);
 
 						if (okey > key) {
 							swap (okey, key);
@@ -678,7 +820,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 							RouteTimeAxisView* artv = dynamic_cast<RouteTimeAxisView*>(*x);
 							if (artv && artv != rtv) {
 
-								int k = artv->route()->order_key ("editor");
+								int k = artv->route()->order_key (EditorSort);
 
 								if (k >= okey && k <= key) {
 
@@ -689,8 +831,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 									*/
 
 									if (find (already_in_selection.begin(),
-										  already_in_selection.end(),
-										  artv) == already_in_selection.end()) {
+									          already_in_selection.end(),
+									          artv) == already_in_selection.end()) {
 
 										relevant_tracks.insert (artv);
 									}
@@ -703,7 +845,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 		}
 
 		/* 3. find all selectable objects (regionviews in this case) between that one and the end of the
-			   one that was clicked.
+		   one that was clicked.
 		*/
 
 		for (set<RouteTimeAxisView*>::iterator t = relevant_tracks.begin(); t != relevant_tracks.end(); ++t) {
@@ -728,7 +870,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 		}
 	}
 
-  out:
+out:
 	return commit;
 }
 
@@ -738,7 +880,7 @@ Editor::set_selected_regionview_from_region_list (boost::shared_ptr<Region> regi
 {
 	vector<RegionView*> all_equivalent_regions;
 
-	get_regions_corresponding_to (region, all_equivalent_regions);
+	get_regions_corresponding_to (region, all_equivalent_regions, region->whole_file());
 
 	if (all_equivalent_regions.empty()) {
 		return;
@@ -799,7 +941,7 @@ Editor::set_selected_regionview_from_map_event (GdkEventAny* /*ev*/, StreamView*
 void
 Editor::track_selection_changed ()
 {
-	switch (selection->tracks.size()){
+	switch (selection->tracks.size()) {
 	case 0:
 		break;
 	default:
@@ -807,15 +949,39 @@ Editor::track_selection_changed ()
 		break;
 	}
 
+	RouteNotificationListPtr routes (new RouteNotificationList);
+
 	for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-		if (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end()) {
-			(*i)->set_selected (true);
+
+		bool yn = (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end());
+
+		(*i)->set_selected (yn);
+
+		TimeAxisView::Children c = (*i)->get_child_list ();
+		for (TimeAxisView::Children::iterator j = c.begin(); j != c.end(); ++j) {
+			(*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end());
+		}
+
+		if (yn) {
+			(*i)->reshow_selection (selection->time);
 		} else {
-			(*i)->set_selected (false);
+			(*i)->hide_selection ();
+		}
+
+
+		if (yn) {
+			RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*i);
+			if (rtav) {
+				routes->push_back (rtav->route());
+			}
 		}
 	}
 
 	ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty());
+
+	/* notify control protocols */
+	
+	ControlProtocol::TrackSelectionChanged (routes);
 }
 
 void
@@ -838,29 +1004,284 @@ Editor::time_selection_changed ()
 	} else {
 		ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, true);
 	}
+
+	if (_session && Config->get_always_play_range() && !_session->transport_rolling() && !selection->time.empty()) {
+		_session->request_locate (selection->time.start());
+	}
 }
 
+/** Set all region actions to have a given sensitivity */
 void
-Editor::sensitize_the_right_region_actions (bool have_selected_regions)
+Editor::sensitize_all_region_actions (bool s)
 {
-	for (vector<Glib::RefPtr<Action> >::iterator x = ActionManager::region_selection_sensitive_actions.begin();
-	     x != ActionManager::region_selection_sensitive_actions.end(); ++x) {
+	Glib::ListHandle<Glib::RefPtr<Action> > all = _region_actions->get_actions ();
 
-		string accel_path = (*x)->get_accel_path ();
-		AccelKey key;
+	for (Glib::ListHandle<Glib::RefPtr<Action> >::iterator i = all.begin(); i != all.end(); ++i) {
+		(*i)->set_sensitive (s);
+	}
 
-		/* if there is an accelerator, it should always be sensitive
-		   to allow for keyboard ops on entered regions.
-		*/
+	_all_region_actions_sensitized = s;
+}
+
+/** Sensitize region-based actions based on the selection ONLY, ignoring the entered_regionview.
+ *  This method should be called just before displaying a Region menu.  When a Region menu is not
+ *  currently being shown, all region actions are sensitized so that hotkey-triggered actions
+ *  on entered_regionviews work without having to check sensitivity every time the selection or
+ *  entered_regionview changes.
+ *
+ *  This method also sets up toggle action state as appropriate.
+ */
+void
+Editor::sensitize_the_right_region_actions ()
+{
+
+	RegionSelection rs = get_regions_from_selection_and_entered ();
+	sensitize_all_region_actions (!rs.empty ());
+
+	_ignore_region_action = true;
+
+	/* Look through the regions that are selected and make notes about what we have got */
+
+	bool have_audio = false;
+	bool have_multichannel_audio = false;
+	bool have_midi = false;
+	bool have_locked = false;
+	bool have_unlocked = false;
+	bool have_video_locked = false;
+	bool have_video_unlocked = false;
+	bool have_position_lock_style_audio = false;
+	bool have_position_lock_style_music = false;
+	bool have_muted = false;
+	bool have_unmuted = false;
+	bool have_opaque = false;
+	bool have_non_opaque = false;
+	bool have_not_at_natural_position = false;
+	bool have_envelope_active = false;
+	bool have_envelope_inactive = false;
+	bool have_non_unity_scale_amplitude = false;
+	bool have_compound_regions = false;
+	bool have_inactive_fade_in = false;
+	bool have_inactive_fade_out = false;
+	bool have_active_fade_in = false;
+	bool have_active_fade_out = false;
+
+	for (list<RegionView*>::const_iterator i = rs.begin(); i != rs.end(); ++i) {
+
+		boost::shared_ptr<Region> r = (*i)->region ();
+		boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
+
+		if (ar) {
+			have_audio = true;
+			if (ar->n_channels() > 1) {
+				have_multichannel_audio = true;
+			}
+		}
+
+		if (boost::dynamic_pointer_cast<MidiRegion> (r)) {
+			have_midi = true;
+		}
+
+		if (r->is_compound()) {
+			have_compound_regions = true;
+		}
+
+		if (r->locked()) {
+			have_locked = true;
+		} else {
+			have_unlocked = true;
+		}
+
+		if (r->video_locked()) {
+			have_video_locked = true;
+		} else {
+			have_video_unlocked = true;
+		}
+
+		if (r->position_lock_style() == MusicTime) {
+			have_position_lock_style_music = true;
+		} else {
+			have_position_lock_style_audio = true;
+		}
+
+		if (r->muted()) {
+			have_muted = true;
+		} else {
+			have_unmuted = true;
+		}
 
-		bool known = ActionManager::lookup_entry (accel_path, key);
+		if (r->opaque()) {
+			have_opaque = true;
+		} else {
+			have_non_opaque = true;
+		}
+
+		if (!r->at_natural_position()) {
+			have_not_at_natural_position = true;
+		}
+
+		if (ar) {
+			if (ar->envelope_active()) {
+				have_envelope_active = true;
+			} else {
+				have_envelope_inactive = true;
+			}
+
+			if (ar->scale_amplitude() != 1) {
+				have_non_unity_scale_amplitude = true;
+			}
+
+			if (ar->fade_in_active ()) {
+				have_active_fade_in = true;
+			} else {
+				have_inactive_fade_in = true;
+			}
+
+			if (ar->fade_out_active ()) {
+				have_active_fade_out = true;
+			} else {
+				have_inactive_fade_out = true;
+			}
+		}
+	}
 
-		if (known && ((key.get_key() != GDK_VoidSymbol) && (key.get_key() != 0))) {
-			(*x)->set_sensitive (true);
+	if (rs.size() > 1) {
+		_region_actions->get_action("show-region-list-editor")->set_sensitive (false);
+		_region_actions->get_action("show-region-properties")->set_sensitive (false);
+		_region_actions->get_action("rename-region")->set_sensitive (false);
+		if (have_audio) {
+			/* XXX need to check whether there is than 1 per
+			   playlist, because otherwise this makes no sense.
+			*/
+			_region_actions->get_action("combine-regions")->set_sensitive (true);
 		} else {
-			(*x)->set_sensitive (have_selected_regions);
+			_region_actions->get_action("combine-regions")->set_sensitive (false);
 		}
+	} else if (rs.size() == 1) {
+		_region_actions->get_action("add-range-markers-from-region")->set_sensitive (false);
+		_region_actions->get_action("close-region-gaps")->set_sensitive (false);
+		_region_actions->get_action("combine-regions")->set_sensitive (false);
+	}
+
+	if (!have_multichannel_audio) {
+		_region_actions->get_action("split-multichannel-region")->set_sensitive (false);
+	}
+
+	if (!have_midi) {
+		editor_menu_actions->get_action("RegionMenuMIDI")->set_sensitive (false);
+		_region_actions->get_action("show-region-list-editor")->set_sensitive (false);
+		_region_actions->get_action("quantize-region")->set_sensitive (false);
+		_region_actions->get_action("fork-region")->set_sensitive (false);
+		_region_actions->get_action("insert-patch-change-context")->set_sensitive (false);
+		_region_actions->get_action("insert-patch-change")->set_sensitive (false);
+		_region_actions->get_action("transpose-region")->set_sensitive (false);
+	} else {
+		editor_menu_actions->get_action("RegionMenuMIDI")->set_sensitive (true);
+		/* others were already marked sensitive */
+	}
+
+	if (_edit_point == EditAtMouse) {
+		_region_actions->get_action("set-region-sync-position")->set_sensitive (false);
+		_region_actions->get_action("trim-front")->set_sensitive (false);
+		_region_actions->get_action("trim-back")->set_sensitive (false);
+		_region_actions->get_action("split-region")->set_sensitive (false);
+		_region_actions->get_action("place-transient")->set_sensitive (false);
+	}
+
+	if (have_compound_regions) {
+		_region_actions->get_action("uncombine-regions")->set_sensitive (true);
+	} else {
+		_region_actions->get_action("uncombine-regions")->set_sensitive (false);
+	}
+
+	if (have_audio) {
+
+		if (have_envelope_active && !have_envelope_inactive) {
+			Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-active"))->set_active ();
+		} else if (have_envelope_active && have_envelope_inactive) {
+			// Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-active"))->set_inconsistent ();
+		}
+
+	} else {
+
+		_region_actions->get_action("analyze-region")->set_sensitive (false);
+		_region_actions->get_action("reset-region-gain-envelopes")->set_sensitive (false);
+		_region_actions->get_action("toggle-region-gain-envelope-active")->set_sensitive (false);
+		_region_actions->get_action("pitch-shift-region")->set_sensitive (false);
+
+	}
+
+	if (!have_non_unity_scale_amplitude || !have_audio) {
+		_region_actions->get_action("reset-region-scale-amplitude")->set_sensitive (false);
+	}
+
+	Glib::RefPtr<ToggleAction> a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock"));
+	a->set_active (have_locked && !have_unlocked);
+	if (have_locked && have_unlocked) {
+		// a->set_inconsistent ();
+	}
+
+	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-video-lock"));
+	a->set_active (have_video_locked && !have_video_unlocked);
+	if (have_video_locked && have_video_unlocked) {
+		// a->set_inconsistent ();
+	}
+
+	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock-style"));
+	a->set_active (have_position_lock_style_music && !have_position_lock_style_audio);
+
+	if (have_position_lock_style_music && have_position_lock_style_audio) {
+		// a->set_inconsistent ();
+	}
+
+	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-mute"));
+	a->set_active (have_muted && !have_unmuted);
+	if (have_muted && have_unmuted) {
+		// a->set_inconsistent ();
+	}
+
+	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-opaque-region"));
+	a->set_active (have_opaque && !have_non_opaque);
+	if (have_opaque && have_non_opaque) {
+		// a->set_inconsistent ();
+	}
+
+	if (!have_not_at_natural_position) {
+		_region_actions->get_action("naturalize-region")->set_sensitive (false);
+	}
+
+	/* XXX: should also check that there is a track of the appropriate type for the selected region */
+	if (_edit_point == EditAtMouse || _regions->get_single_selection() == 0 || selection->tracks.empty()) {
+		_region_actions->get_action("insert-region-from-region-list")->set_sensitive (false);
+	} else {
+		_region_actions->get_action("insert-region-from-region-list")->set_sensitive (true);
+	}
+
+	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-fade-in"));
+	a->set_active (have_active_fade_in && !have_inactive_fade_in);
+	if (have_active_fade_in && have_inactive_fade_in) {
+		// a->set_inconsistent ();
+	}
+
+	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-fade-out"));
+	a->set_active (have_active_fade_out && !have_inactive_fade_out);
+
+	if (have_active_fade_out && have_inactive_fade_out) {
+		// a->set_inconsistent ();
 	}
+	
+	bool const have_active_fade = have_active_fade_in || have_active_fade_out;
+	bool const have_inactive_fade = have_inactive_fade_in || have_inactive_fade_out;
+
+	a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-fades"));
+	a->set_active (have_active_fade && !have_inactive_fade);
+
+	if (have_active_fade && have_inactive_fade) {
+		// a->set_inconsistent ();
+	}
+	
+	_ignore_region_action = false;
+
+	_all_region_actions_sensitized = false;
 }
 
 
@@ -870,18 +1291,31 @@ Editor::region_selection_changed ()
 	_regions->block_change_connection (true);
 	editor_regions_selection_changed_connection.block(true);
 
-	_regions->unselect_all ();
+	if (_region_selection_change_updates_region_list) {
+		_regions->unselect_all ();
+	}
 
 	for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
 		(*i)->set_selected_regionviews (selection->regions);
 	}
 
-	_regions->set_selected (selection->regions);
-
-	sensitize_the_right_region_actions (!selection->regions.empty());
+	if (_region_selection_change_updates_region_list) {
+		_regions->set_selected (selection->regions);
+	}
 
 	_regions->block_change_connection (false);
 	editor_regions_selection_changed_connection.block(false);
+
+	if (!_all_region_actions_sensitized) {
+		/* This selection change might have changed what region actions
+		   are allowed, so sensitize them all in case a key is pressed.
+		*/
+		sensitize_all_region_actions (true);
+	}
+
+	if (_session && !_session->transport_rolling() && !selection->regions.empty()) {
+		maybe_locate_with_edit_preroll (selection->regions.start());
+	}
 }
 
 void
@@ -901,7 +1335,7 @@ Editor::select_all_in_track (Selection::Operation op)
 		return;
 	}
 
-	clicked_routeview->get_selectables (0, max_frames, 0, DBL_MAX, touched);
+	clicked_routeview->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
 
 	switch (op) {
 	case Selection::Toggle:
@@ -919,17 +1353,64 @@ Editor::select_all_in_track (Selection::Operation op)
 	}
 }
 
+void
+Editor::select_all_internal_edit (Selection::Operation)
+{
+	for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+		MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+		if (mrv) {
+			mrv->select_all_notes ();
+		}
+	}
+}
+
 void
 Editor::select_all (Selection::Operation op)
 {
 	list<Selectable *> touched;
 
-	for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) {
+	TrackViewList ts;
+
+	if (selection->tracks.empty()) {
+		if (entered_track) {
+			ts.push_back (entered_track);
+		} else {
+			ts = track_views;
+		}
+	} else {
+		ts = selection->tracks;
+	}
+
+	if (_internal_editing) {
+
+		bool midi_selected = false;
+
+		for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) {
+			if ((*iter)->hidden()) {
+				continue;
+			}
+			
+			RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*iter);
+
+			if (rtav && rtav->is_midi_track()) {
+				midi_selected = true;
+				break;
+			}
+		}
+
+		if (midi_selected) {
+			select_all_internal_edit (op);
+			return;
+		}
+	}
+
+	for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) {
 		if ((*iter)->hidden()) {
 			continue;
 		}
-		(*iter)->get_selectables (0, max_frames, 0, DBL_MAX, touched);
+		(*iter)->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
 	}
+
 	begin_reversible_command (_("select all"));
 	switch (op) {
 	case Selection::Add:
@@ -947,6 +1428,7 @@ Editor::select_all (Selection::Operation op)
 	}
 	commit_reversible_command ();
 }
+
 void
 Editor::invert_selection_in_track ()
 {
@@ -965,6 +1447,16 @@ Editor::invert_selection ()
 {
 	list<Selectable *> touched;
 
+	if (_internal_editing) {
+		for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+			MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+			if (mrv) {
+				mrv->invert_selection ();
+			}
+		}
+		return;
+	}
+
 	for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) {
 		if ((*iter)->hidden()) {
 			continue;
@@ -975,51 +1467,39 @@ Editor::invert_selection ()
 	selection->set (touched);
 }
 
-/** @param top Top (lower) y limit in trackview coordinates.
- *  @param bottom Bottom (higher) y limit in trackview coordinates.
+/** @param start Start time in session frames.
+ *  @param end End time in session frames.
+ *  @param top Top (lower) y limit in trackview coordinates (ie 0 at the top of the track view)
+ *  @param bottom Bottom (higher) y limit in trackview coordinates (ie 0 at the top of the track view)
+ *  @param preserve_if_selected true to leave the current selection alone if we're adding to the selection and all of the selectables
+ *  within the region are already selected.
  */
-bool
-Editor::select_all_within (
-	nframes64_t start, nframes64_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op
-	)
+void
+Editor::select_all_within (framepos_t start, framepos_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op, bool preserve_if_selected)
 {
 	list<Selectable*> found;
-	TrackViewList tracks;
 
 	for (TrackViewList::const_iterator iter = tracklist.begin(); iter != tracklist.end(); ++iter) {
-		
+
 		if ((*iter)->hidden()) {
 			continue;
 		}
 
-		list<Selectable*>::size_type const n = found.size ();
-
 		(*iter)->get_selectables (start, end, top, bot, found);
-
-		if (n != found.size()) {
-			tracks.push_back (*iter);
-		}
 	}
-	
+
 	if (found.empty()) {
-		return false;
+		return;
 	}
 
-	if (!tracks.empty()) {
+	if (preserve_if_selected && op != Selection::Toggle) {
+		list<Selectable*>::iterator i = found.begin();
+		while (i != found.end() && (*i)->get_selected()) {
+			++i;
+		}
 
-		switch (op) {
-		case Selection::Add:
-			selection->add (tracks);
-			break;
-		case Selection::Toggle:
-			selection->toggle (tracks);
-			break;
-		case Selection::Set:
-			selection->set (tracks);
-			break;
-		case Selection::Extend:
-			/* not defined yet */
-			break;
+		if (i == found.end()) {
+			return;
 		}
 	}
 
@@ -1040,8 +1520,6 @@ Editor::select_all_within (
 	}
 
 	commit_reversible_command ();
-
-	return !found.empty();
 }
 
 void
@@ -1101,8 +1579,8 @@ Editor::select_all_selectables_using_time_selection ()
 		return;
 	}
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
 
 	if (end - start < 1)  {
 		return;
@@ -1194,24 +1672,37 @@ Editor::select_all_selectables_using_loop()
 void
 Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 {
-        nframes64_t start;
-	nframes64_t end;
+	framepos_t start;
+	framepos_t end;
 	list<Selectable *> touched;
 
 	if (after) {
-		begin_reversible_command (_("select all after cursor"));
-		start = cursor->current_frame ;
+		start = cursor->current_frame();
 		end = _session->current_end_frame();
 	} else {
-		if (cursor->current_frame > 0) {
-			begin_reversible_command (_("select all before cursor"));
+		if (cursor->current_frame() > 0) {
 			start = 0;
-			end = cursor->current_frame - 1;
+			end = cursor->current_frame() - 1;
 		} else {
 			return;
 		}
 	}
 
+	if (_internal_editing) {
+		for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+			MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+			if (mrv) {
+				mrv->select_range (start, end);
+			}
+		}
+		return;
+	}
+
+	if (after) {
+		begin_reversible_command (_("select all after cursor"));
+	} else {
+		begin_reversible_command (_("select all before cursor"));
+	}
 
 	TrackViewList* ts;
 
@@ -1234,17 +1725,15 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 void
 Editor::select_all_selectables_using_edit (bool after)
 {
-        nframes64_t start;
-	nframes64_t end;
+	framepos_t start;
+	framepos_t end;
 	list<Selectable *> touched;
 
 	if (after) {
-		begin_reversible_command (_("select all after edit"));
 		start = get_preferred_edit_position();
 		end = _session->current_end_frame();
 	} else {
 		if ((end = get_preferred_edit_position()) > 1) {
-			begin_reversible_command (_("select all before edit"));
 			start = 0;
 			end -= 1;
 		} else {
@@ -1252,6 +1741,19 @@ Editor::select_all_selectables_using_edit (bool after)
 		}
 	}
 
+	if (_internal_editing) {
+		for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+			MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+			mrv->select_range (start, end);
+		}
+		return;
+	}
+
+	if (after) {
+		begin_reversible_command (_("select all after edit"));
+	} else {
+		begin_reversible_command (_("select all before edit"));
+	}
 
 	TrackViewList* ts;
 
@@ -1274,14 +1776,22 @@ Editor::select_all_selectables_using_edit (bool after)
 void
 Editor::select_all_selectables_between (bool /*within*/)
 {
-        nframes64_t start;
-	nframes64_t end;
+	framepos_t start;
+	framepos_t end;
 	list<Selectable *> touched;
 
 	if (!get_edit_op_range (start, end)) {
 		return;
 	}
 
+	if (_internal_editing) {
+		for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
+			MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+			mrv->select_range (start, end);
+		}
+		return;
+	}
+
 	TrackViewList* ts;
 
 	if (selection->tracks.empty()) {
@@ -1303,8 +1813,12 @@ Editor::select_all_selectables_between (bool /*within*/)
 void
 Editor::select_range_between ()
 {
-        nframes64_t start;
-	nframes64_t end;
+	framepos_t start;
+	framepos_t end;
+
+	if ( !selection->time.empty() ) {
+		selection->clear_time ();
+	}
 
 	if (!get_edit_op_range (start, end)) {
 		return;
@@ -1315,14 +1829,14 @@ Editor::select_range_between ()
 }
 
 bool
-Editor::get_edit_op_range (nframes64_t& start, nframes64_t& end) const
+Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
 {
-	nframes64_t m;
+	framepos_t m;
 	bool ignored;
 
-	/* in range mode, use any existing selection */
+	/* if an explicit range exists, use it */
 
-	if (mouse_mode == MouseRange && !selection->time.empty()) {
+	if (!selection->time.empty()) {
 		/* we know that these are ordered */
 		start = selection->time.start();
 		end = selection->time.end_frame();
@@ -1332,7 +1846,7 @@ Editor::get_edit_op_range (nframes64_t& start, nframes64_t& end) const
 	if (!mouse_frame (m, ignored)) {
 		/* mouse is not in a canvas, try playhead+selected marker.
 		   this is probably most true when using menus.
-		 */
+		*/
 
 		if (selection->markers.empty()) {
 			return false;
@@ -1372,9 +1886,9 @@ Editor::get_edit_op_range (nframes64_t& start, nframes64_t& end) const
 			if (selection->markers.empty()) {
 
 				MessageDialog win (_("No edit range defined"),
-						   false,
-						   MESSAGE_INFO,
-						   BUTTONS_OK);
+				                   false,
+				                   MESSAGE_INFO,
+				                   BUTTONS_OK);
 
 				win.set_secondary_text (
 					_("the edit point is Selected Marker\nbut there is no selected marker."));
@@ -1418,13 +1932,9 @@ Editor::deselect_all ()
 }
 
 long
-Editor::select_range_around_region (RegionView* rv)
+Editor::select_range (framepos_t s, framepos_t e)
 {
-	assert (rv);
-	
-	selection->set (&rv->get_time_axis_view());
-	
+	selection->add (clicked_axisview);
 	selection->time.clear ();
-	boost::shared_ptr<Region> r = rv->region ();
-	return selection->set (r->position(), r->position() + r->length());
+	return selection->set (s, e);
 }