changes to deal with region/note selection when changing into/out of internal edit mode

Also, activate MIDI editing actions so that they are effective in internal edit mode

1 files changed, 35 insertions, 0 deletions

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 7d63c4925d..2437dc31b8 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -347,6 +347,38 @@ Editor::mouse_mode_toggled (MouseMode m)
 
 	update_time_selection_display ();
 
+	if (internal_editing()) {
+
+		/* reinstate any existing MIDI note (and by extension, MIDI
+		 * region) selection for internal edit mode. This allows a user
+		 * to enter/exit/enter this mode without losing a selection of
+		 * notes.
+		 */
+
+		catch_up_on_midi_selection ();
+
+		/* ensure that the track canvas has focus, so that key events
+		   will get directed to the correct place.
+		*/
+		_track_canvas->grab_focus ();
+
+		/* enable MIDI editing actions, which in turns enables their
+		   bindings
+		*/
+		ActionManager::set_sensitive (_midi_actions, true);
+
+		/* mark "magic widget focus" so that we handle key events
+		 * correctly
+		 */
+		Keyboard::magic_widget_grab_focus ();
+	} else {
+		/* undo some of the above actions, since we're not in internal
+		   edit mode.
+		*/
+		ActionManager::set_sensitive (_midi_actions, false);
+		Keyboard::magic_widget_drop_focus ();
+	}
+
 	update_all_enter_cursors ();
 
 	MouseModeChanged (); /* EMIT SIGNAL */
@@ -2627,6 +2659,9 @@ Editor::escape ()
 	if (_drags->active ()) {
 		_drags->abort ();
 	} else if (_session) {
+
+		midi_action (&MidiRegionView::clear_note_selection);
+
 		selection->clear ();
 
 		/* if session is playing a range, cancel that */