Add load_session to profiling.
[ardour.git] / gtk2_ardour / editor_mouse.cc
index ade27923b78f86dd4fe3ec34686e7cbb36870113..a6446b67c3d7ab35c38271bc3b25fc055cc3460e 100644 (file)
 #include "editor_cursors.h"
 #include "verbose_cursor.h"
 
-#include "ardour/types.h"
-#include "ardour/profile.h"
-#include "ardour/route.h"
-#include "ardour/audio_track.h"
-#include "ardour/playlist.h"
-#include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
-#include "ardour/midi_region.h"
-#include "ardour/dB.h"
-#include "ardour/utils.h"
+#include "ardour/operations.h"
+#include "ardour/playlist.h"
+#include "ardour/profile.h"
 #include "ardour/region_factory.h"
-#include "ardour/source_factory.h"
+#include "ardour/route.h"
 #include "ardour/session.h"
-#include "ardour/operations.h"
+#include "ardour/types.h"
 
 #include <bitset>
 
@@ -91,6 +85,21 @@ using Gtkmm2ext::Keyboard;
 bool
 Editor::mouse_frame (framepos_t& where, bool& in_track_canvas) const
 {
+        /* gdk_window_get_pointer() has X11's XQueryPointer semantics in that it only
+           pays attentions to subwindows. this means that menu windows are ignored, and 
+           if the pointer is in a menu, the return window from the call will be the
+           the regular subwindow *under* the menu.
+
+           this matters quite a lot if the pointer is moving around in a menu that overlaps
+           the track canvas because we will believe that we are within the track canvas
+           when we are not. therefore, we track enter/leave events for the track canvas
+           and allow that to override the result of gdk_window_get_pointer().
+        */
+
+        if (!within_track_canvas) {
+                return false;
+        }
+
        int x, y;
        double wx, wy;
        Gdk::ModifierType mask;
@@ -238,61 +247,38 @@ Editor::set_current_movable (boost::shared_ptr<Movable> m)
 void
 Editor::set_canvas_cursor ()
 {
-       if (_internal_editing) {
+       switch (mouse_mode) {
+       case MouseRange:
+               current_canvas_cursor = _cursors->selector;
+               break;
 
-               switch (mouse_mode) {
-               case MouseDraw:
-                       current_canvas_cursor = _cursors->midi_pencil;
-                       break;
+       case MouseObject:
+               current_canvas_cursor = which_grabber_cursor();
+               break;
 
-               case MouseObject:
-                       current_canvas_cursor = which_grabber_cursor();
-                       break;
+       case MouseDraw:
+               current_canvas_cursor = _cursors->midi_pencil;
+               break;
 
-               case MouseTimeFX:
-                       current_canvas_cursor = _cursors->midi_resize;
-                       break;
+       case MouseGain:
+               current_canvas_cursor = _cursors->cross_hair;
+               break;
 
-               default:
-                       return;
+       case MouseZoom:
+               if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
+                       current_canvas_cursor = _cursors->zoom_out;
+               } else {
+                       current_canvas_cursor = _cursors->zoom_in;
                }
+               break;
 
-       } else {
-
-               switch (mouse_mode) {
-               case MouseRange:
-                       current_canvas_cursor = _cursors->selector;
-                       break;
-
-               case MouseObject:
-                       current_canvas_cursor = which_grabber_cursor();
-                       break;
-
-               case MouseDraw:
-                       /* shouldn't be possible, but just cover it anyway ... */
-                       current_canvas_cursor = _cursors->midi_pencil;
-                       break;
-
-               case MouseGain:
-                       current_canvas_cursor = _cursors->cross_hair;
-                       break;
-
-               case MouseZoom:
-                       if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
-                               current_canvas_cursor = _cursors->zoom_out;
-                       } else {
-                               current_canvas_cursor = _cursors->zoom_in;
-                       }
-                       break;
-
-               case MouseTimeFX:
-                       current_canvas_cursor = _cursors->time_fx; // just use playhead
-                       break;
+       case MouseTimeFX:
+               current_canvas_cursor = _cursors->time_fx; // just use playhead
+               break;
 
-               case MouseAudition:
-                       current_canvas_cursor = _cursors->speaker;
-                       break;
-               }
+       case MouseAudition:
+               current_canvas_cursor = _cursors->speaker;
+               break;
        }
 
        switch (_join_object_range_state) {
@@ -307,7 +293,7 @@ Editor::set_canvas_cursor ()
        }
 
        /* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */
-       if (join_object_range_button.get_active()) {
+       if (smart_mode_action->get_active()) {
                double x, y;
                get_pointer_position (x, y);
                ArdourCanvas::Item* i = track_canvas->get_item_at (x, y);
@@ -441,9 +427,9 @@ Editor::mouse_mode_toggled (MouseMode m)
        instant_save ();
 
        if (!internal_editing()) {
-               if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) {
+               if (mouse_mode != MouseRange && mouse_mode != MouseGain && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) {
 
-                       /* in all modes except range and joined object/range, hide the range selection,
+                       /* in all modes except range, gain and joined object/range, hide the range selection,
                           show the object (region) selection.
                        */
 
@@ -464,6 +450,7 @@ Editor::mouse_mode_toggled (MouseMode m)
        }
 
        set_canvas_cursor ();
+       set_gain_envelope_visibility ();
 
        MouseModeChanged (); /* EMIT SIGNAL */
 }
@@ -574,7 +561,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
             (mouse_mode != MouseRange) &&
             (mouse_mode != MouseDraw)) ||
            ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3) ||
-           internal_editing()) {
+           (internal_editing() && mouse_mode != MouseTimeFX)) {
 
                return;
        }
@@ -596,14 +583,21 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
 
        switch (item_type) {
        case RegionItem:
-               if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
-                       set_selected_regionview_from_click (press, op, true);
-               } else if (press) {
-                       selection->clear_tracks ();
-                       set_selected_track_as_side_effect (op, true);
+               if (!doing_range_stuff()) {
+                       set_selected_regionview_from_click (press, op);
                }
-               if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty()) {
-                       clicked_selection = select_range_around_region (selection->regions.front());
+               
+               if (press) {
+                       if (doing_range_stuff()) {
+                               /* don't change the selection unless the
+                                  clicked track is not currently selected. if
+                                  so, "collapse" the selection to just this
+                                  track
+                               */
+                               if (!selection->selected (clicked_axisview)) {
+                                       set_selected_track_as_side_effect (Selection::Set);
+                               }
+                       }
                }
                break;
 
@@ -611,29 +605,30 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
        case RegionViewName:
        case LeftFrameHandle:
        case RightFrameHandle:
-               if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
-                       set_selected_regionview_from_click (press, op, true);
+               if (doing_object_stuff() || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+                       set_selected_regionview_from_click (press, op);
                } else if (event->type == GDK_BUTTON_PRESS) {
                        set_selected_track_as_side_effect (op);
                }
                break;
 
-
        case FadeInHandleItem:
        case FadeInItem:
        case FadeOutHandleItem:
        case FadeOutItem:
-               if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
-                       set_selected_regionview_from_click (press, op, true);
+       case StartCrossFadeItem:
+       case EndCrossFadeItem:
+               if (doing_object_stuff() || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+                       set_selected_regionview_from_click (press, op);
                } else if (event->type == GDK_BUTTON_PRESS) {
                        set_selected_track_as_side_effect (op);
                }
                break;
 
        case ControlPointItem:
-               set_selected_track_as_side_effect (op, true);
-               if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
-                       set_selected_control_point_from_click (op, false);
+               set_selected_track_as_side_effect (op);
+               if (doing_object_stuff() || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+                       set_selected_control_point_from_click (press, op);
                }
                break;
 
@@ -641,12 +636,12 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
                /* for context click, select track */
                if (event->button.button == 3) {
                        selection->clear_tracks ();
-                       set_selected_track_as_side_effect (op, true);
+                       set_selected_track_as_side_effect (op);
                }
                break;
 
        case AutomationTrackItem:
-               set_selected_track_as_side_effect (op, true);
+               set_selected_track_as_side_effect (op);
                break;
 
        default:
@@ -800,9 +795,9 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                pair<TimeAxisView*, int> tvp = trackview_by_y_position (y);
                                if (tvp.first) {
                                        AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (tvp.first);
-                                       if (join_object_range_button.get_active() && atv) {
+                                       if (smart_mode_action->get_active() && atv) {
                                                /* smart "join" mode: drag automation */
-                                               _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event, _cursors->up_down);
+                                               _drags->set (new AutomationRangeDrag (this, atv, selection->time), event, _cursors->up_down);
                                        } else {
                                                /* this was debated, but decided the more common action was to
                                                   make a new selection */
@@ -812,18 +807,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        }
                        break;
 
-               case NoteItem:
-                       if (internal_editing()) {
-                               /* trim notes if we're in internal edit mode and near the ends of the note */
-                               ArdourCanvas::CanvasNote* cn = dynamic_cast<ArdourCanvas::CanvasNote*> (item);
-                               if (cn && cn->big_enough_to_trim() && cn->mouse_near_ends()) {
-                                       _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
-                               } else {
-                                       _drags->set (new NoteDrag (this, item), event);
-                               }
-                       }
-                       return true;
-
                case StreamItem:
                        if (internal_editing()) {
                                if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
@@ -846,7 +829,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
                case LeftFrameHandle:
                case RightFrameHandle:
-                       if (!internal_editing() && !clicked_regionview->region()->locked()) {
+                       if (!internal_editing() && doing_object_stuff() && !clicked_regionview->region()->locked()) {
                                RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
                                _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event);
                                return true;
@@ -861,6 +844,26 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                return true;
                break;
 
+       case MouseDraw:
+               switch (item_type) {
+               case NoteItem:
+                       if (internal_editing()) {
+                               /* trim notes if we're in internal edit mode and near the ends of the note */
+                               ArdourCanvas::CanvasNote* cn = dynamic_cast<ArdourCanvas::CanvasNote*> (item);
+                               if (cn && cn->big_enough_to_trim() && cn->mouse_near_ends()) {
+                                       _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
+                               } else {
+                                       _drags->set (new NoteDrag (this, item), event);
+                               }
+                               return true;
+                       }
+                       break;
+
+               default:
+                       break;
+               }
+               break;
+
        case MouseObject:
                switch (item_type) {
                case NoteItem:
@@ -901,6 +904,14 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                return true;
                        }
 
+                       case StartCrossFadeItem:
+                               _drags->set (new CrossfadeEdgeDrag (this, reinterpret_cast<AudioRegionView*>(item->get_data("regionview")), item, true), event, 0);
+                               break;
+
+                       case EndCrossFadeItem:
+                               _drags->set (new CrossfadeEdgeDrag (this, reinterpret_cast<AudioRegionView*>(item->get_data("regionview")), item, false), event, 0);
+                               break;
+
                        case FeatureLineItem:
                        {
                                if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) {
@@ -938,7 +949,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                        add_region_drag (item, event, clicked_regionview);
                                }
 
-                               if (!internal_editing() && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty())) {
+
+                               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));
                                }
 
@@ -991,8 +1003,23 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (clicked_axisview);
                                assert (atv);
                                if (parent && dynamic_cast<MidiTimeAxisView*> (parent) && atv->show_regions ()) {
-                                       /* create a MIDI region so that we have somewhere to put automation */
-                                       _drags->set (new RegionCreateDrag (this, item, parent), event);
+
+                                       RouteTimeAxisView* p = dynamic_cast<RouteTimeAxisView*> (parent);
+                                       assert (p);
+                                       boost::shared_ptr<Playlist> pl = p->track()->playlist ();
+                                       if (pl->n_regions() == 0) {
+                                               /* Parent has no regions; create one so that we have somewhere to put automation */
+                                               _drags->set (new RegionCreateDrag (this, item, parent), event);
+                                       } else {
+                                               /* See if there's a region before the click that we can extend, and extend it if so */
+                                               framepos_t const t = event_frame (event);
+                                               boost::shared_ptr<Region> prev = pl->find_next_region (t, End, -1);
+                                               if (!prev) {
+                                                       _drags->set (new RegionCreateDrag (this, item, parent), event);
+                                               } else {
+                                                       prev->set_length (t - prev->position ());
+                                               }
+                                       }
                                } else {
                                        /* rubberband drag to select automation points */
                                        _drags->set (new EditorRubberbandSelectDrag (this, item), event);
@@ -1002,7 +1029,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
                        case SelectionItem:
                        {
-                               if (join_object_range_button.get_active()) {
+                               if (smart_mode_action->get_active()) {
                                        /* we're in "smart" joined mode, and we've clicked on a Selection */
                                        double const y = event->button.y + vertical_adjustment.get_value() - canvas_timebars_vsize;
                                        pair<TimeAxisView*, int> tvp = trackview_by_y_position (y);
@@ -1010,7 +1037,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                                /* if we're over an automation track, start a drag of its data */
                                                AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (tvp.first);
                                                if (atv) {
-                                                       _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event, _cursors->up_down);
+                                                       _drags->set (new AutomationRangeDrag (this, atv, selection->time), event, _cursors->up_down);
                                                }
 
                                                /* if we're over a track and a region, and in the `object' part of a region,
@@ -1026,7 +1053,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                                                        boost::shared_ptr<Region> r = pl->top_region_at (event_frame (event));
                                                                        if (r) {
                                                                                RegionView* rv = rtv->view()->find_view (r);
-                                                                               clicked_selection = select_range_around_region (rv);
+                                                                               clicked_selection = select_range (rv->region()->position(), 
+                                                                                                                 rv->region()->last_frame()+1);
                                                                                _drags->add (new SelectionDrag (this, item, SelectionDrag::SelectionMove));
                                                                                list<RegionView*> rvs;
                                                                                rvs.push_back (rv);
@@ -1079,13 +1107,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
        case MouseGain:
                switch (item_type) {
-               case RegionItem:
-                       /* start a grab so that if we finish after moving
-                          we can tell what happened.
-                       */
-                       _drags->set (new RegionGainDrag (this, item), event, current_canvas_cursor);
-                       break;
-
                case GainLineItem:
                        _drags->set (new LineDrag (this, item), event);
                        return true;
@@ -1095,27 +1116,21 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        return true;
                        break;
 
-               default:
+               case SelectionItem:
+               {
+                       AudioRegionView* arv = dynamic_cast<AudioRegionView *> (clicked_regionview);
+                       if (arv) {
+                               _drags->set (new AutomationRangeDrag (this, arv, selection->time), event, _cursors->up_down);
+                               _drags->start_grab (event);
+                       }
+                       return true;
                        break;
                }
-               return true;
-               break;
-
-               switch (item_type) {
-               case ControlPointItem:
-                       _drags->set (new ControlPointDrag (this, item), event);
-                       break;
 
                case AutomationLineItem:
                        _drags->set (new LineDrag (this, item), event);
                        break;
-
-               case RegionItem:
-                       // XXX need automation mode to identify which
-                       // line to use
-                       // start_line_grab_from_regionview (item, event);
-                       break;
-
+                       
                default:
                        break;
                }
@@ -1135,8 +1150,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        /* drag notes if we're in internal edit mode */
                        _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor);
                        return true;
-               } else if ((!internal_editing() || dynamic_cast<AudioRegionView*> (clicked_regionview)) && clicked_regionview) {
-                       /* do time-FX if we're not in internal edit mode, or we are but we clicked on an audio region */
+               } else if (clicked_regionview) {
+                       /* do time-FX  */
                        _drags->set (new TimeFXDrag (this, item, clicked_regionview, selection->regions.by_layer()), event);
                        return true;
                }
@@ -1279,7 +1294,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
                        break;
 
                case RegionItem:
-                       if (!dynamic_cast<MidiRegionView*> (clicked_regionview)) {
+                       if (!dynamic_cast<MidiRegionView*> (clicked_regionview) && !dynamic_cast<AutomationRegionView*> (clicked_regionview)) {
                                leave_internal_edit_mode = true;
                        }
                        break;
@@ -1300,9 +1315,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
                        break;
                        
                case StreamItem:
-                       if (!dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
-                               leave_internal_edit_mode = true;
-                       }
+                       leave_internal_edit_mode = true;
                        break;
 
                default:
@@ -1425,8 +1438,12 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        break;
 
                case NoteItem:
-                       edit_note (item);
+               {
+                       ArdourCanvas::CanvasNoteEvent* e = dynamic_cast<ArdourCanvas::CanvasNoteEvent*> (item);
+                       assert (e);
+                       edit_notes (e->region_view().selection ());
                        break;
+               }
 
                default:
                        break;
@@ -1454,6 +1471,14 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                popup_fade_context_menu (1, event->button.time, item, item_type);
                                break;
 
+                       case StartCrossFadeItem:
+                               popup_xfade_in_context_menu (1, event->button.time, item, item_type);
+                               break;
+
+                       case EndCrossFadeItem:
+                               popup_xfade_out_context_menu (1, event->button.time, item, item_type);
+                               break;
+
                        case StreamItem:
                                popup_track_context_menu (1, event->button.time, item_type, false);
                                break;
@@ -1469,7 +1494,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        case SelectionItem:
                                popup_track_context_menu (1, event->button.time, item_type, true);
                                break;
-
+                               
                        case AutomationTrackItem:
                                popup_track_context_menu (1, event->button.time, item_type, false);
                                break;
@@ -1621,7 +1646,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                }
                                return true;
                                break;
-
                        default:
                                break;
                        }
@@ -1636,7 +1660,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                   points when doing this.
                                */
                                AudioRegionView* arv = dynamic_cast<AudioRegionView*> (clicked_regionview);
-                               if (were_dragging && arv) {
+                               if (!were_dragging && arv) {
                                        arv->add_gain_point_event (item, event);
                                }
                                return true;
@@ -1772,10 +1796,9 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 
        case AutomationLineItem:
                if (mouse_mode == MouseGain || mouse_mode == MouseObject) {
-                       {
-                               ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
-                               if (line)
-                                       line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredAutomationLine.get();
+                       ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
+                       if (line) {
+                               line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredAutomationLine.get();
                        }
                        if (is_drawable()) {
                                set_canvas_cursor (_cursors->fader);
@@ -1784,7 +1807,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                break;
 
        case RegionViewNameHighlight:
-               if (is_drawable() && mouse_mode == MouseObject && entered_regionview) {
+               if (is_drawable() && doing_object_stuff() && entered_regionview) {
                        set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview);
                        _over_region_trim_target = true;
                }
@@ -1792,7 +1815,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 
        case LeftFrameHandle:
        case RightFrameHandle:
-               if (is_drawable() && mouse_mode == MouseObject && !internal_editing() && entered_regionview) {
+               if (is_drawable() && doing_object_stuff() && !internal_editing() && entered_regionview) {
                        set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview);
                }
                 break;
@@ -1918,7 +1941,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                }
                break;
        case SelectionItem:
-               if (join_object_range_button.get_active()) {
+               if (smart_mode_action->get_active()) {
                        set_canvas_cursor ();
                }
                break;
@@ -2046,7 +2069,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
        case TempoMarkerItem:
 
                if (is_drawable()) {
-                       set_canvas_cursor (_cursors->timebar);
+                       set_canvas_cursor (current_canvas_cursor);
                }
 
                break;
@@ -2288,12 +2311,13 @@ Editor::edit_control_point (ArdourCanvas::Item* item)
 }
 
 void
-Editor::edit_note (ArdourCanvas::Item* item)
+Editor::edit_notes (MidiRegionView::Selection const & s)
 {
-       ArdourCanvas::CanvasNoteEvent* e = dynamic_cast<ArdourCanvas::CanvasNoteEvent*> (item);
-       assert (e);
-
-       EditNoteDialog d (&e->region_view(), e);
+       if (s.empty ()) {
+               return;
+       }
+       
+       EditNoteDialog d (&(*s.begin())->region_view(), s);
        d.set_position (Gtk::WIN_POS_MOUSE);
        ensure_float (d);
 
@@ -2398,10 +2422,6 @@ Editor::point_trim (GdkEvent* event, framepos_t new_bound)
                        for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin();
                             i != selection->regions.by_layer().end(); ++i)
                        {
-                               if ( (*i) == NULL){
-                                   cerr << "region view contains null region" << endl;
-                               }
-
                                if (!(*i)->region()->locked()) {
                                        (*i)->region()->clear_changes ();
                                        (*i)->region()->trim_front (new_bound);
@@ -2693,16 +2713,29 @@ Editor::escape ()
 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 ();
                 }
@@ -2711,6 +2744,9 @@ Editor::set_internal_edit (bool yn)
                         /* we were drawing .. flip back to something sensible */
                         set_mouse_mode (pre_internal_mouse_mode);
                 }
+
+               set_snap_to (pre_internal_snap_type);
+               set_snap_mode (pre_internal_snap_mode);
        }
        
        set_canvas_cursor ();
@@ -2722,12 +2758,15 @@ Editor::set_internal_edit (bool yn)
 void
 Editor::update_join_object_range_location (double /*x*/, double y)
 {
-       /* XXX: actually, this decides based on whether the mouse is in the top or bottom half of a RouteTimeAxisView;
-          entered_{track,regionview} is not always setup (e.g. if the mouse is over a TimeSelection), and to get a Region
+       /* XXX: actually, this decides based on whether the mouse is in the top
+          or bottom half of a the waveform part RouteTimeAxisView;
+
+          Note that entered_{track,regionview} is not always setup (e.g. if
+          the mouse is over a TimeSelection), and to get a Region
           that we're over requires searching the playlist.
        */
 
-       if (join_object_range_button.get_active() == false || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
+       if (!smart_mode_action->get_active() || (mouse_mode != MouseRange && mouse_mode != MouseObject)) {
                _join_object_range_state = JOIN_OBJECT_RANGE_NONE;
                return;
        }
@@ -2750,7 +2789,7 @@ Editor::update_join_object_range_location (double /*x*/, double y)
                        double cy = y;
                        rtv->canvas_display()->w2i (cx, cy);
 
-                       double const c = cy / rtv->view()->child_height();
+                       double const c = cy / (rtv->view()->child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE);
                        double d;
                        double const f = modf (c, &d);