X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas_events.cc;h=eb37d1128273937ab26923d40133d5146a770691;hb=10bdce85a0e7381d1b5db38e3640600c6fd3ec79;hp=8d3d4cf55a11489f78241731a454ef1fefbfdf38;hpb=8932625869f181bc16833c9e9d253970656c180d;p=ardour.git

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 8d3d4cf55a..eb37d11282 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -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;
 
@@ -275,7 +275,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 +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;
 
@@ -485,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;
 
@@ -514,6 +518,7 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
 	case GDK_BUTTON_PRESS:
 		clicked_crossfadeview = xfv;
 		clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
+		clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
 		if (event->button.button == 3) {
 			return button_press_handler (item, event, CrossfadeViewItem);
 		}
@@ -768,6 +773,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 +789,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:
@@ -823,13 +838,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;
 
@@ -866,10 +884,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;
 
@@ -880,6 +900,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*/)
 {