enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git] / gtk2_ardour / editor_canvas_events.cc
index f7fd030a01715cb5613c8bd5df820a422edc54cd..30e2504edc927c70bcc20bbf77eb9538f94386a3 100644 (file)
 
 #include "pbd/stacktrace.h"
 
-#include "ardour/audioplaylist.h"
-#include "ardour/audioregion.h"
-#include "ardour/region_factory.h"
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
 #include "ardour/midi_region.h"
+#include "ardour/region_factory.h"
+#include "ardour/profile.h"
+
+#include "canvas/canvas.h"
+#include "canvas/text.h"
+#include "canvas/scroll_group.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 "automation_line.h"
 #include "automation_time_axis.h"
 #include "automation_line.h"
 #include "control_point.h"
-#include "canvas_impl.h"
-#include "simplerect.h"
-#include "interactive-item.h"
 #include "editor_drag.h"
 #include "midi_time_axis.h"
 #include "editor_regions.h"
+#include "ui_config.h"
+#include "verbose_cursor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -62,85 +64,81 @@ using Gtkmm2ext::Keyboard;
 bool
 Editor::track_canvas_scroll (GdkEventScroll* ev)
 {
-       int x, y;
-       double wx, wy;
-       nframes64_t xdelta;
        int direction = ev->direction;
 
-       Gnome::Canvas::Item* item = track_canvas->get_item_at(ev->x, ev->y);
-       InteractiveItem* interactive_item = dynamic_cast<InteractiveItem*>(item);
-       if (interactive_item) {
-               return interactive_item->on_event(reinterpret_cast<GdkEvent*>(ev));
-       }
+       /* this event arrives without transformation by the canvas, so we have
+        * to transform the coordinates to be able to look things up.
+        */
+
+       Duple event_coords = _track_canvas->window_to_canvas (Duple (ev->x, ev->y));
 
-  retry:
        switch (direction) {
        case GDK_SCROLL_UP:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       temporal_zoom_step (false);
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
+                       if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
+                               temporal_zoom_step_mouse_focus (false);
+                       } else {
+                               temporal_zoom_step (false);
+                       }
+                       return true;
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
+                       scroll_left_step ();
                        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)) {
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) {
                        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);
+                               std::pair<TimeAxisView*, int> const p = trackview_by_y_position (event_coords.y, false);
                                current_stepping_trackview = p.first;
                                if (!current_stepping_trackview) {
                                        return false;
                                }
                        }
                        last_track_height_step_timestamp = get_microseconds();
-                       current_stepping_trackview->step_height (true);
+                       current_stepping_trackview->step_height (false);
                        return true;
                } else {
-                       scroll_tracks_up_line ();
+                       scroll_up_one_track ();
                        return true;
                }
                break;
 
        case GDK_SCROLL_DOWN:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       temporal_zoom_step (true);
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
+                       if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
+                               temporal_zoom_step_mouse_focus (true);
+                       } else {
+                               temporal_zoom_step (true);
+                       }
+                       return true;
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
+                       scroll_right_step ();
                        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)) {
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) {
                        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);
+                               std::pair<TimeAxisView*, int> const p = trackview_by_y_position (event_coords.y, false);
                                current_stepping_trackview = p.first;
                                if (!current_stepping_trackview) {
                                        return false;
                                }
                        }
                        last_track_height_step_timestamp = get_microseconds();
-                       current_stepping_trackview->step_height (false);
+                       current_stepping_trackview->step_height (true);
                        return true;
                } else {
-                       scroll_tracks_down_line ();
+                       scroll_down_one_track ();
                        return true;
                }
                break;
 
        case GDK_SCROLL_LEFT:
-               xdelta = (current_page_frames() / 8);
-               if (leftmost_frame > xdelta) {
-                       reset_x_origin (leftmost_frame - xdelta);
-               } else {
-                       reset_x_origin (0);
-               }
+               scroll_left_step ();
+               return true;
                break;
 
        case GDK_SCROLL_RIGHT:
-               xdelta = (current_page_frames() / 8);
-               if (max_frames - xdelta > leftmost_frame) {
-                       reset_x_origin (leftmost_frame + xdelta);
-               } else {
-                       reset_x_origin (max_frames - current_page_frames());
-               }
+               scroll_right_step ();
+               return true;
                break;
 
        default:
@@ -152,27 +150,39 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 }
 
 bool
-Editor::track_canvas_scroll_event (GdkEventScroll *event)
+Editor::canvas_scroll_event (GdkEventScroll *event, bool from_canvas)
 {
-       track_canvas->grab_focus();
-       track_canvas_scroll (event);
-       return false;
+       if (from_canvas) {
+               boost::optional<ArdourCanvas::Rect> rulers = _time_markers_group->bounding_box();
+               if (rulers && rulers->contains (Duple (event->x, event->y))) {
+                       return canvas_ruler_event ((GdkEvent*) event, timecode_ruler, TimecodeRulerItem);
+               }
+       }
+
+       _track_canvas->grab_focus();
+       return track_canvas_scroll (event);
 }
 
 bool
-Editor::track_canvas_button_press_event (GdkEventButton */*event*/)
+Editor::track_canvas_button_press_event (GdkEventButton *event)
 {
-       selection->clear ();
-       track_canvas->grab_focus();
+       _track_canvas->grab_focus();
+       if (!Keyboard::is_context_menu_event (event)) {
+               begin_reversible_selection_op (X_("Clear Selection Click (track canvas)"));
+               selection->clear ();
+               commit_reversible_selection_op();
+        }
        return false;
 }
 
 bool
 Editor::track_canvas_button_release_event (GdkEventButton *event)
 {
-       if (_drags->active ()) {
-               _drags->end_grab ((GdkEvent*) event);
-       }
+       if (!Keyboard::is_context_menu_event (event)) {
+                if (_drags->active ()) {
+                        _drags->end_grab ((GdkEvent*) event);
+                }
+        }
        return false;
 }
 
@@ -181,18 +191,7 @@ Editor::track_canvas_motion_notify_event (GdkEventMotion */*event*/)
 {
        int x, y;
        /* keep those motion events coming */
-       track_canvas->get_pointer (x, y);
-       return false;
-}
-
-bool
-Editor::track_canvas_motion (GdkEvent *ev)
-{
-       if (verbose_cursor_visible) {
-               verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (ev->motion.x + 10);
-               verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 10);
-       }
-
+       _track_canvas->get_pointer (x, y);
        return false;
 }
 
@@ -222,6 +221,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;
        }
@@ -257,13 +264,15 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg
                break;
 
        case GDK_ENTER_NOTIFY:
-               set_entered_track (&rv->get_time_axis_view ());
                set_entered_regionview (rv);
+               ret = enter_handler (item, event, RegionItem);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               set_entered_track (0);
-               set_entered_regionview (0);
+               if (event->crossing.detail != GDK_NOTIFY_INFERIOR) {
+                       set_entered_regionview (0);
+                       ret = leave_handler (item, event, RegionItem);
+               }
                break;
 
        default:
@@ -273,6 +282,42 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg
        return ret;
 }
 
+bool
+Editor::canvas_wave_view_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView* rv)
+{
+       /* we only care about enter events here, required for mouse/cursor
+        * tracking. there is a non-linear (non-child/non-parent) relationship
+        * between various components of a regionview and so when we leave one
+        * of them (e.g. a trim handle) and enter another (e.g. the waveview)
+        * no other items get notified. enter/leave handling does not propagate
+        * in the same way as other events, so we need to catch this because
+        * entering (and leaving) the waveview is equivalent to
+        * entering/leaving the regionview (which is why it is passed in as a
+        * third argument).
+        *
+        * And in fact, we really only care about enter events.
+        */
+
+       bool ret = false;
+
+       if (!rv->sensitive ()) {
+               return false;
+       }
+
+       switch (event->type) {
+       case GDK_ENTER_NOTIFY:
+               set_entered_regionview (rv);
+               ret = enter_handler (item, event, WaveItem);
+               break;
+
+       default:
+               break;
+       }
+
+       return ret;
+}
+
+
 bool
 Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, RouteTimeAxisView *tv)
 {
@@ -285,7 +330,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;
 
@@ -299,10 +344,14 @@ Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, Rou
 
        case GDK_ENTER_NOTIFY:
                set_entered_track (tv);
+               ret = enter_handler (item, event, StreamItem);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               set_entered_track (0);
+               if (event->crossing.detail != GDK_NOTIFY_INFERIOR) {
+                       set_entered_track (0);
+               }
+               ret = leave_handler (item, event, StreamItem);
                break;
 
        default:
@@ -352,10 +401,8 @@ Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item
 }
 
 bool
-Editor::canvas_fade_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
+Editor::canvas_start_xfade_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
 {
-       /* we handle only button 3 press/release events */
-
        if (!rv->sensitive()) {
                return false;
        }
@@ -367,13 +414,13 @@ Editor::canvas_fade_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRe
                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);
+                       return button_press_handler (item, event, StartCrossFadeItem);
                }
                break;
 
        case GDK_BUTTON_RELEASE:
                if (event->button.button == 3) {
-                       return button_release_handler (item, event, FadeInItem);
+                       return button_release_handler (item, event, StartCrossFadeItem);
                }
                break;
 
@@ -382,56 +429,49 @@ Editor::canvas_fade_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRe
 
        }
 
-       /* proxy for the regionview */
-
-       return canvas_region_view_event (event, rv->get_canvas_group(), rv);
+       /* 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_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
+Editor::canvas_end_xfade_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
 {
-       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 = &rv->get_time_axis_view();
                clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
-               ret = button_press_handler (item, event, FadeInHandleItem);
+               if (event->button.button == 3) {
+                       return button_press_handler (item, event, EndCrossFadeItem);
+               }
                break;
 
        case GDK_BUTTON_RELEASE:
-               ret = button_release_handler (item, event, FadeInHandleItem);
-               break;
-
-       case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event);
-               break;
-
-       case GDK_ENTER_NOTIFY:
-               ret = enter_handler (item, event, FadeInHandleItem);
-               break;
-
-       case GDK_LEAVE_NOTIFY:
-               ret = leave_handler (item, event, FadeInHandleItem);
+               if (event->button.button == 3) {
+                       return button_release_handler (item, event, EndCrossFadeItem);
+               }
                break;
 
        default:
                break;
+
        }
 
-       return ret;
+       /* 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_out_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
+Editor::canvas_fade_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
 {
        /* we handle only button 3 press/release events */
 
@@ -446,13 +486,13 @@ Editor::canvas_fade_out_event (GdkEvent *event, ArdourCanvas::Item* item, AudioR
                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);
+                       return button_press_handler (item, event, FadeInItem);
                }
                break;
 
        case GDK_BUTTON_RELEASE:
                if (event->button.button == 3) {
-                       return button_release_handler (item, event, FadeOutItem);
+                       return button_release_handler (item, event, FadeInItem);
                }
                break;
 
@@ -461,13 +501,17 @@ Editor::canvas_fade_out_event (GdkEvent *event, ArdourCanvas::Item* item, AudioR
 
        }
 
-       /* proxy for the regionview */
+       /* proxy for the regionview, except enter/leave events */
 
-       return canvas_region_view_event (event, rv->get_canvas_group(), rv);
+       if (event->type == GDK_ENTER_NOTIFY || event->type == GDK_LEAVE_NOTIFY) {
+               return true;
+       } else {
+               return canvas_region_view_event (event, rv->get_canvas_group(), rv);
+       }
 }
 
 bool
-Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv)
+Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv, bool trim)
 {
        bool ret = false;
 
@@ -483,11 +527,12 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
                clicked_control_point = 0;
                clicked_axisview = &rv->get_time_axis_view();
                clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
-               ret = button_press_handler (item, event, FadeOutHandleItem);
+               ret = button_press_handler (item, event, trim ? FadeInTrimHandleItem : FadeInHandleItem);
                break;
 
        case GDK_BUTTON_RELEASE:
-               ret = button_release_handler (item, event, FadeOutHandleItem);
+               ret = button_release_handler (item, event, trim ? FadeInTrimHandleItem : FadeInHandleItem);
+               maybe_locate_with_edit_preroll ( rv->region()->position() );
                break;
 
        case GDK_MOTION_NOTIFY:
@@ -495,11 +540,11 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
                break;
 
        case GDK_ENTER_NOTIFY:
-               ret = enter_handler (item, event, FadeOutHandleItem);
+               ret = enter_handler (item, event, trim ? FadeInTrimHandleItem : FadeInHandleItem);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               ret = leave_handler (item, event, FadeOutHandleItem);
+               ret = leave_handler (item, event, trim ? FadeInTrimHandleItem : FadeInHandleItem);
                break;
 
        default:
@@ -509,30 +554,29 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
        return ret;
 }
 
-struct DescendingRegionLayerSorter {
-    bool operator()(boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
-           return a->layer() > b->layer();
-    }
-};
-
 bool
-Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item, CrossfadeView* xfv)
+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_crossfadeview = xfv;
-               clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
+               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, CrossfadeViewItem);
+                       return button_press_handler (item, event, FadeOutItem);
                }
                break;
 
        case GDK_BUTTON_RELEASE:
                if (event->button.button == 3) {
-                       bool ret = button_release_handler (item, event, CrossfadeViewItem);
-                       return ret;
+                       return button_release_handler (item, event, FadeOutItem);
                }
                break;
 
@@ -541,86 +585,65 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
 
        }
 
-       /* XXX do not forward double clicks */
+       /* proxy for the regionview, except enter/leave events */
 
-       if (event->type == GDK_2BUTTON_PRESS) {
-               return false;
+       if (event->type == GDK_ENTER_NOTIFY || event->type == GDK_LEAVE_NOTIFY) {
+               return true;
+       } else {
+               return canvas_region_view_event (event, rv->get_canvas_group(), rv);
        }
+}
 
-       /* proxy for an underlying 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()) {
-
-                       boost::shared_ptr<AudioPlaylist> pl;
-                       if ((pl = boost::dynamic_pointer_cast<AudioPlaylist> (atv->track()->playlist())) != 0) {
-
-                               Playlist::RegionList* rl = pl->regions_at (event_frame (event));
-                               if (!rl->empty()) {
-
-                                       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());
-
-                                               delete rl;
-
-                                               /* 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 */
+bool
+Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv, bool trim)
+{
+       bool ret = false;
 
-                                               /* XXX: FIXME: this is an evil hack; it assumes that any event for which
-                                                  this proxy is being used has its GdkEvent laid out such that the y
-                                                  member is in the same place as that for a GdkEventButton */
+       if (!rv->sensitive()) {
+               return false;
+       }
 
-                                               /* position of the event within the track */
-                                               double cx = event->button.x;
-                                               double cy = event->button.y;
-                                               atv->view()->canvas_item()->w2i (cx, cy);
+       switch (event->type) {
+       case GDK_BUTTON_PRESS:
+       case GDK_2BUTTON_PRESS:
+       case GDK_3BUTTON_PRESS:
+               clicked_regionview = rv;
+               clicked_control_point = 0;
+               clicked_axisview = &rv->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+               ret = button_press_handler (item, event, trim ? FadeOutTrimHandleItem : FadeOutHandleItem);
+               break;
 
-                                               /* hence layer that we're over */
-                                               double const c = atv->view()->child_height ();
-                                               layer_t const l = pl->top_layer () + 1 - (cy / c);
+       case GDK_BUTTON_RELEASE:
+               ret = button_release_handler (item, event, trim ? FadeOutTrimHandleItem : FadeOutHandleItem);
+               maybe_locate_with_edit_preroll ( rv->region()->last_frame() - rv->get_fade_out_shape_width() );
+               break;
 
-                                               /* hence region */
-                                               Playlist::RegionList::iterator i = rl->begin();
-                                               while (i != rl->end() && (*i)->layer() != l) {
-                                                       ++i;
-                                               }
+       case GDK_MOTION_NOTIFY:
+               ret = motion_handler (item, event);
+               break;
 
-                                               if (i != rl->end()) {
-                                                       RegionView* rv = atv->view()->find_view (*i);
-                                                       delete rl;
+       case GDK_ENTER_NOTIFY:
+               ret = enter_handler (item, event, trim ? FadeOutTrimHandleItem : FadeOutHandleItem);
+               break;
 
-                                                       /* proxy */
-                                                       return canvas_region_view_event (event, rv->get_canvas_group(), rv);
-                                               }
-                                       }
-                               }
+       case GDK_LEAVE_NOTIFY:
+               ret = leave_handler (item, event, trim ? FadeOutTrimHandleItem : FadeOutHandleItem);
+               break;
 
-                               delete rl;
-                       }
-               }
+       default:
+               break;
        }
 
-       return TRUE;
+       return ret;
 }
 
+struct DescendingRegionLayerSorter {
+    bool operator()(boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
+           return a->layer() > b->layer();
+    }
+};
+
 bool
 Editor::canvas_control_point_event (GdkEvent *event, ArdourCanvas::Item* item, ControlPoint* cp)
 {
@@ -651,13 +674,23 @@ bool
 Editor::canvas_line_event (GdkEvent *event, ArdourCanvas::Item* item, AutomationLine* al)
 {
        ItemType type;
-
-       if (dynamic_cast<AudioRegionGainLine*> (al) != 0) {
+       AudioRegionGainLine* gl;
+       if ((gl = dynamic_cast<AudioRegionGainLine*> (al)) != 0) {
                type = GainLineItem;
+               if (event->type == GDK_BUTTON_PRESS) {
+                       clicked_regionview = &gl->region_view ();
+               }
        } else {
                type = AutomationLineItem;
+               if (event->type == GDK_BUTTON_PRESS) {
+                       clicked_regionview = 0;
+               }
        }
 
+       clicked_control_point = 0;
+       clicked_axisview = &al->trackview;
+       clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+
        return typed_event (item, event, type);
 }
 
@@ -778,6 +811,14 @@ Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, Re
           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:
@@ -786,20 +827,20 @@ Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, Re
                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, RegionViewNameHighlight);
+               ret = button_press_handler (item, event, type);
                break;
        case GDK_BUTTON_RELEASE:
-               ret = button_release_handler (item, event, RegionViewNameHighlight);
+               ret = button_release_handler (item, event, type);
                break;
        case GDK_MOTION_NOTIFY:
                ret = motion_handler (item, event);
                break;
        case GDK_ENTER_NOTIFY:
-               ret = enter_handler (item, event, RegionViewNameHighlight);
+               ret = enter_handler (item, event, type);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               ret = leave_handler (item, event, RegionViewNameHighlight);
+               ret = leave_handler (item, event, type);
                break;
 
        default:
@@ -833,7 +874,8 @@ 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);
+               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, RegionViewNameHighlight);
@@ -891,7 +933,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, ArdourMarker* /*marker*/)
 {
        return typed_event (item, event, MarkerItem);
 }
@@ -920,18 +1001,86 @@ 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);
 }
 
+bool
+Editor::canvas_tempo_curve_event (GdkEvent *event, ArdourCanvas::Item* item, TempoCurve* /*marker*/)
+{
+       return typed_event (item, event, TempoCurveItem);
+}
+
 bool
 Editor::canvas_meter_marker_event (GdkEvent *event, ArdourCanvas::Item* item, MeterMarker* /*marker*/)
 {
        return typed_event (item, event, MeterMarkerItem);
 }
 
+bool
+Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType type)
+{
+       bool handled = false;
+
+       if (event->type == GDK_SCROLL) {
+
+               /* scroll events in the rulers are handled a little differently from
+                  scrolling elsewhere in the canvas.
+               */
+
+               switch (event->scroll.direction) {
+               case GDK_SCROLL_UP:
+                       if (Keyboard::modifier_state_equals(event->scroll.state,
+                                                           Keyboard::ScrollHorizontalModifier)) {
+                               scroll_left_step ();
+                       } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
+                               temporal_zoom_step_mouse_focus (false);
+                       } else {
+                               temporal_zoom_step (false);
+                       }
+                       handled = true;
+                       break;
+
+               case GDK_SCROLL_DOWN:
+                       if (Keyboard::modifier_state_equals(event->scroll.state,
+                                                           Keyboard::ScrollHorizontalModifier)) {
+                               scroll_right_step ();
+                       } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
+                               temporal_zoom_step_mouse_focus (true);
+                       } else {
+                               temporal_zoom_step (true);
+                       }
+                       handled = true;
+                       break;
+
+               case GDK_SCROLL_LEFT:
+                       scroll_left_half_page ();
+                       handled = true;
+                       break;
+
+               case GDK_SCROLL_RIGHT:
+                       scroll_right_half_page ();
+                       handled = true;
+                       break;
+
+               default:
+                       /* what? */
+                       break;
+               }
+               return handled;
+       }
+
+       return typed_event (item, event, type);
+}
+
 bool
 Editor::canvas_tempo_bar_event (GdkEvent *event, ArdourCanvas::Item* item)
 {
@@ -950,12 +1099,6 @@ Editor::canvas_playhead_cursor_event (GdkEvent *event, ArdourCanvas::Item* item)
        return typed_event (item, event, PlayheadCursorItem);
 }
 
-bool
-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)
 {
@@ -967,57 +1110,244 @@ Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item)
 }
 
 bool
-Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/, int x, int y, guint /*time*/)
+Editor::canvas_drop_zone_event (GdkEvent* event)
 {
-       double wx;
-       double wy;
-       track_canvas->window_to_world (x, y, wx, wy);
+       GdkEventScroll scroll;
+       ArdourCanvas::Duple winpos;
 
+       switch (event->type) {
+       case GDK_BUTTON_RELEASE:
+               if (event->button.button == 1) {
+                       begin_reversible_selection_op (X_("Nowhere Click"));
+                       selection->clear_objects ();
+                       selection->clear_tracks ();
+                       commit_reversible_selection_op ();
+               }
+               break;
+
+       case GDK_SCROLL:
+               /* convert coordinates back into window space so that
+                  we can just call canvas_scroll_event().
+               */
+               winpos = _track_canvas->canvas_to_window (Duple (event->scroll.x, event->scroll.y));
+               scroll = event->scroll;
+               scroll.x = winpos.x;
+               scroll.y = winpos.y;
+               return canvas_scroll_event (&scroll, true);
+               break;
+
+       case GDK_ENTER_NOTIFY:
+               return typed_event (_canvas_drop_zone, event, DropZoneItem);
+
+       case GDK_LEAVE_NOTIFY:
+               return typed_event (_canvas_drop_zone, event, DropZoneItem);
+
+       default:
+               break;
+       }
+
+       return true;
+}
+
+bool
+Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context, int x, int y, guint time)
+{
+       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;
+       }
+
        event.type = GDK_MOTION_NOTIFY;
-       event.button.x = wx;
-       event.button.y = wy;
+       event.button.x = x;
+       event.button.y = y;
        /* assume we're dragging with button 1 */
        event.motion.state = Gdk::BUTTON1_MASK;
 
-       if (!_drags->active ()) {
+       (void) window_event_sample (&event, &px, &py);
 
-               double px;
-               double py;
-               nframes64_t const pos = event_frame (&event, &px, &py);
+       std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py, false);
+       bool can_drop = false;
 
-               std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
-               if (tv.first == 0) {
-                       return true;
-               }
+       if (tv.first != 0) {
 
-               RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (tv.first);
-               if (rtav == 0 || !rtav->is_track ()) {
-                       return true;
+               /* 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;
                }
 
-               boost::shared_ptr<Region> region = _regions->get_dragged_region ();
 
-               boost::shared_ptr<Region> region_copy = RegionFactory::create (region);
+       } 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 (tv.first == 0
+                           && (
+                               boost::dynamic_pointer_cast<AudioRegion> (region) != 0 ||
+                               boost::dynamic_pointer_cast<MidiRegion> (region) != 0
+                              )
+                          )
+                       {
+                               /* drop to drop-zone */
+                               context->drag_status (context->get_suggested_action(), time);
+                               return true;
+                       }
+
+                       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)) {
 
-               if (boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 &&
-                   dynamic_cast<AudioTimeAxisView*> (tv.first) == 0) {
+                               /* audio to audio
+                                  OR
+                                  midi to midi
+                               */
 
-                       /* audio -> non-audio */
+                               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 (UIConfiguration::instance().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;
                }
+       }
 
-               if (boost::dynamic_pointer_cast<MidiRegion> (region_copy) == 0 &&
-                   dynamic_cast<MidiTimeAxisView*> (tv.first) != 0) {
+       /* no drop here */
+       context->drag_status (Gdk::DragAction (0), time);
+       return false;
+}
 
-                       /* MIDI -> non-MIDI */
-                       return true;
+void
+Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
+                     int x, int y,
+                     const SelectionData& /*data*/,
+                     guint /*info*/, guint /*time*/)
+{
+       GdkEvent event;
+       double px;
+       double py;
+
+       event.type = GDK_MOTION_NOTIFY;
+       event.button.x = x;
+       event.button.y = y;
+       /* assume we're dragging with button 1 */
+       event.motion.state = Gdk::BUTTON1_MASK;
+       framepos_t const pos = window_event_sample (&event, &px, &py);
+
+       boost::shared_ptr<Region> region = _regions->get_dragged_region ();
+       if (!region) { return; }
+
+       RouteTimeAxisView* rtav = 0;
+       std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py, false);
+
+       if (tv.first != 0) {
+               rtav = dynamic_cast<RouteTimeAxisView*> (tv.first);
+       } else {
+               try {
+                       if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
+                               uint32_t output_chan = region->n_channels();
+                               if ((Config->get_output_auto_connect() & AutoConnectMaster) && session()->master_out()) {
+                                       output_chan =  session()->master_out()->n_inputs().n_audio();
+                               }
+                               list<boost::shared_ptr<AudioTrack> > audio_tracks;
+                               audio_tracks = session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order);
+                               rtav = dynamic_cast<RouteTimeAxisView*> (axis_view_from_stripable (audio_tracks.front()));
+                       } else if (boost::dynamic_pointer_cast<MidiRegion> (region)) {
+                               ChanCount one_midi_port (DataType::MIDI, 1);
+                               list<boost::shared_ptr<MidiTrack> > midi_tracks;
+                               midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr<ARDOUR::PluginInfo>(),
+                                                                        (ARDOUR::Plugin::PresetRecord*) 0,
+                                                                        (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order);
+                               rtav = dynamic_cast<RouteTimeAxisView*> (axis_view_from_stripable (midi_tracks.front()));
+                       } else {
+                               return;
+                       }
+               } catch (...) {
+                       error << _("Could not create new track after region placed in the drop zone") << endmsg;
+                       return;
                }
+       }
+
+       if (rtav != 0 && rtav->is_track ()) {
+               boost::shared_ptr<Region> region_copy = RegionFactory::create (region, true);
 
-               _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
+               if ((boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 && dynamic_cast<AudioTimeAxisView*> (rtav) != 0) ||
+                   (boost::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 && dynamic_cast<MidiTimeAxisView*> (rtav) != 0)) {
+                       _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event);
+                       _drags->end_grab (0);
+               }
        }
+}
 
-       _drags->motion_handler (&event, false);
+bool
+Editor::key_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType)
+{
+       return false;
+}
 
-       return true;
+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;
 }
+