X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas_events.cc;h=34a73d318c029f79d4a1489e7cfef7274130b1d6;hb=035de2a367acd7ee27c3dbfba2f6c71f3c137eb8;hp=3fa29437cab0a3bfc4cc80da1109dfe8371d5b44;hpb=3e966771d042455a50a01e786af2af7b6f407395;p=ardour.git

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 3fa29437ca..34a73d318c 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -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;
 
@@ -768,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:
@@ -776,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:
@@ -823,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;
 
@@ -866,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;
 
@@ -880,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*/)
 {
@@ -953,7 +1011,6 @@ Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item)
 		return false;
 	}
 
-        cerr << "Forward note event item on to editor\n";
 	return typed_event (item, event, NoteItem);
 }