X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas_events.cc;h=79cc1e066fcacbc0b8f5c87a5a6ca6d71e6ca89a;hb=a5de2c10679cc920a7409d02e32e6dd67778ea75;hp=0da0bfc4878290e700c6f3a56531cf4413803917;hpb=38eb5f4539786e0edafc31e275ed598bd4e4164b;p=ardour.git diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 0da0bfc487..79cc1e066f 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,18 +20,20 @@ #include #include #include +#include -#include +#include "pbd/stacktrace.h" -#include -#include +#include "ardour/midi_region.h" +#include "ardour/region_factory.h" +#include "ardour/profile.h" #include "editor.h" #include "keyboard.h" #include "public_editor.h" #include "audio_region_view.h" #include "audio_streamview.h" -#include "crossfade_view.h" +#include "canvas-noevent-text.h" #include "audio_time_axis.h" #include "region_gain_line.h" #include "automation_line.h" @@ -40,108 +42,86 @@ #include "control_point.h" #include "canvas_impl.h" #include "simplerect.h" -#include "canvas-note-event.h" +#include "editor_drag.h" +#include "midi_time_axis.h" +#include "editor_regions.h" +#include "verbose_cursor.h" #include "i18n.h" -using namespace sigc; using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtk; using namespace ArdourCanvas; +using Gtkmm2ext::Keyboard; + bool Editor::track_canvas_scroll (GdkEventScroll* ev) { - int x, y; - double wx, wy; - nframes_t xdelta; + framepos_t xdelta; int direction = ev->direction; - CanvasNoteEvent *midi_event = dynamic_cast(track_canvas->get_item_at(ev->x, ev->y)); 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); - wx += horizontal_adjustment.get_value(); - wy += vertical_adjustment.get_value(); - - GdkEvent event; - event.type = GDK_BUTTON_RELEASE; - event.button.x = wx; - event.button.y = wy; - - nframes_t where = event_frame (&event, 0, 0); - temporal_zoom_to_frame (false, where); + if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) { + //for mouse-wheel zoom, force zoom-focus to mouse + Editing::ZoomFocus temp_focus = zoom_focus; + zoom_focus = Editing::ZoomFocusMouse; + temporal_zoom_step (false); + zoom_focus = temp_focus; return true; - } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { + } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { 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 (mem_fun(*this, &Editor::track_height_step_timeout), 500); - if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) { + step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500); + std::pair const p = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize); + current_stepping_trackview = p.first; + if (!current_stepping_trackview) { return false; } } - gettimeofday (&last_track_height_step_timestamp, 0); - current_stepping_trackview->step_height (true); + last_track_height_step_timestamp = get_microseconds(); + current_stepping_trackview->step_height (false); return true; } else { - if(midi_event) { - return midi_event->on_event(reinterpret_cast(ev)); - } scroll_tracks_up_line (); return true; } break; 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); - wx += horizontal_adjustment.get_value(); - wy += vertical_adjustment.get_value(); - - GdkEvent event; - event.type = GDK_BUTTON_RELEASE; - event.button.x = wx; - event.button.y = wy; - - nframes_t where = event_frame (&event, 0, 0); - temporal_zoom_to_frame (true, where); + if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) { + //for mouse-wheel zoom, force zoom-focus to mouse + Editing::ZoomFocus temp_focus = zoom_focus; + zoom_focus = Editing::ZoomFocusMouse; + temporal_zoom_step (true); + zoom_focus = temp_focus; return true; - } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { + } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { 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 (mem_fun(*this, &Editor::track_height_step_timeout), 500); - if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) { + step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500); + std::pair const p = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize); + current_stepping_trackview = p.first; + if (!current_stepping_trackview) { return false; } } - gettimeofday (&last_track_height_step_timestamp, 0); - current_stepping_trackview->step_height (false); + last_track_height_step_timestamp = get_microseconds(); + current_stepping_trackview->step_height (true); return true; } else { - if(midi_event) { - return midi_event->on_event(reinterpret_cast(ev)); - } scroll_tracks_down_line (); return true; } - break; + break; case GDK_SCROLL_LEFT: xdelta = (current_page_frames() / 8); @@ -154,10 +134,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; @@ -165,7 +145,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) /* what? */ break; } - + return false; } @@ -173,61 +153,11 @@ bool Editor::track_canvas_scroll_event (GdkEventScroll *event) { track_canvas->grab_focus(); - track_canvas_scroll (event); - return false; + return track_canvas_scroll (event); } bool -Editor::time_canvas_scroll (GdkEventScroll* ev) -{ - nframes_t xdelta; - int direction = ev->direction; - - switch (direction) { - case GDK_SCROLL_UP: - temporal_zoom_step (true); - break; - - case GDK_SCROLL_DOWN: - temporal_zoom_step (false); - break; - - case GDK_SCROLL_LEFT: - xdelta = (current_page_frames() / 2); - if (leftmost_frame > xdelta) { - reset_x_origin (leftmost_frame - xdelta); - } else { - reset_x_origin (0); - } - break; - - case GDK_SCROLL_RIGHT: - xdelta = (current_page_frames() / 2); - if (max_frames - xdelta > leftmost_frame) { - reset_x_origin (leftmost_frame + xdelta); - } else { - reset_x_origin (max_frames - current_page_frames()); - } - break; - - default: - /* what? */ - break; - } - - return false; -} - -bool -Editor::time_canvas_scroll_event (GdkEventScroll *event) -{ - time_canvas->grab_focus(); - time_canvas_scroll (event); - return false; -} - -bool -Editor::track_canvas_button_press_event (GdkEventButton *event) +Editor::track_canvas_button_press_event (GdkEventButton */*event*/) { selection->clear (); track_canvas->grab_focus(); @@ -237,14 +167,14 @@ Editor::track_canvas_button_press_event (GdkEventButton *event) bool Editor::track_canvas_button_release_event (GdkEventButton *event) { - if (drag_info.item) { - end_grab (drag_info.item, (GdkEvent*) event); + if (_drags->active ()) { + _drags->end_grab ((GdkEvent*) event); } return false; } bool -Editor::track_canvas_motion_notify_event (GdkEventMotion *event) +Editor::track_canvas_motion_notify_event (GdkEventMotion */*event*/) { int x, y; /* keep those motion events coming */ @@ -255,15 +185,10 @@ 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 + 20); - verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 20); + if (_verbose_cursor->visible ()) { + _verbose_cursor->set_position (ev->motion.x + 10, ev->motion.y + 10); } -#ifdef GTKOSX - flush_canvas (); -#endif - return false; } @@ -271,7 +196,7 @@ bool Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type) { gint ret = FALSE; - + switch (event->type) { case GDK_BUTTON_PRESS: case GDK_2BUTTON_PRESS: @@ -282,7 +207,7 @@ Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type) ret = button_release_handler (item, event, type); break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, type); + ret = motion_handler (item, event); break; case GDK_ENTER_NOTIFY: @@ -293,6 +218,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; } @@ -308,7 +241,6 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg return false; } - switch (event->type) { case GDK_BUTTON_PRESS: case GDK_2BUTTON_PRESS: @@ -325,7 +257,7 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, RegionItem); + ret = motion_handler (item, event); break; case GDK_ENTER_NOTIFY: @@ -349,7 +281,7 @@ bool Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, RouteTimeAxisView *tv) { bool ret = FALSE; - + switch (event->type) { case GDK_BUTTON_PRESS: case GDK_2BUTTON_PRESS: @@ -357,7 +289,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(tv); + clicked_routeview = dynamic_cast(clicked_axisview); ret = button_press_handler (item, event, StreamItem); break; @@ -366,7 +298,7 @@ Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, Rou break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, StreamItem); + ret = motion_handler (item, event); break; case GDK_ENTER_NOTIFY: @@ -389,7 +321,6 @@ Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item { bool ret = false; - switch (event->type) { case GDK_BUTTON_PRESS: case GDK_2BUTTON_PRESS: @@ -406,7 +337,7 @@ Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, AutomationTrackItem); + ret = motion_handler (item, event); break; case GDK_ENTER_NOTIFY: @@ -424,6 +355,76 @@ Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item return ret; } +bool +Editor::canvas_start_xfade_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv) +{ + if (!rv->sensitive()) { + return false; + } + + switch (event->type) { + case GDK_BUTTON_PRESS: + clicked_regionview = rv; + clicked_control_point = 0; + clicked_axisview = &rv->get_time_axis_view(); + clicked_routeview = dynamic_cast(clicked_axisview); + if (event->button.button == 3) { + return button_press_handler (item, event, StartCrossFadeItem); + } + break; + + case GDK_BUTTON_RELEASE: + if (event->button.button == 3) { + return button_release_handler (item, event, StartCrossFadeItem); + } + break; + + default: + break; + + } + + /* 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_end_xfade_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv) +{ + if (!rv->sensitive()) { + return false; + } + + switch (event->type) { + case GDK_BUTTON_PRESS: + clicked_regionview = rv; + clicked_control_point = 0; + clicked_axisview = &rv->get_time_axis_view(); + clicked_routeview = dynamic_cast(clicked_axisview); + if (event->button.button == 3) { + return button_press_handler (item, event, EndCrossFadeItem); + } + break; + + case GDK_BUTTON_RELEASE: + if (event->button.button == 3) { + return button_release_handler (item, event, EndCrossFadeItem); + } + break; + + default: + break; + + } + + /* 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_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv) { @@ -452,11 +453,11 @@ Editor::canvas_fade_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRe default: break; - + } /* proxy for the regionview */ - + return canvas_region_view_event (event, rv->get_canvas_group(), rv); } @@ -464,7 +465,7 @@ bool Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv) { bool ret = false; - + if (!rv->sensitive()) { return false; } @@ -482,17 +483,20 @@ Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item, case GDK_BUTTON_RELEASE: ret = button_release_handler (item, event, FadeInHandleItem); + maybe_locate_with_edit_preroll ( rv->region()->position() ); break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, FadeInHandleItem); + ret = motion_handler (item, event); 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; @@ -531,11 +535,11 @@ Editor::canvas_fade_out_event (GdkEvent *event, ArdourCanvas::Item* item, AudioR default: break; - + } /* proxy for the regionview */ - + return canvas_region_view_event (event, rv->get_canvas_group(), rv); } @@ -543,7 +547,7 @@ bool Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRegionView *rv) { bool ret = false; - + if (!rv->sensitive()) { return false; } @@ -561,17 +565,20 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item, case GDK_BUTTON_RELEASE: ret = button_release_handler (item, event, FadeOutHandleItem); + maybe_locate_with_edit_preroll ( rv->region()->last_frame() - rv->get_fade_out_shape_width() ); break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, FadeOutHandleItem); + ret = motion_handler (item, event); 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; @@ -588,77 +595,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 the upper most 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(&tv)) != 0) { - - if (atv->is_audio_track()) { - - boost::shared_ptr pl; - if ((pl = boost::dynamic_pointer_cast (atv->get_diskstream()->playlist())) != 0) { - - Playlist::RegionList* rl = pl->regions_at (event_frame (event)); - - if (!rl->empty()) { - 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); - } - - delete rl; - } - } - } - - return TRUE; -} - bool Editor::canvas_control_point_event (GdkEvent *event, ArdourCanvas::Item* item, ControlPoint* cp) { @@ -703,7 +639,7 @@ bool Editor::canvas_selection_rect_event (GdkEvent *event, ArdourCanvas::Item* item, SelectionRect* rect) { bool ret = false; - + switch (event->type) { case GDK_BUTTON_PRESS: case GDK_2BUTTON_PRESS: @@ -715,7 +651,7 @@ Editor::canvas_selection_rect_event (GdkEvent *event, ArdourCanvas::Item* item, ret = button_release_handler (item, event, SelectionItem); break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, SelectionItem); + ret = motion_handler (item, event); break; /* Don't need these at the moment. */ case GDK_ENTER_NOTIFY: @@ -729,7 +665,7 @@ Editor::canvas_selection_rect_event (GdkEvent *event, ArdourCanvas::Item* item, default: break; } - + return ret; } @@ -749,7 +685,7 @@ Editor::canvas_selection_start_trim_event (GdkEvent *event, ArdourCanvas::Item* ret = button_release_handler (item, event, StartSelectionTrimItem); break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, StartSelectionTrimItem); + ret = motion_handler (item, event); break; case GDK_ENTER_NOTIFY: ret = enter_handler (item, event, StartSelectionTrimItem); @@ -762,7 +698,7 @@ Editor::canvas_selection_start_trim_event (GdkEvent *event, ArdourCanvas::Item* default: break; } - + return ret; } @@ -782,7 +718,7 @@ Editor::canvas_selection_end_trim_event (GdkEvent *event, ArdourCanvas::Item* it ret = button_release_handler (item, event, EndSelectionTrimItem); break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, EndSelectionTrimItem); + ret = motion_handler (item, event); break; case GDK_ENTER_NOTIFY: ret = enter_handler (item, event, EndSelectionTrimItem); @@ -795,7 +731,65 @@ Editor::canvas_selection_end_trim_event (GdkEvent *event, ArdourCanvas::Item* it default: break; } - + + return ret; +} + +bool +Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv) +{ + bool ret = false; + + /* frame handles are not active when in internal edit mode, because actual notes + might be in the area occupied by the handle - we want them to be editable as normal. + */ + + if (internal_editing() || !rv->sensitive()) { + return false; + } + + /* NOTE: frame handles pretend to be the colored trim bar from an event handling + 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: + case GDK_3BUTTON_PRESS: + clicked_regionview = rv; + clicked_control_point = 0; + clicked_axisview = &clicked_regionview->get_time_axis_view(); + clicked_routeview = dynamic_cast(clicked_axisview); + ret = button_press_handler (item, event, type); + break; + case GDK_BUTTON_RELEASE: + ret = button_release_handler (item, event, type); + break; + case GDK_MOTION_NOTIFY: + ret = motion_handler (item, event); + break; + case GDK_ENTER_NOTIFY: + set_entered_regionview (rv); + ret = enter_handler (item, event, type); + break; + + case GDK_LEAVE_NOTIFY: + set_entered_regionview (0); + ret = leave_handler (item, event, type); + break; + + default: + break; + } + return ret; } @@ -804,7 +798,7 @@ bool Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv) { bool ret = false; - + if (!rv->sensitive()) { return false; } @@ -823,13 +817,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, RegionViewNameHighlight); + 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; @@ -863,13 +860,15 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item ret = button_release_handler (item, event, RegionViewName); break; case GDK_MOTION_NOTIFY: - ret = motion_handler (item, event, RegionViewName); + 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,7 +880,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(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*/) { return typed_event (item, event, MarkerItem); } @@ -911,13 +949,19 @@ Editor::canvas_cd_marker_bar_event (GdkEvent *event, ArdourCanvas::Item* item) } bool -Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, TempoMarker* marker) +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_meter_marker_event (GdkEvent *event, ArdourCanvas::Item* item, MeterMarker* marker) +Editor::canvas_meter_marker_event (GdkEvent *event, ArdourCanvas::Item* item, MeterMarker* /*marker*/) { return typed_event (item, event, MeterMarkerItem); } @@ -946,3 +990,203 @@ 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) +{ + if (!internal_editing()) { + return false; + } + + return typed_event (item, event, NoteItem); +} + +bool +Editor::track_canvas_drag_motion (Glib::RefPtr const& context, int x, int y, guint time) +{ + double wx; + double wy; + boost::shared_ptr region; + boost::shared_ptr 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; + } + + track_canvas->window_to_world (x, y, wx, wy); + + event.type = GDK_MOTION_NOTIFY; + event.button.x = wx; + event.button.y = wy; + /* assume we're dragging with button 1 */ + event.motion.state = Gdk::BUTTON1_MASK; + + (void) event_frame (&event, &px, &py); + + std::pair const tv = trackview_by_y_position (py); + bool can_drop = false; + + if (tv.first != 0) { + + /* over a time axis view of some kind */ + + rtav = dynamic_cast (tv.first); + + if (rtav != 0 && rtav->is_track ()) { + /* over a track, not a bus */ + can_drop = true; + } + + + } 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 ((boost::dynamic_pointer_cast (region) != 0 && + dynamic_cast (tv.first) != 0) || + (boost::dynamic_pointer_cast (region) != 0 && + dynamic_cast (tv.first) != 0)) { + + /* audio to audio + OR + midi to midi + */ + + 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 (Profile->get_sae() || Config->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; + } + } + + /* no drop here */ + context->drag_status (Gdk::DragAction (0), time); + return false; +} + +void +Editor::drop_regions (const Glib::RefPtr& /*context*/, + int x, int y, + const SelectionData& /*data*/, + guint /*info*/, guint /*time*/) +{ + double wx; + double wy; + boost::shared_ptr region; + boost::shared_ptr region_copy; + RouteTimeAxisView* rtav; + GdkEvent event; + double px; + double py; + + track_canvas->window_to_world (x, y, wx, wy); + + event.type = GDK_MOTION_NOTIFY; + event.button.x = wx; + event.button.y = wy; + /* assume we're dragging with button 1 */ + event.motion.state = Gdk::BUTTON1_MASK; + + framepos_t const pos = event_frame (&event, &px, &py); + + std::pair const tv = trackview_by_y_position (py); + + if (tv.first != 0) { + + rtav = dynamic_cast (tv.first); + + if (rtav != 0 && rtav->is_track ()) { + + boost::shared_ptr region = _regions->get_dragged_region (); + + if (region) { + + region_copy = RegionFactory::create (region, true); + + + if ((boost::dynamic_pointer_cast (region_copy) != 0 && + dynamic_cast (tv.first) != 0) || + (boost::dynamic_pointer_cast (region_copy) != 0 && + dynamic_cast (tv.first) != 0)) { + + /* audio to audio + OR + midi to midi + */ + + + _drags->set (new RegionInsertDrag (this, region_copy, rtav, pos), &event); + _drags->end_grab (0); + } + } + } + } +} + +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; +}