forward port recent mixbus change so that side-scroll is now shift-wheel and height...
[ardour.git] / gtk2_ardour / editor_canvas_events.cc
index 060b7d4842e35e094e729ad98caeb9e291c55ee1..fd44ed3f2e3780d5fc3c4106675dbdff17517c39 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
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
 #include <cmath>
+#include <algorithm>
+#include <typeinfo>
 
-#include <gtk-canvas.h>
+#include "pbd/stacktrace.h"
 
-#include <ardour/diskstream.h>
-#include <ardour/audioplaylist.h>
+#include "ardour/midi_region.h"
+#include "ardour/region_factory.h"
+#include "ardour/profile.h"
 
 #include "editor.h"
+#include "keyboard.h"
 #include "public_editor.h"
-#include "regionview.h"
-#include "streamview.h"
-#include "crossfade_view.h"
+#include "audio_region_view.h"
+#include "audio_streamview.h"
+#include "canvas-noevent-text.h"
 #include "audio_time_axis.h"
 #include "region_gain_line.h"
-#include "automation_gain_line.h"
-#include "automation_pan_line.h"
+#include "automation_line.h"
 #include "automation_time_axis.h"
-#include "redirect_automation_line.h"
+#include "automation_line.h"
+#include "control_point.h"
+#include "canvas_impl.h"
+#include "simplerect.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;
 
-gint
-Editor::_canvas_copy_region_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       Editor* editor = (Editor*)data;
-       return editor->canvas_copy_region_event (item, event);
-}
-
-gint
-Editor::_canvas_crossfade_view_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       CrossfadeView* xfv = static_cast<CrossfadeView*> (data);
-       Editor* editor = dynamic_cast<Editor*>(&xfv->get_time_axis_view().editor);
-       return editor->canvas_crossfade_view_event (item, event, xfv);
-}
-
-gint
-Editor::_canvas_fade_in_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       AudioRegionView* rv = static_cast<AudioRegionView*> (data);
-       Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
-       return editor->canvas_fade_in_event (item, event, rv);
-}
-
-gint
-Editor::_canvas_fade_in_handle_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       AudioRegionView* rv = static_cast<AudioRegionView*> (data);
-       Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
-       return editor->canvas_fade_in_handle_event (item, event, rv);
-}
-
-gint
-Editor::_canvas_fade_out_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       AudioRegionView* rv = static_cast<AudioRegionView*> (data);
-       Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
-       return editor->canvas_fade_out_event (item, event, rv);
-}
+using Gtkmm2ext::Keyboard;
 
-gint
-Editor::_canvas_fade_out_handle_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
+bool
+Editor::track_canvas_scroll (GdkEventScroll* ev)
 {
-       AudioRegionView* rv = static_cast<AudioRegionView*> (data);
-       Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
-       return editor->canvas_fade_out_handle_event (item, event, rv);
-}
-
-gint
-Editor::_canvas_region_view_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       AudioRegionView *rv = reinterpret_cast<AudioRegionView *>(data);
-       Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
-
-       return editor->canvas_region_view_event (item, event, rv);
-}
-
-gint
-Editor::_canvas_region_view_name_highlight_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       AudioRegionView *rv = reinterpret_cast<AudioRegionView *> (data);
-       Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
-
-       return editor->canvas_region_view_name_highlight_event (item, event);
-}
-
-gint
-Editor::_canvas_region_view_name_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       AudioRegionView *rv = reinterpret_cast<AudioRegionView *> (data);
-       Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
-       
-       return editor->canvas_region_view_name_event (item, event);
-}
-
-gint
-Editor::_canvas_stream_view_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       /* note that stream views are by definition audio track views */
-
-       AudioTimeAxisView *tv = (AudioTimeAxisView *) data;
-       Editor* editor = dynamic_cast<Editor*>(&tv->editor);
-
-       return editor->canvas_stream_view_event (item, event, tv);
-}
-
-gint
-Editor::_canvas_automation_track_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       AutomationTimeAxisView* atv = (AutomationTimeAxisView*) data;
-       Editor* editor = dynamic_cast<Editor*>(&atv->editor);
+       framepos_t xdelta;
+       int direction = ev->direction;
+
+  retry:
+       switch (direction) {
+       case GDK_SCROLL_UP:
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                       //for mouse-wheel zoom, force zoom-focus to mouse
+                       Editing::ZoomFocus temp_focus = zoom_focus;
+                       zoom_focus = Editing::ZoomFocusMouse;
+                       temporal_zoom_step (false);
+                       zoom_focus = temp_focus;
+                       return true;
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+                       direction = GDK_SCROLL_LEFT;
+                       goto retry;
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+                       if (!current_stepping_trackview) {
+                               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;
+                               }
+                       }
+                       last_track_height_step_timestamp = get_microseconds();
+                       current_stepping_trackview->step_height (false);
+                       return true;
+               } else {
+                       scroll_tracks_up_line ();
+                       return true;
+               }
+               break;
 
-       return editor->canvas_automation_track_event (item, event, atv);
-}
+       case GDK_SCROLL_DOWN:
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                       //for mouse-wheel zoom, force zoom-focus to mouse
+                       Editing::ZoomFocus temp_focus = zoom_focus;
+                       zoom_focus = Editing::ZoomFocusMouse;
+                       temporal_zoom_step (true);
+                       zoom_focus = temp_focus;
+                       return true;
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+                       direction = GDK_SCROLL_RIGHT;
+                       goto retry;
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+                       if (!current_stepping_trackview) {
+                               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;
+                               }
+                       }
+                       last_track_height_step_timestamp = get_microseconds();
+                       current_stepping_trackview->step_height (true);
+                       return true;
+               } else {
+                       scroll_tracks_down_line ();
+                       return true;
+               }
+               break;
 
-gint
-Editor::_canvas_control_point_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       ControlPoint *cp = reinterpret_cast<ControlPoint *>(data);
-       Editor* editor = dynamic_cast<Editor*>(&cp->line.trackview.editor);
+       case GDK_SCROLL_LEFT:
+               xdelta = (current_page_frames() / 8);
+               if (leftmost_frame > xdelta) {
+                       reset_x_origin (leftmost_frame - xdelta);
+               } else {
+                       reset_x_origin (0);
+               }
+               break;
 
-       switch (event->type) {
-       case GDK_BUTTON_PRESS:
-       case GDK_2BUTTON_PRESS:
-       case GDK_3BUTTON_PRESS:
-               clicked_control_point = cp;
-               clicked_trackview = &cp->line.trackview;
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
-               clicked_regionview = 0;
+       case GDK_SCROLL_RIGHT:
+               xdelta = (current_page_frames() / 8);
+               if (max_framepos - xdelta > leftmost_frame) {
+                       reset_x_origin (leftmost_frame + xdelta);
+               } else {
+                       reset_x_origin (max_framepos - current_page_frames());
+               }
                break;
 
        default:
+               /* what? */
                break;
        }
 
-       return editor->canvas_control_point_event (item, event);
+       return false;
 }
 
-gint
-Editor::_canvas_line_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
+bool
+Editor::track_canvas_scroll_event (GdkEventScroll *event)
 {
-       AutomationLine *line = reinterpret_cast<AutomationLine*> (data);
-       Editor* editor = dynamic_cast<Editor*>(&line->trackview.editor);
-
-       return editor->canvas_line_event (item, event);
+       track_canvas->grab_focus();
+       return track_canvas_scroll (event);
 }
 
-gint
-Editor::_canvas_tempo_marker_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
+bool
+Editor::track_canvas_button_press_event (GdkEventButton */*event*/)
 {
-       Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
-       return editor->canvas_tempo_marker_event (item, event);
+       selection->clear ();
+       track_canvas->grab_focus();
+       return false;
 }
 
-gint
-Editor::_canvas_meter_marker_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
+bool
+Editor::track_canvas_button_release_event (GdkEventButton *event)
 {
-       Editor* editor = dynamic_cast<Editor*>((PublicEditor *) data);
-       return editor->canvas_meter_marker_event (item, event);
-}
-
-gint
-Editor::_canvas_tempo_bar_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       /* XXX NO CAST */
-       Editor* editor = (Editor*) data;
-       return editor->canvas_tempo_bar_event (item, event);
-}
-
-gint
-Editor::_canvas_meter_bar_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       /* XXX NO CAST */
-       Editor* editor = (Editor*) data;
-       return editor->canvas_meter_bar_event (item, event);
-}
-
-gint
-Editor::_canvas_marker_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
-       return editor->canvas_marker_event (item, event);
-}
-
-gint
-Editor::_canvas_marker_bar_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       /* NO CAST */
-       Editor* editor = (Editor*) data;
-       return editor->canvas_marker_bar_event (item, event);
-}
-
-gint
-Editor::_canvas_range_marker_bar_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       /* NO CAST */
-       Editor* editor = (Editor*) data;
-       return editor->canvas_range_marker_bar_event (item, event);
-}
-
-gint
-Editor::_canvas_transport_marker_bar_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       /* NO CAST */
-       Editor* editor = (Editor*) data;
-       return editor->canvas_transport_marker_bar_event (item, event);
-}
-
-gint
-Editor::_canvas_playhead_cursor_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       /* NO CAST */
-       Editor* editor = (Editor*) data;
-       return editor->canvas_playhead_cursor_event (item, event);
-}
-
-gint
-Editor::_canvas_edit_cursor_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       /* NO CAST */
-       Editor* editor = (Editor*) data;
-       return editor->canvas_edit_cursor_event (item, event);
-}
-
-gint
-Editor::_canvas_zoom_rect_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
-       return editor->canvas_zoom_rect_event (item, event);
-}
-
-gint
-Editor::_canvas_selection_rect_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
-       return editor->canvas_selection_rect_event (item, event);
-}
-
-gint
-Editor::_canvas_selection_start_trim_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
-       return editor->canvas_selection_start_trim_event (item, event);
-}
-
-gint
-Editor::_canvas_selection_end_trim_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
-       Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
-       return editor->canvas_selection_end_trim_event (item, event);
+       if (_drags->active ()) {
+               _drags->end_grab ((GdkEvent*) event);
+       }
+       return false;
 }
 
-gint
-Editor::_track_canvas_event (GtkCanvasItem *item, GdkEvent *event, gpointer data)
+bool
+Editor::track_canvas_motion_notify_event (GdkEventMotion */*event*/)
 {
-       /* NO CAST */
-
-       Editor* editor = (Editor*) data;
-       return editor->track_canvas_event (item, event);
+       int x, y;
+       /* keep those motion events coming */
+       track_canvas->get_pointer (x, y);
+       return false;
 }
 
-/********** END OF.TATIC EVENT HANDLERS */
-
-gint
-Editor::track_canvas_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::track_canvas_motion (GdkEvent *ev)
 {
-       gint x, y;
-
-       switch (event->type) {
-       case GDK_MOTION_NOTIFY:
-               /* keep those motion events coming */
-               track_canvas->get_pointer (x, y);
-               return track_canvas_motion (item, event);
-
-       case GDK_BUTTON_RELEASE:
-               switch (event->button.button) {
-               case 4:
-               case 5:
-                       button_release_handler (item, event, NoItem);
-                       break;
-               }
-               break;
-
-       default:
-               break;
+       if (_verbose_cursor->visible ()) {
+               _verbose_cursor->set_position (ev->motion.x + 10, ev->motion.y + 10);
        }
 
-       return FALSE;
+       return false;
 }
 
-gint
-Editor::track_canvas_motion (GtkCanvasItem *item, GdkEvent *ev)
-{
-       if (verbose_cursor_visible) {
-               gtk_canvas_item_set (verbose_canvas_cursor,
-                                    "x", ev->motion.x + 20,
-                                    "y", ev->motion.y + 20,
-                                    NULL);
-       }
-       return FALSE;
-}
-
-gint
-Editor::typed_event (GtkCanvasItem *item, GdkEvent *event, ItemType type)
+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:
@@ -340,7 +207,7 @@ Editor::typed_event (GtkCanvasItem *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:
@@ -351,26 +218,37 @@ Editor::typed_event (GtkCanvasItem *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;
        }
-                       
        return ret;
 }
 
-gint
-Editor::canvas_region_view_event (GtkCanvasItem *item, GdkEvent *event, AudioRegionView *rv)
+bool
+Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView *rv)
 {
-       gint ret = FALSE;
-       
+       bool ret = false;
+
+       if (!rv->sensitive ()) {
+               return false;
+       }
+
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
        case GDK_3BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, RegionItem);
                break;
 
@@ -379,14 +257,16 @@ Editor::canvas_region_view_event (GtkCanvasItem *item, GdkEvent *event, AudioReg
                break;
 
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, RegionItem);
+               ret = motion_handler (item, event);
                break;
 
        case GDK_ENTER_NOTIFY:
+               set_entered_track (&rv->get_time_axis_view ());
                set_entered_regionview (rv);
                break;
 
        case GDK_LEAVE_NOTIFY:
+               set_entered_track (0);
                set_entered_regionview (0);
                break;
 
@@ -397,19 +277,19 @@ Editor::canvas_region_view_event (GtkCanvasItem *item, GdkEvent *event, AudioReg
        return ret;
 }
 
-gint
-Editor::canvas_stream_view_event (GtkCanvasItem *item, GdkEvent *event, AudioTimeAxisView *tv)
+bool
+Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, RouteTimeAxisView *tv)
 {
-       gint ret = FALSE;
-       
+       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_trackview = tv;
-               clicked_audio_trackview = tv;
+               clicked_axisview = tv;
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, StreamItem);
                break;
 
@@ -418,10 +298,15 @@ Editor::canvas_stream_view_event (GtkCanvasItem *item, GdkEvent *event, AudioTim
                break;
 
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, StreamItem);
+               ret = motion_handler (item, event);
                break;
 
        case GDK_ENTER_NOTIFY:
+               set_entered_track (tv);
+               break;
+
+       case GDK_LEAVE_NOTIFY:
+               set_entered_track (0);
                break;
 
        default:
@@ -431,21 +316,19 @@ Editor::canvas_stream_view_event (GtkCanvasItem *item, GdkEvent *event, AudioTim
        return ret;
 }
 
-
-
-gint
-Editor::canvas_automation_track_event (GtkCanvasItem *item, GdkEvent *event, AutomationTimeAxisView *atv)
+bool
+Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item, AutomationTimeAxisView *atv)
 {
-       gint ret = FALSE;
-       
+       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_trackview = atv;
-               clicked_audio_trackview = 0;
+               clicked_axisview = atv;
+               clicked_routeview = 0;
                ret = button_press_handler (item, event, AutomationTrackItem);
                break;
 
@@ -454,7 +337,7 @@ Editor::canvas_automation_track_event (GtkCanvasItem *item, GdkEvent *event, Aut
                break;
 
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, AutomationTrackItem);
+               ret = motion_handler (item, event);
                break;
 
        case GDK_ENTER_NOTIFY:
@@ -472,17 +355,91 @@ Editor::canvas_automation_track_event (GtkCanvasItem *item, GdkEvent *event, Aut
        return ret;
 }
 
-gint
-Editor::canvas_fade_in_event (GtkCanvasItem *item, GdkEvent *event, AudioRegionView *rv)
+bool
+Editor::canvas_start_xfade_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
+{
+       if (!rv->sensitive()) {
+               return false;
+       }
+
+       switch (event->type) {
+       case GDK_BUTTON_PRESS:
+               clicked_regionview = rv;
+               clicked_control_point = 0;
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+               if (event->button.button == 3) {
+                       return button_press_handler (item, event, StartCrossFadeItem);
+               }
+               break;
+
+       case GDK_BUTTON_RELEASE:
+               if (event->button.button == 3) {
+                       return button_release_handler (item, event, StartCrossFadeItem);
+               }
+               break;
+
+       default:
+               break;
+
+       }
+
+       /* In Mixbus, the crossfade area is used to trim the region while leaving the fade anchor intact (see preserve_fade_anchor)*/
+       /* however in A3 this feature is unfinished, and it might be better to do it with a modifier-trim instead, anyway */
+       /* if we return RegionItem here then we avoid the issue until it is resolved later */
+       return typed_event (item, event, RegionItem); // StartCrossFadeItem);
+}
+
+bool
+Editor::canvas_end_xfade_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
+{
+       if (!rv->sensitive()) {
+               return false;
+       }
+
+       switch (event->type) {
+       case GDK_BUTTON_PRESS:
+               clicked_regionview = rv;
+               clicked_control_point = 0;
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+               if (event->button.button == 3) {
+                       return button_press_handler (item, event, EndCrossFadeItem);
+               }
+               break;
+
+       case GDK_BUTTON_RELEASE:
+               if (event->button.button == 3) {
+                       return button_release_handler (item, event, EndCrossFadeItem);
+               }
+               break;
+
+       default:
+               break;
+
+       }
+
+       /* In Mixbus, the crossfade area is used to trim the region while leaving the fade anchor intact (see preserve_fade_anchor)*/
+       /* however in A3 this feature is unfinished, and it might be better to do it with a modifier-trim instead, anyway */
+       /* if we return RegionItem here then we avoid the issue until it is resolved later */
+       return typed_event (item, event, RegionItem); // EndCrossFadeItem);
+}
+
+bool
+Editor::canvas_fade_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
 {
        /* we handle only button 3 press/release events */
 
+       if (!rv->sensitive()) {
+               return false;
+       }
+
        switch (event->type) {
        case GDK_BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                if (event->button.button == 3) {
                        return button_press_handler (item, event, FadeInItem);
                }
@@ -496,43 +453,50 @@ Editor::canvas_fade_in_event (GtkCanvasItem *item, GdkEvent *event, AudioRegionV
 
        default:
                break;
-               
+
        }
 
        /* proxy for the regionview */
-       
-       return canvas_region_view_event (rv->get_canvas_group(), event, rv);
+
+       return canvas_region_view_event (event, rv->get_canvas_group(), rv);
 }
 
-gint
-Editor::canvas_fade_in_handle_event (GtkCanvasItem *item, GdkEvent *event, AudioRegionView *rv)
+bool
+Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
 {
-       gint ret = FALSE;
-       
+       bool ret = false;
+
+       if (!rv->sensitive()) {
+               return false;
+       }
+
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
        case GDK_3BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, FadeInHandleItem);
                break;
 
        case GDK_BUTTON_RELEASE:
                ret = button_release_handler (item, event, FadeInHandleItem);
+               maybe_locate_with_edit_preroll ( rv->region()->position() );
                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;
 
@@ -543,17 +507,21 @@ Editor::canvas_fade_in_handle_event (GtkCanvasItem *item, GdkEvent *event, Audio
        return ret;
 }
 
-gint
-Editor::canvas_fade_out_event (GtkCanvasItem *item, GdkEvent *event, AudioRegionView *rv)
+bool
+Editor::canvas_fade_out_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
 {
        /* we handle only button 3 press/release events */
 
+       if (!rv->sensitive()) {
+               return false;
+       }
+
        switch (event->type) {
        case GDK_BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                if (event->button.button == 3) {
                        return button_press_handler (item, event, FadeOutItem);
                }
@@ -567,43 +535,50 @@ Editor::canvas_fade_out_event (GtkCanvasItem *item, GdkEvent *event, AudioRegion
 
        default:
                break;
-               
+
        }
 
        /* proxy for the regionview */
-       
-       return canvas_region_view_event (rv->get_canvas_group(), event, rv);
+
+       return canvas_region_view_event (event, rv->get_canvas_group(), rv);
 }
 
-gint
-Editor::canvas_fade_out_handle_event (GtkCanvasItem *item, GdkEvent *event, AudioRegionView *rv)
+bool
+Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
 {
-       gint ret = FALSE;
-       
+       bool ret = false;
+
+       if (!rv->sensitive()) {
+               return false;
+       }
+
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
        case GDK_3BUTTON_PRESS:
                clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &rv->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                ret = button_press_handler (item, event, FadeOutHandleItem);
                break;
 
        case GDK_BUTTON_RELEASE:
                ret = button_release_handler (item, event, FadeOutHandleItem);
+               maybe_locate_with_edit_preroll ( rv->region()->last_frame() - rv->get_fade_out_shape_width() );
                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;
 
@@ -615,135 +590,55 @@ Editor::canvas_fade_out_handle_event (GtkCanvasItem *item, GdkEvent *event, Audi
 }
 
 struct DescendingRegionLayerSorter {
-    bool operator()(Region* a, Region* b) {
+    bool operator()(boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
            return a->layer() > b->layer();
     }
 };
 
-gint
-Editor::canvas_crossfade_view_event (GtkCanvasItem* item, GdkEvent* event, CrossfadeView* xfv)
+bool
+Editor::canvas_control_point_event (GdkEvent *event, ArdourCanvas::Item* item, ControlPoint* cp)
 {
-       /* we handle only button 3 press/release events */
-
        switch (event->type) {
        case GDK_BUTTON_PRESS:
-               clicked_crossfadeview = xfv;
-               clicked_trackview = &clicked_crossfadeview->get_time_axis_view();
-               if (event->button.button == 3) {
-                       return button_press_handler (item, event, CrossfadeViewItem);
-               } 
+       case GDK_2BUTTON_PRESS:
+       case GDK_3BUTTON_PRESS:
+               clicked_control_point = cp;
+               clicked_axisview = &cp->line().trackview;
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+               clicked_regionview = 0;
                break;
 
-       case GDK_BUTTON_RELEASE:
-               if (event->button.button == 3) {
-                       gint ret = button_release_handler (item, event, CrossfadeViewItem);
-                       return ret;
-               }
+       case GDK_SCROLL_UP:
                break;
 
-       default:
+       case GDK_SCROLL_DOWN:
                break;
-               
-       }
-
-       
-       /* proxy for the upper most regionview */
-
-       /* XXX really need to check if we are in the name highlight,
-          and proxy to that when required.
-       */
-       
-       TimeAxisView& tv (xfv->get_time_axis_view());
-       AudioTimeAxisView* atv;
-
-       if ((atv = dynamic_cast<AudioTimeAxisView*>(&tv)) != 0) {
-
-               if (atv->is_audio_track()) {
-
-                       AudioPlaylist* pl = atv->get_diskstream()->playlist();
-                       Playlist::RegionList* rl = pl->regions_at (event_frame (event));
 
-                       if (!rl->empty()) {
-                               DescendingRegionLayerSorter cmp;
-                               rl->sort (cmp);
-
-                               AudioRegionView* arv = atv->view->find_view (*(dynamic_cast<AudioRegion*> (rl->front())));
-
-                               /* proxy */
-                               
-                               delete rl;
-
-                               return canvas_region_view_event (arv->get_canvas_group(), event, arv);
-                       }
-               }
-       }
-
-       return TRUE;
-}
-
-gint
-Editor::canvas_control_point_event (GtkCanvasItem *item, GdkEvent *event)
-{
-       ItemType type;
-       ControlPoint *cp;
-       
-       if ((cp = static_cast<ControlPoint *> (gtk_object_get_data (GTK_OBJECT(item), "control_point"))) == 0) {
-               fatal << _("programming error: control point canvas item has no control point object pointer!") << endmsg;
-               /*NOTREACHED*/
-       }
-
-       if (dynamic_cast<AudioRegionGainLine*> (&cp->line) != 0) {
-               type = GainControlPointItem;
-       } else if (dynamic_cast<AutomationGainLine*> (&cp->line) != 0) {
-               type = GainAutomationControlPointItem;
-       } else if (dynamic_cast<AutomationPanLine*> (&cp->line) != 0) {
-               type = PanAutomationControlPointItem;
-       } else if (dynamic_cast<RedirectAutomationLine*> (&cp->line) != 0) {
-               type = RedirectAutomationControlPointItem;
-       } else {
-               return FALSE;
+       default:
+               break;
        }
 
-       return typed_event (item, event, type);
+       return typed_event (item, event, ControlPointItem);
 }
 
-gint
-Editor::canvas_line_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_line_event (GdkEvent *event, ArdourCanvas::Item* item, AutomationLine* al)
 {
        ItemType type;
-       AutomationLine *al;
-       
-       if ((al = static_cast<AutomationLine *> (gtk_object_get_data (GTK_OBJECT(item), "line"))) == 0) {
-               fatal << _("programming error: line canvas item has no line object pointer!") << endmsg;
-               /*NOTREACHED*/
-       }
 
        if (dynamic_cast<AudioRegionGainLine*> (al) != 0) {
                type = GainLineItem;
-       } else if (dynamic_cast<AutomationGainLine*> (al) != 0) {
-               type = GainAutomationLineItem;
-       } else if (dynamic_cast<AutomationPanLine*> (al) != 0) {
-               type = PanAutomationLineItem;
-       } else if (dynamic_cast<RedirectAutomationLine*> (al) != 0) {
-               type = RedirectAutomationLineItem;
        } else {
-               return FALSE;
+               type = AutomationLineItem;
        }
 
        return typed_event (item, event, type);
 }
 
-
-gint
-Editor::canvas_selection_rect_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_selection_rect_event (GdkEvent *event, ArdourCanvas::Item* item, SelectionRect* rect)
 {
-       gint ret = FALSE;
-       SelectionRect *rect = 0;
-
-       if ((rect = reinterpret_cast<SelectionRect*> (gtk_object_get_data (GTK_OBJECT(item), "rect"))) == 0) {
-               fatal << _("programming error: no \"rect\" pointer associated with selection item") << endmsg;
-               /*NOTREACHED*/
-       }
+       bool ret = false;
 
        switch (event->type) {
        case GDK_BUTTON_PRESS:
@@ -756,7 +651,7 @@ Editor::canvas_selection_rect_event (GtkCanvasItem *item, GdkEvent *event)
                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:
@@ -770,20 +665,14 @@ Editor::canvas_selection_rect_event (GtkCanvasItem *item, GdkEvent *event)
        default:
                break;
        }
-                       
+
        return ret;
 }
 
-gint
-Editor::canvas_selection_start_trim_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_selection_start_trim_event (GdkEvent *event, ArdourCanvas::Item* item, SelectionRect* rect)
 {
-       gint ret = FALSE;
-       SelectionRect *rect = 0;
-
-       if ((rect = reinterpret_cast<SelectionRect*> (gtk_object_get_data (GTK_OBJECT(item), "rect"))) == 0) {
-               fatal << _("programming error: no \"rect\" pointer associated with selection item") << endmsg;
-               /*NOTREACHED*/
-       }
+       bool ret = false;
 
        switch (event->type) {
        case GDK_BUTTON_PRESS:
@@ -796,7 +685,7 @@ Editor::canvas_selection_start_trim_event (GtkCanvasItem *item, GdkEvent *event)
                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);
@@ -809,20 +698,14 @@ Editor::canvas_selection_start_trim_event (GtkCanvasItem *item, GdkEvent *event)
        default:
                break;
        }
-                       
+
        return ret;
 }
 
-gint
-Editor::canvas_selection_end_trim_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_selection_end_trim_event (GdkEvent *event, ArdourCanvas::Item* item, SelectionRect* rect)
 {
-       gint ret = FALSE;
-       SelectionRect *rect = 0;
-
-       if ((rect = reinterpret_cast<SelectionRect*> (gtk_object_get_data (GTK_OBJECT(item), "rect"))) == 0) {
-               fatal << _("programming error: no \"rect\" pointer associated with selection item") << endmsg;
-               /*NOTREACHED*/
-       }
+       bool ret = false;
 
        switch (event->type) {
        case GDK_BUTTON_PRESS:
@@ -835,7 +718,7 @@ Editor::canvas_selection_end_trim_event (GtkCanvasItem *item, GdkEvent *event)
                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);
@@ -848,38 +731,103 @@ Editor::canvas_selection_end_trim_event (GtkCanvasItem *item, GdkEvent *event)
        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;
 }
 
 
-gint
-Editor::canvas_region_view_name_highlight_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv)
 {
-       gint ret = FALSE;
+       bool ret = false;
+
+       if (!rv->sensitive()) {
+               return false;
+       }
 
        switch (event->type) {
        case GDK_BUTTON_PRESS:
        case GDK_2BUTTON_PRESS:
        case GDK_3BUTTON_PRESS:
-               clicked_regionview = reinterpret_cast<AudioRegionView *> (gtk_object_get_data(GTK_OBJECT(item), "regionview"));
+               clicked_regionview = rv;
                clicked_control_point = 0;
-               clicked_trackview = &clicked_regionview->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
-               ret = button_press_handler (item, event, AudioRegionViewNameHighlight);
+               clicked_axisview = &clicked_regionview->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+               ret = button_press_handler (item, event, RegionViewNameHighlight);
                break;
        case GDK_BUTTON_RELEASE:
-               ret = button_release_handler (item, event, AudioRegionViewNameHighlight);
+               ret = button_release_handler (item, event, RegionViewNameHighlight);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, AudioRegionViewNameHighlight);
+               motion_handler (item, event);
+               ret = true; // force this to avoid progagating the event into the regionview
                break;
        case GDK_ENTER_NOTIFY:
-               ret = enter_handler (item, event, AudioRegionViewNameHighlight);
+               set_entered_regionview (rv);
+               ret = enter_handler (item, event, RegionViewNameHighlight);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               ret = leave_handler (item, event, AudioRegionViewNameHighlight);
+               set_entered_regionview (0);
+               ret = leave_handler (item, event, RegionViewNameHighlight);
                break;
 
        default:
@@ -889,33 +837,78 @@ Editor::canvas_region_view_name_highlight_event (GtkCanvasItem *item, GdkEvent *
        return ret;
 }
 
-gint
-Editor::canvas_region_view_name_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView* rv)
 {
-       gint ret = FALSE;
+       bool ret = false;
+
+       if (!rv->sensitive()) {
+               return false;
+       }
+
+       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, RegionViewName);
+               break;
+       case GDK_BUTTON_RELEASE:
+               ret = button_release_handler (item, event, RegionViewName);
+               break;
+       case GDK_MOTION_NOTIFY:
+               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;
+
+       default:
+               break;
+       }
+
+       return ret;
+}
+
+bool
+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 = reinterpret_cast<AudioRegionView *> (gtk_object_get_data(GTK_OBJECT(item), "regionview"));
+               clicked_regionview = 0;
                clicked_control_point = 0;
-               clicked_trackview = &clicked_regionview->get_time_axis_view();
-               clicked_audio_trackview = dynamic_cast<AudioTimeAxisView*>(clicked_trackview);
-               ret = button_press_handler (item, event, AudioRegionViewName);
+               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, AudioRegionViewName);
+               ret = button_release_handler (item, event, FeatureLineItem);
                break;
+
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event, AudioRegionViewName);
+               ret = motion_handler (item, event);
                break;
+
        case GDK_ENTER_NOTIFY:
-               ret = enter_handler (item, event, AudioRegionViewName);
+               ret = enter_handler (item, event, FeatureLineItem);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               ret = leave_handler (item, event, AudioRegionViewName);
+               ret = leave_handler (item, event, FeatureLineItem);
                break;
 
        default:
@@ -925,75 +918,275 @@ Editor::canvas_region_view_name_event (GtkCanvasItem *item, GdkEvent *event)
        return ret;
 }
 
-gint
-Editor::canvas_marker_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Marker* /*marker*/)
 {
        return typed_event (item, event, MarkerItem);
 }
 
-gint
-Editor::canvas_marker_bar_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_marker_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
        return typed_event (item, event, MarkerBarItem);
 }
 
-gint
-Editor::canvas_range_marker_bar_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_range_marker_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
        return typed_event (item, event, RangeMarkerBarItem);
 }
 
-gint
-Editor::canvas_transport_marker_bar_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_transport_marker_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
        return typed_event (item, event, TransportMarkerBarItem);
 }
 
-gint
-Editor::canvas_tempo_marker_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_cd_marker_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
+{
+       return typed_event (item, event, CdMarkerBarItem);
+}
+
+bool
+Editor::canvas_videotl_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
+{
+       return typed_event (item, event, VideoBarItem);
+}
+
+bool
+Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, TempoMarker* /*marker*/)
 {
        return typed_event (item, event, TempoMarkerItem);
 }
 
-gint
-Editor::canvas_meter_marker_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_meter_marker_event (GdkEvent *event, ArdourCanvas::Item* item, MeterMarker* /*marker*/)
 {
        return typed_event (item, event, MeterMarkerItem);
 }
 
-gint
-Editor::canvas_tempo_bar_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_tempo_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
        return typed_event (item, event, TempoBarItem);
 }
 
-gint
-Editor::canvas_meter_bar_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_meter_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
        return typed_event (item, event, MeterBarItem);
 }
 
-gint
-Editor::canvas_playhead_cursor_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_playhead_cursor_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
        return typed_event (item, event, PlayheadCursorItem);
 }
 
-gint
-Editor::canvas_edit_cursor_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_zoom_rect_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
-       return typed_event (item, event, EditCursorItem);
+       return typed_event (item, event, NoItem);
 }
 
-gint
-Editor::canvas_zoom_rect_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
-       return typed_event (item, event, NoItem);
+       if (!internal_editing()) {
+               return false;
+       }
+
+       return typed_event (item, event, NoteItem);
+}
+
+bool
+Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context, int x, int y, guint time)
+{
+       double wx;
+       double wy;
+       boost::shared_ptr<Region> region;
+       boost::shared_ptr<Region> region_copy;
+       RouteTimeAxisView* rtav;
+       GdkEvent event;
+       double px;
+       double py;
+
+       string target = track_canvas->drag_dest_find_target (context, track_canvas->drag_dest_get_target_list());
+
+       if (target.empty()) {
+               return false;
+       }
+
+       track_canvas->window_to_world (x, y, wx, wy);
+
+       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;
+
+       (void) event_frame (&event, &px, &py);
+
+       std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
+       bool can_drop = false;
+       
+       if (tv.first != 0) {
+
+               /* over a time axis view of some kind */
+
+               rtav = dynamic_cast<RouteTimeAxisView*> (tv.first);
+               
+               if (rtav != 0 && rtav->is_track ()) {
+                       /* over a track, not a bus */
+                       can_drop = true;
+               }
+                       
+
+       } else {
+               /* not over a time axis view, so drop is possible */
+               can_drop = true;
+       }
+
+       if (can_drop) {
+               region = _regions->get_dragged_region ();
+               
+               if (region) {
+                       
+                       if ((boost::dynamic_pointer_cast<AudioRegion> (region) != 0 &&
+                            dynamic_cast<AudioTimeAxisView*> (tv.first) != 0) ||
+                           (boost::dynamic_pointer_cast<MidiRegion> (region) != 0 &&
+                            dynamic_cast<MidiTimeAxisView*> (tv.first) != 0)) {
+                               
+                               /* audio to audio 
+                                  OR 
+                                  midi to midi
+                               */
+                               
+                               context->drag_status (context->get_suggested_action(), time);
+                               return true;
+                       }
+               } else {
+                       /* DND originating from outside ardour
+                        *
+                        * TODO: check if file is audio/midi, allow drops on same track-type only,
+                        * currently: if audio is dropped on a midi-track, it is only added to the region-list
+                        */
+                       if (Profile->get_sae() || Config->get_only_copy_imported_files()) {
+                               context->drag_status(Gdk::ACTION_COPY, time);
+                       } else {
+                               if ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY) {
+                                       context->drag_status(Gdk::ACTION_COPY, time);
+                               } else {
+                                       context->drag_status(Gdk::ACTION_LINK, time);
+                               }
+                       }
+                       return true;
+               }
+       }
+
+       /* no drop here */
+       context->drag_status (Gdk::DragAction (0), time);
+       return false;
+}
+
+void
+Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
+                     int x, int y,
+                     const SelectionData& /*data*/,
+                     guint /*info*/, guint /*time*/)
+{
+       double wx;
+       double wy;
+       boost::shared_ptr<Region> region;
+       boost::shared_ptr<Region> region_copy;
+       RouteTimeAxisView* rtav;
+       GdkEvent event;
+       double px;
+       double py;
+
+       track_canvas->window_to_world (x, y, wx, wy);
+
+       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;
+
+       framepos_t const pos = event_frame (&event, &px, &py);
+
+       std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
+
+       if (tv.first != 0) {
+
+               rtav = dynamic_cast<RouteTimeAxisView*> (tv.first);
+               
+               if (rtav != 0 && rtav->is_track ()) {
+
+                       boost::shared_ptr<Region> region = _regions->get_dragged_region ();
+                       
+                       if (region) {
+
+                               region_copy = RegionFactory::create (region, true);
+       
+
+                               if ((boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 &&
+                                   dynamic_cast<AudioTimeAxisView*> (tv.first) != 0) ||
+                                   (boost::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 &&
+                                    dynamic_cast<MidiTimeAxisView*> (tv.first) != 0)) {
+
+                                       /* audio to audio 
+                                          OR 
+                                          midi to midi
+                                       */
+
+
+                                       _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
+                                       _drags->end_grab (0);
+                               }
+                       }
+               }
+       }
 }
 
-gint
-Editor::canvas_copy_region_event (GtkCanvasItem *item, GdkEvent *event)
+bool
+Editor::key_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType)
 {
-       return typed_event (item, event, RegionItem);
+       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;
+}