Use a few shared_ptrs to make things slightly neater.
[ardour.git] / gtk2_ardour / editor_canvas_events.cc
index 0da0bfc4878290e700c6f3a56531cf4413803917..187590734532013c489792329da4d1268bc5461d 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <cstdlib>
 #include <cmath>
 #include <algorithm>
+#include <typeinfo>
 
-#include <pbd/stacktrace.h>
+#include "pbd/stacktrace.h"
 
-#include <ardour/audio_diskstream.h>
-#include <ardour/audioplaylist.h>
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/region_factory.h"
+#include "ardour/midi_region.h"
 
 #include "editor.h"
 #include "keyboard.h"
 #include "public_editor.h"
 #include "audio_region_view.h"
 #include "audio_streamview.h"
+#include "canvas-noevent-text.h"
 #include "crossfade_view.h"
 #include "audio_time_axis.h"
 #include "region_gain_line.h"
 #include "control_point.h"
 #include "canvas_impl.h"
 #include "simplerect.h"
-#include "canvas-note-event.h"
+#include "editor_drag.h"
+#include "midi_time_axis.h"
+#include "editor_regions.h"
+#include "verbose_cursor.h"
 
 #include "i18n.h"
 
-using namespace sigc;
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 using namespace ArdourCanvas;
 
+using Gtkmm2ext::Keyboard;
+
 bool
 Editor::track_canvas_scroll (GdkEventScroll* ev)
 {
-       int x, y;
-       double wx, wy;
-       nframes_t xdelta;
+       framepos_t xdelta;
        int direction = ev->direction;
-       CanvasNoteEvent *midi_event = dynamic_cast<CanvasNoteEvent *>(track_canvas->get_item_at(ev->x, ev->y));
 
   retry:
        switch (direction) {
        case GDK_SCROLL_UP:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       //if (ev->state == GDK_CONTROL_MASK) {
-                       /* XXX 
-                          the ev->x will be out of step with the canvas
-                          if we're in mid zoom, so we have to get the damn mouse 
-                          pointer again
-                       */
-                       track_canvas->get_pointer (x, y);
-                       track_canvas->window_to_world (x, y, wx, wy);
-                       wx += horizontal_adjustment.get_value();
-                       wy += vertical_adjustment.get_value();
-                       
-                       GdkEvent event;
-                       event.type = GDK_BUTTON_RELEASE;
-                       event.button.x = wx;
-                       event.button.y = wy;
-                       
-                       nframes_t where = event_frame (&event, 0, 0);
-                       temporal_zoom_to_frame (false, where);
+                       temporal_zoom_step (false);
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
                        direction = GDK_SCROLL_LEFT;
                        goto retry;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
                        if (!current_stepping_trackview) {
-                               step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-                               if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) {
+                               step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500);
+                               std::pair<TimeAxisView*, int> const p = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize);
+                               current_stepping_trackview = p.first;
+                               if (!current_stepping_trackview) {
                                        return false;
                                }
                        }
-                       gettimeofday (&last_track_height_step_timestamp, 0);
-                       current_stepping_trackview->step_height (true);
+                       last_track_height_step_timestamp = get_microseconds();
+                       current_stepping_trackview->step_height (false);
                        return true;
                } else {
-                       if(midi_event) {
-                               return midi_event->on_event(reinterpret_cast<GdkEvent *>(ev));
-                       }
                        scroll_tracks_up_line ();
                        return true;
                }
@@ -107,41 +94,28 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 
        case GDK_SCROLL_DOWN:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       //if (ev->state == GDK_CONTROL_MASK) {
-                       track_canvas->get_pointer (x, y);
-                       track_canvas->window_to_world (x, y, wx, wy);
-                       wx += horizontal_adjustment.get_value();
-                       wy += vertical_adjustment.get_value();
-                       
-                       GdkEvent event;
-                       event.type = GDK_BUTTON_RELEASE;
-                       event.button.x = wx;
-                       event.button.y = wy;
-                       
-                       nframes_t where = event_frame (&event, 0, 0);
-                       temporal_zoom_to_frame (true, where);
+                       temporal_zoom_step (true);
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
                        direction = GDK_SCROLL_RIGHT;
                        goto retry;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
                        if (!current_stepping_trackview) {
-                               step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-                               if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) {
+                               step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500);
+                               std::pair<TimeAxisView*, int> const p = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize);
+                               current_stepping_trackview = p.first;
+                               if (!current_stepping_trackview) {
                                        return false;
                                }
                        }
-                       gettimeofday (&last_track_height_step_timestamp, 0);
-                       current_stepping_trackview->step_height (false);
+                       last_track_height_step_timestamp = get_microseconds();
+                       current_stepping_trackview->step_height (true);
                        return true;
                } else {
-                       if(midi_event) {
-                               return midi_event->on_event(reinterpret_cast<GdkEvent *>(ev));
-                       }
                        scroll_tracks_down_line ();
                        return true;
                }
-               break;  
+               break;
 
        case GDK_SCROLL_LEFT:
                xdelta = (current_page_frames() / 8);
@@ -154,10 +128,10 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 
        case GDK_SCROLL_RIGHT:
                xdelta = (current_page_frames() / 8);
-               if (max_frames - xdelta > leftmost_frame) {
+               if (max_framepos - xdelta > leftmost_frame) {
                        reset_x_origin (leftmost_frame + xdelta);
                } else {
-                       reset_x_origin (max_frames - current_page_frames());
+                       reset_x_origin (max_framepos - current_page_frames());
                }
                break;
 
@@ -165,7 +139,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                /* what? */
                break;
        }
-       
+
        return false;
 }
 
@@ -173,61 +147,11 @@ bool
 Editor::track_canvas_scroll_event (GdkEventScroll *event)
 {
        track_canvas->grab_focus();
-       track_canvas_scroll (event);
-       return false;
-}
-
-bool
-Editor::time_canvas_scroll (GdkEventScroll* ev)
-{
-       nframes_t xdelta;
-       int direction = ev->direction;
-
-       switch (direction) {
-       case GDK_SCROLL_UP:
-               temporal_zoom_step (true);
-               break;
-
-       case GDK_SCROLL_DOWN:
-               temporal_zoom_step (false);
-               break;  
-
-       case GDK_SCROLL_LEFT:
-               xdelta = (current_page_frames() / 2);
-               if (leftmost_frame > xdelta) {
-                       reset_x_origin (leftmost_frame - xdelta);
-               } else {
-                       reset_x_origin (0);
-               }
-               break;
-
-       case GDK_SCROLL_RIGHT:
-               xdelta = (current_page_frames() / 2);
-               if (max_frames - xdelta > leftmost_frame) {
-                       reset_x_origin (leftmost_frame + xdelta);
-               } else {
-                       reset_x_origin (max_frames - current_page_frames());
-               }
-               break;
-
-       default:
-               /* what? */
-               break;
-       }
-
-       return false;
+       return track_canvas_scroll (event);
 }
 
 bool
-Editor::time_canvas_scroll_event (GdkEventScroll *event)
-{
-       time_canvas->grab_focus();
-       time_canvas_scroll (event);
-       return false;
-}
-
-bool
-Editor::track_canvas_button_press_event (GdkEventButton *event)
+Editor::track_canvas_button_press_event (GdkEventButton */*event*/)
 {
        selection->clear ();
        track_canvas->grab_focus();
@@ -237,14 +161,14 @@ Editor::track_canvas_button_press_event (GdkEventButton *event)
 bool
 Editor::track_canvas_button_release_event (GdkEventButton *event)
 {
-       if (drag_info.item) {
-               end_grab (drag_info.item, (GdkEvent*) event);
+       if (_drags->active ()) {
+               _drags->end_grab ((GdkEvent*) event);
        }
        return false;
 }
 
 bool
-Editor::track_canvas_motion_notify_event (GdkEventMotion *event)
+Editor::track_canvas_motion_notify_event (GdkEventMotion */*event*/)
 {
        int x, y;
        /* keep those motion events coming */
@@ -255,15 +179,10 @@ Editor::track_canvas_motion_notify_event (GdkEventMotion *event)
 bool
 Editor::track_canvas_motion (GdkEvent *ev)
 {
-       if (verbose_cursor_visible) {
-               verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (ev->motion.x + 20);
-               verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 20);
+       if (_verbose_cursor->visible ()) {
+               _verbose_cursor->set_position (ev->motion.x + 10, ev->motion.y + 10);
        }
 
-#ifdef GTKOSX
-       flush_canvas ();
-#endif
-
        return false;
 }
 
@@ -271,7 +190,7 @@ bool
 Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type)
 {
        gint ret = FALSE;
-       
+
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
@@ -282,7 +201,7 @@ Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type)
                ret = button_release_handler (item, event, type);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, type);
+               ret = motion_handler (item, event);
                break;
 
        case GDK_ENTER_NOTIFY:
@@ -293,6 +212,14 @@ Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type)
                ret = leave_handler (item, event, type);
                break;
 
+       case GDK_KEY_PRESS:
+               ret = key_press_handler (item, event, type);
+               break;
+
+       case GDK_KEY_RELEASE:
+               ret = key_release_handler (item, event, type);
+               break;
+
        default:
                break;
        }
@@ -308,7 +235,6 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg
                return false;
        }
 
-
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
@@ -325,7 +251,7 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg
                break;
 
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, RegionItem);
+               ret = motion_handler (item, event);
                break;
 
        case GDK_ENTER_NOTIFY:
@@ -349,7 +275,7 @@ bool
 Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, RouteTimeAxisView *tv)
 {
        bool ret = FALSE;
-       
+
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
@@ -357,7 +283,7 @@ Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, Rou
                clicked_regionview = 0;
                clicked_control_point = 0;
                clicked_axisview = tv;
-               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(tv);
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, StreamItem);
                break;
 
@@ -366,7 +292,7 @@ Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, Rou
                break;
 
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, StreamItem);
+               ret = motion_handler (item, event);
                break;
 
        case GDK_ENTER_NOTIFY:
@@ -389,7 +315,6 @@ Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item
 {
        bool ret = false;
 
-       
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
@@ -406,7 +331,7 @@ Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item
                break;
 
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, AutomationTrackItem);
+               ret = motion_handler (item, event);
                break;
 
        case GDK_ENTER_NOTIFY:
@@ -452,11 +377,11 @@ Editor::canvas_fade_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRe
 
        default:
                break;
-               
+
        }
 
        /* proxy for the regionview */
-       
+
        return canvas_region_view_event (event, rv->get_canvas_group(), rv);
 }
 
@@ -464,7 +389,7 @@ bool
 Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
 {
        bool ret = false;
-       
+
        if (!rv->sensitive()) {
                return false;
        }
@@ -485,14 +410,16 @@ Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
                break;
 
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, FadeInHandleItem);
+               ret = motion_handler (item, event);
                break;
 
        case GDK_ENTER_NOTIFY:
+               set_entered_regionview (rv);
                ret = enter_handler (item, event, FadeInHandleItem);
                break;
 
        case GDK_LEAVE_NOTIFY:
+               set_entered_regionview (0);
                ret = leave_handler (item, event, FadeInHandleItem);
                break;
 
@@ -531,11 +458,11 @@ Editor::canvas_fade_out_event (GdkEvent *event, ArdourCanvas::Item* item, AudioR
 
        default:
                break;
-               
+
        }
 
        /* proxy for the regionview */
-       
+
        return canvas_region_view_event (event, rv->get_canvas_group(), rv);
 }
 
@@ -543,7 +470,7 @@ bool
 Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
 {
        bool ret = false;
-       
+
        if (!rv->sensitive()) {
                return false;
        }
@@ -564,14 +491,16 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
                break;
 
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, FadeOutHandleItem);
+               ret = motion_handler (item, event);
                break;
 
        case GDK_ENTER_NOTIFY:
+               set_entered_regionview (rv);
                ret = enter_handler (item, event, FadeOutHandleItem);
                break;
 
        case GDK_LEAVE_NOTIFY:
+               set_entered_regionview (0);
                ret = leave_handler (item, event, FadeOutHandleItem);
                break;
 
@@ -597,9 +526,10 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
        case GDK_BUTTON_PRESS:
                clicked_crossfadeview = xfv;
                clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                if (event->button.button == 3) {
                        return button_press_handler (item, event, CrossfadeViewItem);
-               } 
+               }
                break;
 
        case GDK_BUTTON_RELEASE:
@@ -611,7 +541,7 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
 
        default:
                break;
-               
+
        }
 
        /* XXX do not forward double clicks */
@@ -619,13 +549,15 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
        if (event->type == GDK_2BUTTON_PRESS) {
                return false;
        }
-       
-       /* proxy for the upper most regionview */
+
+       /* proxy for an underlying regionview */
 
        /* XXX really need to check if we are in the name highlight,
           and proxy to that when required.
+
+          XXX or in the trim rectangles
        */
-       
+
        TimeAxisView& tv (xfv->get_time_axis_view());
        AudioTimeAxisView* atv;
 
@@ -634,24 +566,71 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
                if (atv->is_audio_track()) {
 
                        boost::shared_ptr<AudioPlaylist> pl;
-                       if ((pl = boost::dynamic_pointer_cast<AudioPlaylist> (atv->get_diskstream()->playlist())) != 0) {
-
-                               Playlist::RegionList* rl = pl->regions_at (event_frame (event));
+                       if ((pl = boost::dynamic_pointer_cast<AudioPlaylist> (atv->track()->playlist())) != 0) {
 
+                               boost::shared_ptr<Playlist::RegionList> rl = pl->regions_at (event_frame (event));
                                if (!rl->empty()) {
-                                       DescendingRegionLayerSorter cmp;
-                                       rl->sort (cmp);
-
-                                       RegionView* rv = atv->view()->find_view (rl->front());
-
-                                       delete rl;
-
-                                       /* proxy */
-                                       
-                                       return canvas_region_view_event (event, rv->get_canvas_group(), rv);
-                               } 
 
-                               delete rl;
+                                       if (atv->layer_display() == Overlaid) {
+
+                                               /* we're in overlaid mode; proxy to the uppermost region view */
+
+                                               DescendingRegionLayerSorter cmp;
+                                               rl->sort (cmp);
+
+                                               RegionView* rv = atv->view()->find_view (rl->front());
+
+                                               /* proxy */
+                                               return canvas_region_view_event (event, rv->get_canvas_group(), rv);
+
+                                       } else {
+
+                                               /* we're in stacked mode; proxy to the region view under the mouse */
+
+                                               double cx = 0;
+                                               double cy = 0;
+                                               switch (event->type) {
+                                               case GDK_BUTTON_PRESS:
+                                               case GDK_BUTTON_RELEASE:
+                                                       cx = event->button.x;
+                                                       cy = event->button.y;
+                                                       break;
+                                               case GDK_MOTION_NOTIFY:
+                                                       cx = event->motion.x;
+                                                       cy = event->motion.y;
+                                                       break;
+                                               case GDK_ENTER_NOTIFY:
+                                               case GDK_LEAVE_NOTIFY:
+                                                       cx = event->crossing.x;
+                                                       cy = event->crossing.y;
+                                                       break;
+                                               default:
+                                                       /* XXX: this may be wrong for some events */
+                                                       cx = event->button.x;
+                                                       cy = event->button.y;
+                                               }
+
+                                               /* position of the event within the track */
+                                               atv->view()->canvas_item()->w2i (cx, cy);
+
+                                               /* hence layer that we're over */
+                                               double const c = atv->view()->child_height ();
+                                               layer_t const l = pl->top_layer () + 1 - (cy / c);
+
+                                               /* hence region */
+                                               Playlist::RegionList::iterator i = rl->begin();
+                                               while (i != rl->end() && (*i)->layer() != l) {
+                                                       ++i;
+                                               }
+
+                                               if (i != rl->end()) {
+                                                       RegionView* rv = atv->view()->find_view (*i);
+
+                                                       /* proxy */
+                                                       return canvas_region_view_event (event, rv->get_canvas_group(), rv);
+                                               }
+                                       }
+                               }
                        }
                }
        }
@@ -703,7 +682,7 @@ bool
 Editor::canvas_selection_rect_event (GdkEvent *event, ArdourCanvas::Item* item, SelectionRect* rect)
 {
        bool ret = false;
-       
+
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
@@ -715,7 +694,7 @@ Editor::canvas_selection_rect_event (GdkEvent *event, ArdourCanvas::Item* item,
                ret = button_release_handler (item, event, SelectionItem);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, SelectionItem);
+               ret = motion_handler (item, event);
                break;
                /* Don't need these at the moment. */
        case GDK_ENTER_NOTIFY:
@@ -729,7 +708,7 @@ Editor::canvas_selection_rect_event (GdkEvent *event, ArdourCanvas::Item* item,
        default:
                break;
        }
-                       
+
        return ret;
 }
 
@@ -749,7 +728,7 @@ Editor::canvas_selection_start_trim_event (GdkEvent *event, ArdourCanvas::Item*
                ret = button_release_handler (item, event, StartSelectionTrimItem);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, StartSelectionTrimItem);
+               ret = motion_handler (item, event);
                break;
        case GDK_ENTER_NOTIFY:
                ret = enter_handler (item, event, StartSelectionTrimItem);
@@ -762,7 +741,7 @@ Editor::canvas_selection_start_trim_event (GdkEvent *event, ArdourCanvas::Item*
        default:
                break;
        }
-                       
+
        return ret;
 }
 
@@ -782,7 +761,7 @@ Editor::canvas_selection_end_trim_event (GdkEvent *event, ArdourCanvas::Item* it
                ret = button_release_handler (item, event, EndSelectionTrimItem);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, EndSelectionTrimItem);
+               ret = motion_handler (item, event);
                break;
        case GDK_ENTER_NOTIFY:
                ret = enter_handler (item, event, EndSelectionTrimItem);
@@ -795,7 +774,65 @@ Editor::canvas_selection_end_trim_event (GdkEvent *event, ArdourCanvas::Item* it
        default:
                break;
        }
-                       
+
+       return ret;
+}
+
+bool
+Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv)
+{
+       bool ret = false;
+
+       /* frame handles are not active when in internal edit mode, because actual notes
+          might be in the area occupied by the handle - we want them to be editable as normal.
+       */
+
+       if (internal_editing() || !rv->sensitive()) {
+               return false;
+       }
+
+       /* NOTE: frame handles pretend to be the colored trim bar from an event handling
+          perspective. XXX change this ??
+       */
+
+       ItemType type;
+
+       if (item->get_data ("isleft")) {
+               type = LeftFrameHandle;
+       } else {
+               type = RightFrameHandle;
+       }
+
+       switch (event->type) {
+       case GDK_BUTTON_PRESS:
+       case GDK_2BUTTON_PRESS:
+       case GDK_3BUTTON_PRESS:
+               clicked_regionview = rv;
+               clicked_control_point = 0;
+               clicked_axisview = &clicked_regionview->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+               ret = button_press_handler (item, event, type);
+               break;
+       case GDK_BUTTON_RELEASE:
+               ret = button_release_handler (item, event, type);
+               break;
+       case GDK_MOTION_NOTIFY:
+               ret = motion_handler (item, event);
+               break;
+       case GDK_ENTER_NOTIFY:
+               set_entered_regionview (rv);
+               ret = enter_handler (item, event, type);
+               break;
+
+       case GDK_LEAVE_NOTIFY:
+               set_entered_regionview (0);
+               ret = leave_handler (item, event, type);
+               break;
+
+       default:
+               break;
+       }
+
        return ret;
 }
 
@@ -804,7 +841,7 @@ bool
 Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv)
 {
        bool ret = false;
-       
+
        if (!rv->sensitive()) {
                return false;
        }
@@ -823,13 +860,16 @@ Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::
                ret = button_release_handler (item, event, RegionViewNameHighlight);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, RegionViewNameHighlight);
+               motion_handler (item, event);
+               ret = true; // force this to avoid progagating the event into the regionview
                break;
        case GDK_ENTER_NOTIFY:
+               set_entered_regionview (rv);
                ret = enter_handler (item, event, RegionViewNameHighlight);
                break;
 
        case GDK_LEAVE_NOTIFY:
+               set_entered_regionview (0);
                ret = leave_handler (item, event, RegionViewNameHighlight);
                break;
 
@@ -863,13 +903,15 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item
                ret = button_release_handler (item, event, RegionViewName);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, RegionViewName);
+               ret = motion_handler (item, event);
                break;
        case GDK_ENTER_NOTIFY:
+               set_entered_regionview (rv);
                ret = enter_handler (item, event, RegionViewName);
                break;
 
        case GDK_LEAVE_NOTIFY:
+               set_entered_regionview (0);
                ret = leave_handler (item, event, RegionViewName);
                break;
 
@@ -881,7 +923,46 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item
 }
 
 bool
-Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Marker* marker)
+Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView*)
+{
+       bool ret = false;
+
+       switch (event->type) {
+       case GDK_BUTTON_PRESS:
+       case GDK_2BUTTON_PRESS:
+       case GDK_3BUTTON_PRESS:
+               clicked_regionview = 0;
+               clicked_control_point = 0;
+               clicked_axisview = 0;
+               clicked_routeview = 0; //dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+               ret = button_press_handler (item, event, FeatureLineItem);
+               break;
+
+       case GDK_BUTTON_RELEASE:
+               ret = button_release_handler (item, event, FeatureLineItem);
+               break;
+
+       case GDK_MOTION_NOTIFY:
+               ret = motion_handler (item, event);
+               break;
+
+       case GDK_ENTER_NOTIFY:
+               ret = enter_handler (item, event, FeatureLineItem);
+               break;
+
+       case GDK_LEAVE_NOTIFY:
+               ret = leave_handler (item, event, FeatureLineItem);
+               break;
+
+       default:
+               break;
+       }
+
+       return ret;
+}
+
+bool
+Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Marker* /*marker*/)
 {
        return typed_event (item, event, MarkerItem);
 }
@@ -911,13 +992,13 @@ Editor::canvas_cd_marker_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
 }
 
 bool
-Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, TempoMarker* marker)
+Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, TempoMarker* /*marker*/)
 {
        return typed_event (item, event, TempoMarkerItem);
 }
 
 bool
-Editor::canvas_meter_marker_event (GdkEvent *event, ArdourCanvas::Item* item, MeterMarker* marker)
+Editor::canvas_meter_marker_event (GdkEvent *event, ArdourCanvas::Item* item, MeterMarker* /*marker*/)
 {
        return typed_event (item, event, MeterMarkerItem);
 }
@@ -946,3 +1027,114 @@ Editor::canvas_zoom_rect_event (GdkEvent *event, ArdourCanvas::Item* item)
        return typed_event (item, event, NoItem);
 }
 
+bool
+Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item)
+{
+       if (!internal_editing()) {
+               return false;
+       }
+
+       return typed_event (item, event, NoteItem);
+}
+
+bool
+Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/, int x, int y, guint /*time*/)
+{
+       double wx;
+       double wy;
+       track_canvas->window_to_world (x, y, wx, wy);
+
+       GdkEvent event;
+       event.type = GDK_MOTION_NOTIFY;
+       event.button.x = wx;
+       event.button.y = wy;
+       /* assume we're dragging with button 1 */
+       event.motion.state = Gdk::BUTTON1_MASK;
+
+       if (!_drags->active ()) {
+
+               double px;
+               double py;
+               framepos_t const pos = event_frame (&event, &px, &py);
+
+               std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
+               if (tv.first == 0) {
+                       return true;
+               }
+
+               RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (tv.first);
+               if (rtav == 0 || !rtav->is_track ()) {
+                       return true;
+               }
+
+               boost::shared_ptr<Region> region = _regions->get_dragged_region ();
+
+               if (!region) {
+                       return true;
+               }
+
+               boost::shared_ptr<Region> region_copy = RegionFactory::create (region);
+
+               if (boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 &&
+                   dynamic_cast<AudioTimeAxisView*> (tv.first) == 0) {
+
+                       /* audio -> non-audio */
+                       return true;
+               }
+
+               if (boost::dynamic_pointer_cast<MidiRegion> (region_copy) == 0 &&
+                   dynamic_cast<MidiTimeAxisView*> (tv.first) != 0) {
+
+                       /* MIDI -> non-MIDI */
+                       return true;
+               }
+
+               _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
+       }
+
+       _drags->motion_handler (&event, false);
+
+       return true;
+}
+
+bool
+Editor::key_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType)
+{
+       return false;
+}
+
+bool
+Editor::key_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType type)
+{
+
+       bool handled = false;
+
+       switch (type) {
+       case TempoMarkerItem:
+               switch (event->key.keyval) {
+               case GDK_Delete:
+                       remove_tempo_marker (item);
+                       handled = true;
+                       break;
+               default:
+                       break;
+               }
+               break;
+
+       case MeterMarkerItem:
+               switch (event->key.keyval) {
+               case GDK_Delete:
+                       remove_meter_marker (item);
+                       handled = true;
+                       break;
+               default:
+                       break;
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       return handled;
+}