Separate selection operations into their own temporary history mechanism.
[ardour.git] / gtk2_ardour / editor_mouse.cc
index 95cea7e44aa9fd10c67454faf2ce48f78c753ea7..e093eb5426ad54fda5a0f91bfa917d41c9ea7f93 100644 (file)
@@ -221,6 +221,28 @@ Editor::mouse_mode_object_range_toggled()
        set_mouse_mode(m, true);  //call this so the button styles can get updated
 }
 
+static Glib::RefPtr<Action>
+get_mouse_mode_action(MouseMode m)
+{
+       switch (m) {
+       case MouseRange:
+               return ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range"));
+       case MouseObject:
+               return ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object"));
+       case MouseCut:
+               return ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-cut"));
+       case MouseDraw:
+               return ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw"));
+       case MouseTimeFX:
+               return ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-timefx"));
+       case MouseContent:
+               return ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-content"));
+       case MouseAudition:
+               return ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-audition"));
+       }
+       return Glib::RefPtr<Action>();
+}
+
 void
 Editor::set_mouse_mode (MouseMode m, bool force)
 {
@@ -236,38 +258,8 @@ Editor::set_mouse_mode (MouseMode m, bool force)
                if ( m == MouseCut) m = MouseObject;
        }
 
-       Glib::RefPtr<Action> act;
-
-       switch (m) {
-       case MouseRange:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range"));
-               break;
-
-       case MouseCut:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-cut"));
-               break;
-
-       case MouseObject:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object"));
-               break;
-
-       case MouseDraw:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw"));
-               break;
-
-       case MouseTimeFX:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-timefx"));
-               break;
-
-       case MouseAudition:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-audition"));
-               break;
-       }
-
-       assert (act);
-
-       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-       assert (tact);
+       Glib::RefPtr<Action>       act  = get_mouse_mode_action(m);
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
 
        /* go there and back to ensure that the toggled handler is called to set up mouse_mode */
        tact->set_active (false);
@@ -279,43 +271,12 @@ Editor::set_mouse_mode (MouseMode m, bool force)
 void
 Editor::mouse_mode_toggled (MouseMode m)
 {
-       Glib::RefPtr<Action> act;
-       Glib::RefPtr<ToggleAction> tact;
-
        if (ARDOUR::Profile->get_mixbus()) {
                if ( m == MouseCut)  m = MouseObject;
        }
 
-       switch (m) {
-       case MouseRange:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range"));
-               break;
-
-       case MouseObject:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object"));
-               break;
-
-       case MouseCut:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-cut"));
-               break;
-
-       case MouseDraw:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw"));
-               break;
-
-       case MouseTimeFX:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-timefx"));
-               break;
-
-       case MouseAudition:
-               act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-audition"));
-               break;
-       }
-
-       assert (act);
-
-       tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-       assert (tact);
+       Glib::RefPtr<Action>       act  = get_mouse_mode_action(m);
+       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
 
        if (!tact->get_active()) {
                /* this was just the notification that the old mode has been
@@ -331,8 +292,21 @@ Editor::mouse_mode_toggled (MouseMode m)
                _session->request_transport_speed (0.0, true);
        }
 
+       const bool was_internal = internal_editing();
+
        mouse_mode = m;
 
+       /* Switch snap type/mode if we're moving to/from an internal tool.  Note
+          this must toggle the actions and not call set_snap_*() directly,
+          otherwise things get out of sync and the combo box stops working. */
+       if (!was_internal && internal_editing()) {
+               snap_type_action(internal_snap_type)->set_active(true);
+               snap_mode_action(internal_snap_mode)->set_active(true);
+       } else if (was_internal && !internal_editing()) {
+               snap_type_action(pre_internal_snap_type)->set_active(true);
+               snap_mode_action(pre_internal_snap_mode)->set_active(true);
+       }
+
        instant_save ();
 
        /* this should generate a new enter event which will
@@ -347,9 +321,17 @@ Editor::mouse_mode_toggled (MouseMode m)
        
        update_time_selection_display ();
 
+       update_all_enter_cursors ();
+
        MouseModeChanged (); /* EMIT SIGNAL */
 }
 
+bool
+Editor::internal_editing() const
+{
+       return mouse_mode == Editing::MouseContent || mouse_mode == Editing::MouseDraw;
+}
+
 void
 Editor::update_time_selection_display ()
 {
@@ -362,9 +344,26 @@ Editor::update_time_selection_display ()
                switch (mouse_mode) {
                case MouseRange:
                        selection->clear_objects ();
+                       selection->ClearMidiNoteSelection();  //signal
+                       break;
+               case MouseObject:
+                       selection->clear_objects ();
+                       selection->clear_time ();
+                       selection->clear_tracks ();
+                       selection->ClearMidiNoteSelection();  //signal
+                       break;
+               case MouseContent:
+               case MouseDraw:
+                       //if we go into internal editing, clear everything in the outside world
+                       selection->clear_objects ();
+                       selection->clear_time ();
+                       selection->clear_tracks ();
                        break;
                default:
+                       //clear everything
+                       selection->clear_objects ();
                        selection->clear_time ();
+                       selection->clear_tracks ();
                        break;
                }
        }
@@ -373,7 +372,7 @@ Editor::update_time_selection_display ()
 void
 Editor::step_mouse_mode (bool next)
 {
-       const int n_mouse_modes = (int)MouseDraw + 1;
+       const int n_mouse_modes = (int)MouseContent + 1;
        int       current       = (int)current_mouse_mode();
        if (next) {
                set_mouse_mode((MouseMode)((current + 1) % n_mouse_modes));
@@ -382,22 +381,6 @@ Editor::step_mouse_mode (bool next)
        }
 }
 
-bool
-Editor::toggle_internal_editing_from_double_click (GdkEvent* event)
-{
-       if (_drags->active()) {
-               _drags->end_grab (event);
-       } 
-
-       ActionManager::do_action ("MouseMode", "toggle-internal-edit");
-
-       /* prevent reversion of edit cursor on button release */
-       
-       pre_press_cursor = 0;
-
-       return true;
-}
-
 void
 Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemType item_type)
 {
@@ -446,9 +429,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
             (mouse_mode != MouseAudition || item_type != RegionItem) &&
             (mouse_mode != MouseTimeFX || item_type != RegionItem) &&
             (mouse_mode != MouseDraw)) ||
-           ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3) ||
-           (internal_editing() && mouse_mode != MouseTimeFX)) {
-
+           ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) {
                return;
        }
 
@@ -541,6 +522,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
           them to be modeless.
        */
 
+       NoteBase* note = NULL;
+
        switch (item_type) {
        case PlayheadCursorItem:
                _drags->set (new CursorDrag (this, *playhead_cursor, true), event);
@@ -556,8 +539,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
        case TempoMarkerItem:
        {
-               TempoMarker* m = reinterpret_cast<TempoMarker*> (item->get_data ("marker"));
-               assert (m);
                _drags->set (
                        new TempoMarkerDrag (
                                this,
@@ -571,8 +552,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
        case MeterMarkerItem:
        {
-               MeterMarker* m = reinterpret_cast<MeterMarker*> (item->get_data ("marker"));
-               assert (m);
                _drags->set (
                        new MeterMarkerDrag (
                                this,
@@ -666,11 +645,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                }
        }
 
-       /* there is no Range mode when in internal edit mode */
-       if (eff == MouseRange && internal_editing()) {
-               eff = MouseObject;
-       }
-
        switch (eff) {
        case MouseRange:
                switch (item_type) {
@@ -697,19 +671,12 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        break;
 
                case StreamItem:
-                       if (internal_editing()) {
-                               if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
-                                       _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
-                                       return true;
-                               } 
+                       if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) {
+                               _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event);
                        } else {
-                               if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) {
-                                       _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event);
-                               } else {
-                                       _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
-                               }
-                               return true;
+                               _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
                        }
+                       return true;
                        break;
 
                case RegionViewNameHighlight:
@@ -720,12 +687,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        break;
 
                default:
-                       if (!internal_editing()) {
-                               if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) {
-                                       _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event);
-                               } else {
-                                       _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
-                               }
+                       if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) {
+                               _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event);
+                       } else {
+                               _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
                        }
                }
                return true;
@@ -743,7 +708,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                case RegionViewName:
                case StreamItem:
                case AutomationTrackItem:
-                       _drags->set (new RegionCutDrag (this, item, canvas_event_sample (event)), event, current_canvas_cursor);
+                       _drags->set (new RegionCutDrag (this, item, canvas_event_sample (event)), event, get_canvas_cursor());
                        return true;
                        break;
                default:
@@ -751,26 +716,42 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                }
                break;
 
-       case MouseObject:
+       case MouseContent:
                switch (item_type) {
                case NoteItem:
                        /* Existing note: allow trimming/motion */
-                       if (internal_editing()) {
-                               NoteBase* cn = reinterpret_cast<NoteBase*> (item->get_data ("notebase"));
-                               assert (cn);
-                               if (cn->big_enough_to_trim() && cn->mouse_near_ends()) {
-                                       _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
+                       if ((note = reinterpret_cast<NoteBase*> (item->get_data ("notebase")))) {
+                               if (note->big_enough_to_trim() && note->mouse_near_ends()) {
+                                       _drags->set (new NoteResizeDrag (this, item), event, get_canvas_cursor());
                                } else {
                                        _drags->set (new NoteDrag (this, item), event);
                                }
+                       }
+                       return true;
+
+               case ControlPointItem:
+                       _drags->set (new ControlPointDrag (this, item), event);
+                       return true;
+                       break;
+
+               case StreamItem:
+                       if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
+                               _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
                                return true;
                        }
                        break;
 
+               case AutomationTrackItem:
+                       /* rubberband drag to select automation points */
+                       _drags->set (new EditorRubberbandSelectDrag (this, item), event);
+                       break;
+
                default:
                        break;
                }
+               break;
 
+       case MouseObject:
                if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) &&
                    event->type == GDK_BUTTON_PRESS) {
 
@@ -820,10 +801,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                        break;
                                }
 
-                               if (internal_editing ()) {
-                                       break;
-                               }
-
                                /* click on a normal region view */
                                if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
                                        add_region_copy_drag (item, event, clicked_regionview);
@@ -834,10 +811,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                }
 
 
-//                             if (!internal_editing() && (_join_object_range_state == JOIN_OBJECT_RANGE_RANGE && !selection->regions.empty())) {
-//                                     _drags->add (new SelectionDrag (this, clicked_axisview->get_selection_rect (clicked_selection)->rect, SelectionDrag::SelectionMove));
-//                             }
-
                                _drags->start_grab (event);
                                return true;
                                break;
@@ -880,15 +853,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                break;
 
                        case StreamItem:
-                               if (internal_editing()) {
-                                       if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
-                                               _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
-                                       }
-                                       return true;
-                               } else {
-                                       _drags->set (new EditorRubberbandSelectDrag (this, item), event);
-                               }
-                               break;
+                               _drags->set (new EditorRubberbandSelectDrag (this, item), event);
+                               return true;
 
                        case AutomationTrackItem:
                        {
@@ -972,28 +938,23 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        break;
 
                case NoteItem:
-                       /* Existing note: allow trimming/motion */
-                       if (internal_editing()) {
-                               /* trim notes if we're in internal edit mode and near the ends of the note */
-                               NoteBase* cn = reinterpret_cast<NoteBase*>(item->get_data ("notebase"));
-                               assert (cn);
-                               if (cn->big_enough_to_trim() && cn->mouse_near_ends()) {
-                                       _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
+                       if ((note = reinterpret_cast<NoteBase*>(item->get_data ("notebase")))) {
+                               if (note->big_enough_to_trim() && note->mouse_near_ends()) {
+                                       /* Note is big and pointer is near the end, trim */
+                                       _drags->set (new NoteResizeDrag (this, item), event, get_canvas_cursor());
                                } else {
+                                       /* Drag note */
                                        _drags->set (new NoteDrag (this, item), event);
                                }
                                return true;
                        }
-                       break;
+                       return true;
 
                case StreamItem:
-                       if (internal_editing()) {
-                               if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
-                                       _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
-                               }
-                               return true;
+                       if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
+                               _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
                        }
-                       break;
+                       return true;
 
                default:
                        break;
@@ -1002,12 +963,12 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                break;
 
        case MouseTimeFX:
-               if (internal_editing() && item_type == NoteItem ) {
-                       /* drag notes if we're in internal edit mode */
-                       NoteBase* cn = reinterpret_cast<NoteBase*>(item->get_data ("notebase"));
-                       assert (cn);
-                       if (cn->big_enough_to_trim()) {
-                               _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
+               if (item_type == NoteItem) {
+                       /* resize-drag notes */
+                       if ((note = reinterpret_cast<NoteBase*>(item->get_data ("notebase")))) {
+                               if (note->big_enough_to_trim()) {
+                                       _drags->set (new NoteResizeDrag (this, item), event, get_canvas_cursor());
+                               }
                        }
                        return true;
                } else if (clicked_regionview) {
@@ -1018,12 +979,11 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                break;
 
        case MouseAudition:
-               _drags->set (new ScrubDrag (this, item), event);
+               _drags->set (new ScrubDrag (this, item), event, _cursors->transparent);
                scrub_reversals = 0;
                scrub_reverse_distance = 0;
                last_scrub_x = event->button.x;
                scrubbing_direction = 0;
-               push_canvas_cursor (_cursors->transparent);
                return true;
                break;
 
@@ -1042,11 +1002,6 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
        case MouseObject:
                switch (item_type) {
                case RegionItem:
-                       if (internal_editing ()) {
-                               /* no region drags in internal edit mode */
-                               return false;
-                       }
-
                        if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {
                                add_region_copy_drag (item, event, clicked_regionview);
                        } else {
@@ -1072,9 +1027,7 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
                case LeftFrameHandle:
                case RightFrameHandle:
-                       if (!internal_editing ()) {
-                               _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event);
-                       }
+                       _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event);
                        return true;
                        break;
 
@@ -1117,56 +1070,12 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
                return false;
        }
 
-        pre_press_cursor = current_canvas_cursor;
-
        _track_canvas->grab_focus();
 
        if (_session && _session->actively_recording()) {
                return true;
        }
 
-       if (internal_editing()) {
-               bool leave_internal_edit_mode = false;
-
-               switch (item_type) {
-               case NoteItem:
-                       break;
-
-               case RegionItem:
-                       if (!dynamic_cast<MidiRegionView*> (clicked_regionview) && !dynamic_cast<AutomationRegionView*> (clicked_regionview)) {
-                               leave_internal_edit_mode = true;
-                       }
-                       break;
-
-               case PlayheadCursorItem:
-               case MarkerItem:
-               case TempoMarkerItem:
-               case MeterMarkerItem:
-               case MarkerBarItem:
-               case TempoBarItem:
-               case MeterBarItem:
-               case RangeMarkerBarItem:
-               case CdMarkerBarItem:
-               case TransportMarkerBarItem:
-               case StreamItem:
-               case TimecodeRulerItem:
-               case SamplesRulerItem:
-               case MinsecRulerItem:
-               case BBTRulerItem:
-                       /* button press on these items never does anything to
-                          change the editing mode.
-                       */
-                       break;
-
-               default:
-                       break;
-               }
-               
-               if (leave_internal_edit_mode) {
-                       ActionManager::do_action ("MouseMode", "toggle-internal-edit");
-               }
-       }
-
        button_selection (item, event, item_type);
 
        if (!_drags->active () &&
@@ -1179,7 +1088,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
        }
 
        //not rolling, range mode click + join_play_range :  locate the PH here
-       if ( !_drags->active () && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && Config->get_follow_edits() ) {
+       if ( !_drags->active () && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && ARDOUR_UI::config()->get_follow_edits() ) {
                framepos_t where = canvas_event_sample (event);
                snap_to(where);
                _session->request_locate (where, false);
@@ -1232,10 +1141,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
        framepos_t where = canvas_event_sample (event);
        AutomationTimeAxisView* atv = 0;
 
-        if (pre_press_cursor) {
-                set_canvas_cursor (pre_press_cursor);
-                pre_press_cursor = 0;
-        }
+       _press_cursor_ctx.reset();
 
        /* no action if we're recording */
 
@@ -1399,6 +1305,12 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                popup_control_point_context_menu (item, event);
                                break;
 
+                       case NoteItem:
+                               if (internal_editing()) {
+                                       popup_note_context_menu (item, event);
+                               }
+                               break;
+
                        default:
                                break;
                        }
@@ -1532,7 +1444,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        break;
 
                case MouseAudition:
-                       pop_canvas_cursor ();
                        if (scrubbing_direction == 0) {
                                /* no drag, just a click */
                                switch (item_type) {
@@ -1554,7 +1465,11 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                }
 
                 /* do any (de)selection operations that should occur on button release */
+
+               begin_reversible_selection_op (_("Button Select"));
                 button_selection (item, event, item_type);
+               commit_reversible_selection_op ();
+
                return true;
                break;
 
@@ -1620,7 +1535,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
         * (e.g. the actual entered regionview)
         */
 
-       choose_canvas_cursor_on_entry (&event->crossing, item_type);
+       choose_canvas_cursor_on_entry (item_type);
 
        switch (item_type) {
        case ControlPointItem:
@@ -1639,7 +1554,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                if (mouse_mode == MouseDraw) {
                        ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
                        if (line) {
-                               line->set_outline_color (ARDOUR_UI::config()->get_EnteredGainLine());
+                               line->set_outline_color (ARDOUR_UI::config()->color ("entered gain line"));
                        }
                }
                break;
@@ -1648,7 +1563,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                if (mouse_mode == MouseDraw || mouse_mode == MouseObject) {
                        ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
                        if (line) {
-                               line->set_outline_color (ARDOUR_UI::config()->get_EnteredAutomationLine());
+                               line->set_outline_color (ARDOUR_UI::config()->color ("entered automation line"));
                        }
                }
                break;
@@ -1666,7 +1581,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                        break;
                }
                entered_marker = marker;
-               marker->set_color_rgba (ARDOUR_UI::config()->get_EnteredMarker());
+               marker->set_color_rgba (ARDOUR_UI::config()->color ("entered marker"));
                // fall through
        case MeterMarkerItem:
        case TempoMarkerItem:
@@ -1674,7 +1589,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 
        case FadeInHandleItem:
        case FadeInTrimHandleItem:
-               if (mouse_mode == MouseObject && !internal_editing()) {
+               if (mouse_mode == MouseObject) {
                        ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
                        if (rect) {
                                RegionView* rv = static_cast<RegionView*>(item->get_data ("regionview"));
@@ -1685,7 +1600,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 
        case FadeOutHandleItem:
        case FadeOutTrimHandleItem:
-               if (mouse_mode == MouseObject && !internal_editing()) {
+               if (mouse_mode == MouseObject) {
                        ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
                        if (rect) {
                                RegionView* rv = static_cast<RegionView*>(item->get_data ("regionview"));
@@ -1740,7 +1655,9 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
        bool is_start;
        bool ret = true;
 
-       reset_canvas_cursor ();
+       if (!_enter_stack.empty()) {
+               _enter_stack.pop_back();
+       }
 
        switch (item_type) {
        case ControlPointItem:
@@ -1778,7 +1695,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
        {
                ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
                if (rect) {
-                       rect->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
+                       rect->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
                }
        }
        break;
@@ -1789,7 +1706,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
        case FeatureLineItem:
        {
                ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
-               line->set_outline_color (ARDOUR_UI::config()->get_ZeroLine());
+               line->set_outline_color (ARDOUR_UI::config()->color ("zero line"));
        }
        break;
 
@@ -1978,21 +1895,15 @@ Editor::edit_control_point (ArdourCanvas::Item* item)
 }
 
 void
-Editor::edit_notes (TimeAxisViewItem& tavi)
+Editor::edit_notes (MidiRegionView* mrv)
 {
-       MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(&tavi);
-
-       if (!mrv) {
-               return;
-       }
-
        MidiRegionView::Selection const & s = mrv->selection();
 
        if (s.empty ()) {
                return;
        }
 
-       EditNoteDialog* d = new EditNoteDialog (&(*s.begin())->region_view(), s);
+       EditNoteDialog* d = new EditNoteDialog (mrv, s);
        d->show_all ();
        ensure_float (*d);
 
@@ -2355,8 +2266,6 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
        clicked_routeview->playlist()->add_region (region, selection->time[clicked_selection].start);
        _session->add_command(new StatefulDiffCommand (playlist));
 
-       commit_reversible_command ();
-
        c.disconnect ();
 
        if (latest_regionviews.empty()) {
@@ -2367,8 +2276,11 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
        /* we need to deselect all other regionviews, and select this one
           i'm ignoring undo stuff, because the region creation will take care of it
        */
+
        selection->set (latest_regionviews);
 
+       commit_reversible_command ();
+
        _drags->set (new RegionMoveDrag (this, latest_regionviews.front()->get_canvas_group(), latest_regionviews.front(), latest_regionviews, false, false), event);
 }
 
@@ -2384,44 +2296,6 @@ Editor::escape ()
        reset_focus ();
 }
 
-void
-Editor::set_internal_edit (bool yn)
-{
-       if (_internal_editing == yn) {
-               return;
-       }
-
-       _internal_editing = yn;
-
-       if (yn) {
-               pre_internal_mouse_mode = mouse_mode;
-               pre_internal_snap_type = _snap_type;
-               pre_internal_snap_mode = _snap_mode;
-
-               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-                       (*i)->enter_internal_edit_mode ();
-               }
-
-               set_snap_to (internal_snap_type);
-               set_snap_mode (internal_snap_mode);
-
-       } else {
-
-               internal_snap_mode = _snap_mode;
-               internal_snap_type = _snap_type;
-
-               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-                       (*i)->leave_internal_edit_mode ();
-               }
-
-               set_snap_to (pre_internal_snap_type);
-               set_snap_mode (pre_internal_snap_mode);
-       }
-
-       reset_canvas_cursor ();
-       MouseModeChanged ();
-}
-
 /** Update _join_object_range_state which indicate whether we are over the top
  *  or bottom half of a route view, used by the `join object/range' tool
  *  mode. Coordinates in canvas space.
@@ -2429,7 +2303,7 @@ Editor::set_internal_edit (bool yn)
 void
 Editor::update_join_object_range_location (double y)
 {
-       if (_internal_editing || !get_smart_mode()) {
+       if (!get_smart_mode()) {
                _join_object_range_state = JOIN_OBJECT_RANGE_NONE;
                return;
        }
@@ -2446,11 +2320,12 @@ Editor::update_join_object_range_location (double y)
 
                ArdourCanvas::Duple const item_space = entered_regionview->get_canvas_group()->canvas_to_item (ArdourCanvas::Duple (0, y));
                double const c = item_space.y / entered_regionview->height();
-                       
+
                _join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
-               
-               if (_join_object_range_state != old) {
-                       set_canvas_cursor (which_track_cursor ());
+
+               Editor::EnterContext* ctx = get_enter_context(RegionItem);
+               if (_join_object_range_state != old && ctx) {
+                       ctx->cursor_ctx->change(which_track_cursor());
                }
 
        } else if (entered_track) {
@@ -2465,7 +2340,7 @@ Editor::update_join_object_range_location (double y)
                        entered_route_view->canvas_display()->canvas_to_item (cx, cy);
 
                        double track_height = entered_route_view->view()->child_height();
-                       if (Config->get_show_name_highlight()) {
+                       if (ARDOUR_UI::config()->get_show_name_highlight()) {
                                track_height -= TimeAxisViewItem::NAME_HIGHLIGHT_SIZE;
                        }
                        double const c = cy / track_height;
@@ -2482,8 +2357,9 @@ Editor::update_join_object_range_location (double y)
                        _join_object_range_state = JOIN_OBJECT_RANGE_OBJECT;
                }
 
-               if (_join_object_range_state != old) {
-                       set_canvas_cursor (which_track_cursor ());
+               Editor::EnterContext* ctx = get_enter_context(StreamItem);
+               if (_join_object_range_state != old && ctx) {
+                       ctx->cursor_ctx->change(which_track_cursor());
                }
        }
 }