X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_selection.cc;h=c2338347d2d4b85235bca3392c1bc7f5cc3d4c5d;hb=844f72d65fcd619464cf039663b6f954f8ae6eba;hp=fda5155e03d1fe6ed69505ab4f2bf8c253b8383a;hpb=061a85191c301ac18f2e8ca59d43127a4499ba96;p=ardour.git

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index fda5155e03..c2338347d2 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -26,6 +26,7 @@
 #include "ardour/playlist.h"
 #include "ardour/route_group.h"
 #include "ardour/profile.h"
+#include "ardour/midi_region.h"
 
 #include "editor.h"
 #include "actions.h"
@@ -35,6 +36,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"
 
@@ -170,24 +173,110 @@ 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, bool /*force*/)
 {
-	if (!clicked_routeview) {
+	if (!clicked_axisview) {
 		return;
 	}
 
+#if 1
+        if (!clicked_routeview) {
+                return;
+        }
+
+        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;
+
+	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();
+		cerr << ("Editor::set_selected_track_as_side_effect  case  Selection::Add  not yet implemented\n");
+                break;
+	}
+
+#else // the older version
+
 	if (!selection->tracks.empty()) {
-		if (!selection->selected (clicked_routeview)) {
-			selection->add (clicked_routeview);
+		if (!selection->selected (clicked_axisview)) {
+			selection->add (clicked_axisview);
 		}
 
 	} else if (force) {
-		selection->set (clicked_routeview);
+		selection->set (clicked_axisview);
 	}
+#endif
 }
 
 void
@@ -241,35 +330,22 @@ Editor::set_selected_control_point_from_click (Selection::Operation op, bool /*n
 		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.
-		*/
-		return true;
+	switch (op) {
+	case Selection::Set:
+		selection->set (clicked_control_point);
+		break;
+	case Selection::Add:
+		selection->add (clicked_control_point);
+		break;
+	case Selection::Toggle:
+		selection->toggle (clicked_control_point);
+		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
@@ -294,6 +370,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;
 	}
@@ -302,7 +379,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 */
@@ -317,6 +395,7 @@ 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);
 	}
@@ -354,7 +433,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 (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 */
 
@@ -372,7 +451,7 @@ Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) c
 
 		mapover_tracks (
 			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) {
@@ -443,7 +522,6 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
 
 		switch (op) {
 		case Selection::Toggle:
-
 			if (selection->selected (clicked_regionview)) {
 				if (press) {
 
@@ -454,7 +532,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 */
@@ -510,14 +587,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()) {
@@ -585,8 +662,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) {
@@ -608,7 +685,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()) {
@@ -620,9 +697,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) {
 
@@ -798,7 +875,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,12 +884,24 @@ Editor::track_selection_changed ()
 	}
 
 	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);
-		} else {
-			(*i)->set_selected (false);
-		}
-	}
+
+                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 &&
+                    ((mouse_mode == MouseRange) ||
+                     ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) {
+                        (*i)->reshow_selection (selection->time);
+                } else {
+                        (*i)->hide_selection ();
+                }
+        }
 
 	ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty());
 }
@@ -839,27 +928,240 @@ Editor::time_selection_changed ()
 	}
 }
 
+/** 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 ()
+{
+	if ((mouse_mode == MouseRange) || (mouse_mode != MouseObject && _join_object_range_state == JOIN_OBJECT_RANGE_RANGE)) {
+		sensitize_all_region_actions (false);
+		if (!selection->time.empty()) {
+			_region_actions->get_action("split-region")->set_sensitive (true);
+		}
+		return;
+
+	} else if (mouse_mode != MouseObject) {
+		sensitize_all_region_actions (false);
+		return;
+	}
+
+	/* We get here if we are in Object mode */
+
+	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_midi = false;
+	bool have_locked = false;
+	bool have_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_visible = false;
+	bool have_envelope_invisible = false;
+	bool have_envelope_active = false;
+	bool have_envelope_inactive = false;
+	bool have_non_unity_scale_amplitude = false;
+	bool have_compound_regions = 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 (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->position_lock_style() == MusicTime) {
+			have_position_lock_style_music = true;
+		} else {
+			have_position_lock_style_audio = true;
+		}
 
-		bool known = ActionManager::lookup_entry (accel_path, key);
+		if (r->muted()) {
+			have_muted = true;
+		} else {
+			have_unmuted = true;
+		}
 
-		if (known && ((key.get_key() != GDK_VoidSymbol) && (key.get_key() != 0))) {
-			(*x)->set_sensitive (true);
+		if (r->opaque()) {
+			have_opaque = true;
 		} else {
-			(*x)->set_sensitive (have_selected_regions);
+			have_non_opaque = true;
 		}
+
+		if (!r->at_natural_position()) {
+			have_not_at_natural_position = true;
+		}
+
+		if (ar) {
+                        /* its a bit unfortunate that "envelope visible" is a view-only
+                           property. we have to find the regionview to able to check
+                           its current setting.
+                        */
+
+                        have_envelope_invisible = true;
+
+                        if (*i) {
+                                AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*i);
+                                if (arv && arv->envelope_visible()) {
+                                        have_envelope_visible = true;
+                                }
+			}
+
+			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 (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) {
+			_region_actions->get_action("combine-regions")->set_sensitive (true);
+		} else {
+			_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_midi) {
+		_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("transpose-region")->set_sensitive (false);
+	}
+
+	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_visible && !have_envelope_invisible) {
+			Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-visible"))->set_active ();
+		} else if (have_envelope_visible && have_envelope_invisible) {
+//			_region_actions->get_action("toggle-region-gain-envelope-visible")->set_inconsistent ();
+		}
+
+		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) {
+//			_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-visible")->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>::cast_dynamic (_region_actions->get_action("toggle-region-lock"))->set_active (have_locked && !have_unlocked);
+	if (have_locked && have_unlocked) {
+//		_region_actions->get_action("toggle-region-lock")->set_inconsistent ();
+	}
+
+	Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock-style"))->set_active (have_position_lock_style_music && !have_position_lock_style_audio);
+
+	if (have_position_lock_style_music && have_position_lock_style_audio) {
+//		_region_actions->get_action("toggle-region-lock-style")->set_inconsistent ();
+	}
+
+	Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-mute"))->set_active (have_muted && !have_unmuted);
+	if (have_muted && have_unmuted) {
+//		_region_actions->get_action("toggle-region-mute")->set_inconsistent ();
+	}
+
+	Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-opaque-region"))->set_active (have_opaque && !have_non_opaque);
+	if (have_opaque && have_non_opaque) {
+//			_region_actions->get_action("toggle-opaque-region")->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);
 	}
+
+	_ignore_region_action = false;
+
+	_all_region_actions_sensitized = false;
 }
 
 
@@ -869,18 +1171,27 @@ 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);
+	}
 }
 
 void
@@ -900,7 +1211,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:
@@ -918,16 +1229,34 @@ Editor::select_all_in_track (Selection::Operation op)
 	}
 }
 
+void
+Editor::select_all_internal_edit (Selection::Operation op)
+{
+        /* currently limited to MIDI only */
+
+	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;
 
+        if (_internal_editing) {
+                select_all_internal_edit (op);
+                return;
+        }
+
 	for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.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) {
@@ -974,25 +1303,42 @@ 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;
 
 	for (TrackViewList::const_iterator iter = tracklist.begin(); iter != tracklist.end(); ++iter) {
-		
+
 		if ((*iter)->hidden()) {
 			continue;
 		}
 
 		(*iter)->get_selectables (start, end, top, bot, found);
 	}
-	
+
 	if (found.empty()) {
-		return false;
+		return;
+	}
+
+	if (preserve_if_selected && op != Selection::Toggle) {
+		list<Selectable*>::iterator i = found.begin();
+		while (i != found.end() && (*i)->get_selected()) {
+			++i;
+		}
+
+		if (i == found.end()) {
+			return;
+		}
 	}
 
 	begin_reversible_command (_("select all within"));
@@ -1012,8 +1358,6 @@ Editor::select_all_within (nframes64_t start, nframes64_t end, double top, doubl
 	}
 
 	commit_reversible_command ();
-
-	return !found.empty();
 }
 
 void
@@ -1073,8 +1417,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;
@@ -1166,13 +1510,13 @@ 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) {
@@ -1206,8 +1550,8 @@ 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) {
@@ -1246,8 +1590,8 @@ 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)) {
@@ -1275,8 +1619,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 (mouse_mode == MouseRange && !selection->time.empty()) {
+                selection->clear_time ();
+        }
 
 	if (!get_edit_op_range (start, end)) {
 		return;
@@ -1287,9 +1635,9 @@ 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 */
@@ -1393,9 +1741,9 @@ long
 Editor::select_range_around_region (RegionView* rv)
 {
 	assert (rv);
-	
+
 	selection->set (&rv->get_time_axis_view());
-	
+
 	selection->time.clear ();
 	boost::shared_ptr<Region> r = rv->region ();
 	return selection->set (r->position(), r->position() + r->length());