projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add browse button to recent session dialogue. Fixes #3357.
[ardour.git] / gtk2_ardour / editor_canvas_events.cc
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index a670543512f37480dfab2cc401a8bc75bbe97b55..34a73d318c029f79d4a1489e7cfef7274130b1d6 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -44,7 +44,6 @@
 #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"
@@ -62,37 +61,14 @@ 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));
-       }
-
   retry:
        switch (direction) {
        case GDK_SCROLL_UP:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       //if (ev->state == GDK_CONTROL_MASK) {
-                       /* XXX
-                          the ev->x will be out of step with the canvas
-                          if we're in mid zoom, so we have to get the damn mouse
-                          pointer again
-                       */
-                       track_canvas->get_pointer (x, y);
-                       track_canvas->window_to_world (x, y, wx, wy);
-
-                       GdkEvent event;
-                       event.type = GDK_BUTTON_RELEASE;
-                       event.button.x = wx;
-                       event.button.y = wy;
-
-                       nframes64_t where = event_frame (&event, 0, 0);
-                       temporal_zoom_to_frame (false, where);
+                       temporal_zoom_step (false);
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
                        direction = GDK_SCROLL_LEFT;
@@ -117,17 +93,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 
        case GDK_SCROLL_DOWN:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       //if (ev->state == GDK_CONTROL_MASK) {
-                       track_canvas->get_pointer (x, y);
-                       track_canvas->window_to_world (x, y, wx, wy);
-
-                       GdkEvent event;
-                       event.type = GDK_BUTTON_RELEASE;
-                       event.button.x = wx;
-                       event.button.y = wy;
-
-                       nframes64_t where = event_frame (&event, 0, 0);
-                       temporal_zoom_to_frame (true, where);
+                       temporal_zoom_step (true);
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
                        direction = GDK_SCROLL_RIGHT;
@@ -180,8 +146,7 @@ bool
 Editor::track_canvas_scroll_event (GdkEventScroll *event)
 {
        track_canvas->grab_focus();
-       track_canvas_scroll (event);
-       return false;
+       return track_canvas_scroll (event);
 }
 
 bool
@@ -441,10 +406,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;
 
@@ -520,10 +487,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;
 
@@ -803,6 +772,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:
@@ -811,20 +788,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:
@@ -858,13 +837,16 @@ Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::
                ret = button_release_handler (item, event, RegionViewNameHighlight);
                break;
        case GDK_MOTION_NOTIFY:
-               ret = motion_handler (item, event);
+               motion_handler (item, event);
+                ret = true; // force this to avoid progagating the event into the regionview
                break;
        case GDK_ENTER_NOTIFY:
+               set_entered_regionview (rv);
                ret = enter_handler (item, event, RegionViewNameHighlight);
                break;
 
        case GDK_LEAVE_NOTIFY:
+               set_entered_regionview (0);
                ret = leave_handler (item, event, RegionViewNameHighlight);
                break;
 
@@ -901,10 +883,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;
 
@@ -915,6 +899,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 *rv)
+{
+       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*/)
 {
@@ -1023,6 +1046,10 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/,
 
                boost::shared_ptr<Region> region = _regions->get_dragged_region ();
 
+               if (!region) {
+                       return true;
+               }
+
                boost::shared_ptr<Region> region_copy = RegionFactory::create (region);
 
                if (boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 &&
Unnamed repository; edit this file 'description' to name the repository.