Fairly major change to the way in which crossfades are handled;
[ardour.git] / gtk2_ardour / editor_canvas_events.cc
index e879f460f55dec4f5a515628271180d7eac44475..72de3535001b18b407d57e0602a61030e35b213a 100644 (file)
@@ -35,7 +35,6 @@
 #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"
@@ -47,6 +46,7 @@
 #include "editor_drag.h"
 #include "midi_time_axis.h"
 #include "editor_regions.h"
+#include "verbose_cursor.h"
 
 #include "i18n.h"
 
@@ -61,7 +61,7 @@ using Gtkmm2ext::Keyboard;
 bool
 Editor::track_canvas_scroll (GdkEventScroll* ev)
 {
-       nframes64_t xdelta;
+       framepos_t xdelta;
        int direction = ev->direction;
 
   retry:
@@ -83,7 +83,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                                }
                        }
                        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 ();
@@ -108,7 +108,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
                                }
                        }
                        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 ();
@@ -127,10 +127,10 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 
        case GDK_SCROLL_RIGHT:
                xdelta = (current_page_frames() / 8);
-               if (max_frames - xdelta > leftmost_frame) {
+               if (max_framepos - xdelta > leftmost_frame) {
                        reset_x_origin (leftmost_frame + xdelta);
                } else {
-                       reset_x_origin (max_frames - current_page_frames());
+                       reset_x_origin (max_framepos - current_page_frames());
                }
                break;
 
@@ -178,9 +178,8 @@ Editor::track_canvas_motion_notify_event (GdkEventMotion */*event*/)
 bool
 Editor::track_canvas_motion (GdkEvent *ev)
 {
-       if (verbose_cursor_visible) {
-               verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (ev->motion.x + 10);
-               verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 10);
+       if (_verbose_cursor->visible ()) {
+               _verbose_cursor->set_position (ev->motion.x + 10, ev->motion.y + 10);
        }
 
        return false;
@@ -212,6 +211,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;
        }
@@ -275,7 +282,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;
 
@@ -406,10 +413,12 @@ Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
                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;
 
@@ -485,10 +494,12 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
                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;
 
@@ -505,112 +516,6 @@ struct DescendingRegionLayerSorter {
     }
 };
 
-bool
-Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item, CrossfadeView* xfv)
-{
-       /* we handle only button 3 press/release events */
-
-       switch (event->type) {
-       case GDK_BUTTON_PRESS:
-               clicked_crossfadeview = xfv;
-               clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
-               if (event->button.button == 3) {
-                       return button_press_handler (item, event, CrossfadeViewItem);
-               }
-               break;
-
-       case GDK_BUTTON_RELEASE:
-               if (event->button.button == 3) {
-                       bool ret = button_release_handler (item, event, CrossfadeViewItem);
-                       return ret;
-               }
-               break;
-
-       default:
-               break;
-
-       }
-
-       /* XXX do not forward double clicks */
-
-       if (event->type == GDK_2BUTTON_PRESS) {
-               return false;
-       }
-
-       /* 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 */
-
-                                               /* 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 */
-
-                                               /* position of the event within the track */
-                                               double cx = event->button.x;
-                                               double cy = event->button.y;
-                                               atv->view()->canvas_item()->w2i (cx, cy);
-
-                                               /* hence layer that we're over */
-                                               double const c = atv->view()->child_height ();
-                                               layer_t const l = pl->top_layer () + 1 - (cy / c);
-
-                                               /* hence region */
-                                               Playlist::RegionList::iterator i = rl->begin();
-                                               while (i != rl->end() && (*i)->layer() != l) {
-                                                       ++i;
-                                               }
-
-                                               if (i != rl->end()) {
-                                                       RegionView* rv = atv->view()->find_view (*i);
-                                                       delete rl;
-
-                                                       /* proxy */
-                                                       return canvas_region_view_event (event, rv->get_canvas_group(), rv);
-                                               }
-                                       }
-                               }
-
-                               delete rl;
-                       }
-               }
-       }
-
-       return TRUE;
-}
-
 bool
 Editor::canvas_control_point_event (GdkEvent *event, ArdourCanvas::Item* item, ControlPoint* cp)
 {
@@ -768,6 +673,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:
@@ -776,20 +689,22 @@ 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);
+               set_entered_regionview (rv);
+               ret = enter_handler (item, event, type);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               ret = leave_handler (item, event, RegionViewNameHighlight);
+               set_entered_regionview (0);
+               ret = leave_handler (item, event, type);
                break;
 
        default:
@@ -824,13 +739,15 @@ Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::
                break;
        case GDK_MOTION_NOTIFY:
                motion_handler (item, event);
-                ret = true; // force this to avoid progagating the event into the regionview
+               ret = true; // force this to avoid progagating the event into the regionview
                break;
        case GDK_ENTER_NOTIFY:
+               set_entered_regionview (rv);
                ret = enter_handler (item, event, RegionViewNameHighlight);
                break;
 
        case GDK_LEAVE_NOTIFY:
+               set_entered_regionview (0);
                ret = leave_handler (item, event, RegionViewNameHighlight);
                break;
 
@@ -867,10 +784,12 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item
                ret = motion_handler (item, event);
                break;
        case GDK_ENTER_NOTIFY:
+               set_entered_regionview (rv);
                ret = enter_handler (item, event, RegionViewName);
                break;
 
        case GDK_LEAVE_NOTIFY:
+               set_entered_regionview (0);
                ret = leave_handler (item, event, RegionViewName);
                break;
 
@@ -881,6 +800,45 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item
        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 = 0;
+               clicked_control_point = 0;
+               clicked_axisview = 0;
+               clicked_routeview = 0; //dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
+               ret = button_press_handler (item, event, FeatureLineItem);
+               break;
+
+       case GDK_BUTTON_RELEASE:
+               ret = button_release_handler (item, event, FeatureLineItem);
+               break;
+
+       case GDK_MOTION_NOTIFY:
+               ret = motion_handler (item, event);
+               break;
+
+       case GDK_ENTER_NOTIFY:
+               ret = enter_handler (item, event, FeatureLineItem);
+               break;
+
+       case GDK_LEAVE_NOTIFY:
+               ret = leave_handler (item, event, FeatureLineItem);
+               break;
+
+       default:
+               break;
+       }
+
+       return ret;
+}
+
 bool
 Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Marker* /*marker*/)
 {
@@ -975,7 +933,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/,
 
                double px;
                double py;
-               nframes64_t const pos = event_frame (&event, &px, &py);
+               framepos_t const pos = event_frame (&event, &px, &py);
 
                std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
                if (tv.first == 0) {
@@ -1002,8 +960,8 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/,
                        return true;
                }
 
-               if (boost::dynamic_pointer_cast<MidiRegion> (region_copy) == 0 &&
-                   dynamic_cast<MidiTimeAxisView*> (tv.first) != 0) {
+               if (boost::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 &&
+                   dynamic_cast<MidiTimeAxisView*> (tv.first) == 0) {
 
                        /* MIDI -> non-MIDI */
                        return true;
@@ -1016,3 +974,45 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/,
 
        return true;
 }
+
+bool
+Editor::key_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType)
+{
+       return false;
+}
+
+bool
+Editor::key_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType type)
+{
+
+       bool handled = false;
+
+       switch (type) {
+       case TempoMarkerItem:
+               switch (event->key.keyval) {
+               case GDK_Delete:
+                       remove_tempo_marker (item);
+                       handled = true;
+                       break;
+               default:
+                       break;
+               }
+               break;
+
+       case MeterMarkerItem:
+               switch (event->key.keyval) {
+               case GDK_Delete:
+                       remove_meter_marker (item);
+                       handled = true;
+                       break;
+               default:
+                       break;
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       return handled;
+}