X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_mouse.cc;h=21f2214a7c2502c18e2429296a67dc6ca37842b3;hb=0938a42440cc82ce8d0cb064840c258c863714ab;hp=4713258b19c62c10021f7245b2b55c7bc58222a6;hpb=439d13535ee7ae73b1e7d6b0cc99022739234a28;p=ardour.git diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 4713258b19..21f2214a7c 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -27,14 +27,17 @@ #include "pbd/error.h" #include "pbd/enumwriter.h" -#include -#include #include "pbd/memento_command.h" #include "pbd/basename.h" #include "pbd/stateful_diff_command.h" +#include "gtkmm2ext/bindings.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/tearoff.h" + #include "ardour_ui.h" #include "actions.h" +#include "canvas-note.h" #include "editor.h" #include "time_axis_view.h" #include "audio_time_axis.h" @@ -55,6 +58,9 @@ #include "editor_drag.h" #include "automation_region_view.h" #include "edit_note_dialog.h" +#include "mouse_cursors.h" +#include "editor_cursors.h" +#include "verbose_cursor.h" #include "ardour/types.h" #include "ardour/profile.h" @@ -71,6 +77,7 @@ #include "ardour/region_factory.h" #include "ardour/source_factory.h" #include "ardour/session.h" +#include "ardour/operations.h" #include @@ -84,7 +91,7 @@ using namespace Editing; using Gtkmm2ext::Keyboard; bool -Editor::mouse_frame (nframes64_t& where, bool& in_track_canvas) const +Editor::mouse_frame (framepos_t& where, bool& in_track_canvas) const { int x, y; double wx, wy; @@ -117,7 +124,7 @@ Editor::mouse_frame (nframes64_t& where, bool& in_track_canvas) const return true; } -nframes64_t +framepos_t Editor::event_frame (GdkEvent const * event, double* pcx, double* pcy) const { double cx, cy; @@ -170,20 +177,20 @@ Editor::event_frame (GdkEvent const * event, double* pcx, double* pcy) const Gdk::Cursor* Editor::which_grabber_cursor () { - Gdk::Cursor* c = grabber_cursor; + Gdk::Cursor* c = _cursors->grabber; if (_internal_editing) { switch (mouse_mode) { case MouseRange: - c = midi_pencil_cursor; + c = _cursors->midi_pencil; break; case MouseObject: - c = grabber_note_cursor; + c = _cursors->grabber_note; break; case MouseTimeFX: - c = midi_resize_cursor; + c = _cursors->midi_resize; break; default: @@ -194,9 +201,13 @@ Editor::which_grabber_cursor () switch (_edit_point) { case EditAtMouse: - c = grabber_edit_point_cursor; + c = _cursors->grabber_edit_point; break; default: + boost::shared_ptr m = _movable.lock(); + if (m && m->locked()) { + c = _cursors->speaker; + } break; } } @@ -204,6 +215,28 @@ Editor::which_grabber_cursor () return c; } +void +Editor::set_current_trimmable (boost::shared_ptr t) +{ + boost::shared_ptr st = _trimmable.lock(); + + if (!st || st == t) { + _trimmable = t; + set_canvas_cursor (); + } +} + +void +Editor::set_current_movable (boost::shared_ptr m) +{ + boost::shared_ptr sm = _movable.lock(); + + if (!sm || sm != m) { + _movable = m; + set_canvas_cursor (); + } +} + void Editor::set_canvas_cursor () { @@ -211,7 +244,7 @@ Editor::set_canvas_cursor () switch (mouse_mode) { case MouseRange: - current_canvas_cursor = midi_pencil_cursor; + current_canvas_cursor = _cursors->midi_pencil; break; case MouseObject: @@ -219,7 +252,7 @@ Editor::set_canvas_cursor () break; case MouseTimeFX: - current_canvas_cursor = midi_resize_cursor; + current_canvas_cursor = _cursors->midi_resize; break; default: @@ -230,7 +263,7 @@ Editor::set_canvas_cursor () switch (mouse_mode) { case MouseRange: - current_canvas_cursor = selector_cursor; + current_canvas_cursor = _cursors->selector; break; case MouseObject: @@ -238,19 +271,23 @@ Editor::set_canvas_cursor () break; case MouseGain: - current_canvas_cursor = cross_hair_cursor; + current_canvas_cursor = _cursors->cross_hair; break; case MouseZoom: - current_canvas_cursor = zoom_cursor; + if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { + current_canvas_cursor = _cursors->zoom_out; + } else { + current_canvas_cursor = _cursors->zoom_in; + } break; case MouseTimeFX: - current_canvas_cursor = time_fx_cursor; // just use playhead + current_canvas_cursor = _cursors->time_fx; // just use playhead break; case MouseAudition: - current_canvas_cursor = speaker_cursor; + current_canvas_cursor = _cursors->speaker; break; } } @@ -262,13 +299,21 @@ Editor::set_canvas_cursor () current_canvas_cursor = which_grabber_cursor (); break; case JOIN_OBJECT_RANGE_RANGE: - current_canvas_cursor = selector_cursor; + current_canvas_cursor = _cursors->selector; break; } - if (is_drawable()) { - track_canvas->get_window()->set_cursor(*current_canvas_cursor); + /* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */ + if (join_object_range_button.get_active() && last_item_entered) { + if (last_item_entered->property_parent() && (*last_item_entered->property_parent()).get_data (X_("timeselection"))) { + pair tvp = trackview_by_y_position (_last_motion_y + vertical_adjustment.get_value() - canvas_timebars_vsize); + if (dynamic_cast (tvp.first)) { + current_canvas_cursor = _cursors->up_down; + } + } } + + set_canvas_cursor (current_canvas_cursor, true); } void @@ -318,6 +363,8 @@ Editor::set_mouse_mode (MouseMode m, bool force) /* go there and back to ensure that the toggled handler is called to set up mouse_mode */ tact->set_active (false); tact->set_active (true); + + MouseModeChanged (); /* EMIT SIGNAL */ } void @@ -326,34 +373,33 @@ Editor::mouse_mode_toggled (MouseMode m) mouse_mode = m; instant_save (); - - if (!internal_editing()) { - if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) { - - /* in all modes except range and joined object/range, hide the range selection, - show the object (region) selection. - */ - - for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { - (*i)->set_should_show_selection (true); - } - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - (*i)->hide_selection (); - } - - } else { - - /* - in range or object/range mode, show the range selection. - */ - - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - (*i)->show_selection (selection->time); - } - } - } + + if (!internal_editing()) { + if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) { + + /* in all modes except range and joined object/range, hide the range selection, + show the object (region) selection. + */ + + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + (*i)->hide_selection (); + } + + } else { + + /* + in range or object/range mode, show the range selection. + */ + + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + (*i)->show_selection (selection->time); + } + } + } set_canvas_cursor (); + + MouseModeChanged (); /* EMIT SIGNAL */ } void @@ -460,15 +506,13 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp Selection::Operation op = ArdourKeyboard::selection_type (event->button.state); bool press = (event->type == GDK_BUTTON_PRESS); - // begin_reversible_command (_("select on click")); - switch (item_type) { case RegionItem: if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) { set_selected_regionview_from_click (press, op, true); } else if (event->type == GDK_BUTTON_PRESS) { selection->clear_tracks (); - set_selected_track_as_side_effect (true); + set_selected_track_as_side_effect (op, true); } if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty()) { clicked_selection = select_range_around_region (selection->regions.front()); @@ -477,12 +521,12 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp case RegionViewNameHighlight: case RegionViewName: - case LeftFrameHandle: - case RightFrameHandle: + case LeftFrameHandle: + case RightFrameHandle: if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) { set_selected_regionview_from_click (press, op, true); } else if (event->type == GDK_BUTTON_PRESS) { - set_selected_track_as_side_effect (); + set_selected_track_as_side_effect (op); } break; @@ -494,12 +538,12 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) { set_selected_regionview_from_click (press, op, true); } else if (event->type == GDK_BUTTON_PRESS) { - set_selected_track_as_side_effect (); + set_selected_track_as_side_effect (op); } break; case ControlPointItem: - set_selected_track_as_side_effect (true); + set_selected_track_as_side_effect (op, true); if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) { set_selected_control_point_from_click (op, false); } @@ -509,12 +553,12 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp /* for context click, select track */ if (event->button.button == 3) { selection->clear_tracks (); - set_selected_track_as_side_effect (true); + set_selected_track_as_side_effect (op, true); } break; case AutomationTrackItem: - set_selected_track_as_side_effect (true); + set_selected_track_as_side_effect (op, true); break; default: @@ -545,26 +589,42 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; case TempoMarkerItem: - _drags->set ( - new TempoMarkerDrag ( - this, - item, - Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) - ), - event - ); - return true; + { + TempoMarker* m = reinterpret_cast (item->get_data ("marker")); + assert (m); + if (m->tempo().movable ()) { + _drags->set ( + new TempoMarkerDrag ( + this, + item, + Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) + ), + event + ); + return true; + } else { + return false; + } + } case MeterMarkerItem: - _drags->set ( - new MeterMarkerDrag ( - this, - item, - Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) - ), - event - ); - return true; + { + MeterMarker* m = reinterpret_cast (item->get_data ("marker")); + assert (m); + if (m->meter().movable ()) { + _drags->set ( + new MeterMarkerDrag ( + this, + item, + Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) + ), + event + ); + return true; + } else { + return false; + } + } case MarkerBarItem: case TempoBarItem: @@ -654,7 +714,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT AutomationTimeAxisView* atv = dynamic_cast (tvp.first); if (join_object_range_button.get_active() && atv) { /* smart "join" mode: drag automation */ - _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event); + _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event, _cursors->up_down); } else { /* this was debated, but decided the more common action was to make a new selection */ @@ -664,37 +724,51 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT } break; - case NoteItem: - if (internal_editing()) { - /* trim notes if we're in internal edit mode and near the ends of the note */ - _drags->set (new NoteResizeDrag (this, item), event); - } + case NoteItem: + if (internal_editing()) { + /* trim notes if we're in internal edit mode and near the ends of the note */ + ArdourCanvas::CanvasNote* cn = dynamic_cast (item); + if (cn && cn->big_enough_to_trim() && cn->mouse_near_ends()) { + _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor); + } else { + _drags->set (new NoteDrag (this, item), event); + } + } return true; - case StreamItem: - if (internal_editing()) { - _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); - return true; - } else { + case StreamItem: + if (internal_editing()) { + if (dynamic_cast (clicked_axisview)) { + _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); + return true; + } + } else { _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); return true; } - break; + break; - case RegionViewNameHighlight: - case LeftFrameHandle: - case RightFrameHandle: - { - RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); - _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event); - return true; - break; - } + case RegionViewNameHighlight: + if (!clicked_regionview->region()->locked()) { + RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); + _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event); + return true; + } + break; + + case LeftFrameHandle: + case RightFrameHandle: + if (!internal_editing() && !clicked_regionview->region()->locked()) { + RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); + _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event); + return true; + } + break; default: - if (!internal_editing()) { - _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); - } + if (!internal_editing()) { + _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); + } } return true; break; @@ -703,11 +777,16 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT switch (item_type) { case NoteItem: if (internal_editing()) { - _drags->set (new NoteDrag (this, item), event); + ArdourCanvas::CanvasNoteEvent* cn = dynamic_cast (item); + if (cn->mouse_near_ends()) { + _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor); + } else { + _drags->set (new NoteDrag (this, item), event); + } return true; } break; - + default: break; } @@ -723,24 +802,24 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case FadeInHandleItem: { RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); - _drags->set (new FadeInDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event); + _drags->set (new FadeInDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event, _cursors->fade_in); return true; } case FadeOutHandleItem: { RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); - _drags->set (new FadeOutDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event); + _drags->set (new FadeOutDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event, _cursors->fade_out); return true; } case FeatureLineItem: - { + { if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) { remove_transient(item); return true; } - + _drags->set (new FeatureLineDrag (this, item), event); return true; break; @@ -753,17 +832,21 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT */ break; } - + + if (internal_editing ()) { + /* no region drags in internal edit mode */ + break; + } + /* click on a normal region view */ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) { add_region_copy_drag (item, event, clicked_regionview); - } - else if (Keyboard::the_keyboard().key_is_down (GDK_b)) { + } else if (Keyboard::the_keyboard().key_is_down (GDK_b)) { add_region_brush_drag (item, event, clicked_regionview); } else { add_region_drag (item, event, clicked_regionview); } - + if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty()) { _drags->add (new SelectionDrag (this, clicked_axisview->get_selection_rect (clicked_selection)->rect, SelectionDrag::SelectionMove)); } @@ -774,7 +857,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case RegionViewNameHighlight: case LeftFrameHandle: case RightFrameHandle: - if (!internal_editing ()) { + if (!clicked_regionview->region()->locked()) { RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event); return true; @@ -802,17 +885,29 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case StreamItem: if (internal_editing()) { - _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); + if (dynamic_cast (clicked_axisview)) { + _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); + } return true; } else { _drags->set (new RubberbandSelectDrag (this, item), event); } break; - + case AutomationTrackItem: - /* rubberband drag to select automation points */ - _drags->set (new RubberbandSelectDrag (this, item), event); + { + TimeAxisView* parent = clicked_axisview->get_parent (); + AutomationTimeAxisView* atv = dynamic_cast (clicked_axisview); + assert (atv); + if (parent && dynamic_cast (parent) && atv->show_regions ()) { + /* create a MIDI region so that we have somewhere to put automation */ + _drags->set (new RegionCreateDrag (this, item, parent), event); + } else { + /* rubberband drag to select automation points */ + _drags->set (new RubberbandSelectDrag (this, item), event); + } break; + } case SelectionItem: { @@ -824,7 +919,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT /* if we're over an automation track, start a drag of its data */ AutomationTimeAxisView* atv = dynamic_cast (tvp.first); if (atv) { - _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event); + _drags->set (new AutomationRangeDrag (this, atv->base_item(), selection->time), event, _cursors->up_down); } /* if we're over a track and a region, and in the `object' part of a region, @@ -836,7 +931,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT if (t) { boost::shared_ptr pl = t->playlist (); if (pl) { - + boost::shared_ptr r = pl->top_region_at (event_frame (event)); if (r) { RegionView* rv = rtv->view()->find_view (r); @@ -947,7 +1042,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MouseTimeFX: if (internal_editing() && item_type == NoteItem) { /* drag notes if we're in internal edit mode */ - _drags->set (new NoteResizeDrag (this, item), event); + _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor); return true; } else if ((!internal_editing() || dynamic_cast (clicked_regionview)) && clicked_regionview) { /* do time-FX if we're not in internal edit mode, or we are but we clicked on an audio region */ @@ -962,7 +1057,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT scrub_reverse_distance = 0; last_scrub_x = event->button.x; scrubbing_direction = 0; - track_canvas->get_window()->set_cursor (*transparent_cursor); + set_canvas_cursor (_cursors->transparent); return true; break; @@ -981,6 +1076,11 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MouseObject: switch (item_type) { case RegionItem: + if (internal_editing ()) { + /* no region drags in internal edit mode */ + return false; + } + if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) { add_region_copy_drag (item, event, clicked_regionview); } else { @@ -1000,6 +1100,10 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT switch (item_type) { case RegionViewNameHighlight: + _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event); + return true; + break; + case LeftFrameHandle: case RightFrameHandle: if (!internal_editing ()) { @@ -1027,7 +1131,7 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MouseZoom: if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - temporal_zoom_session(); + temporal_zoom_to_frame (false, event_frame (event)); } else { temporal_zoom_to_frame (true, event_frame(event)); } @@ -1063,6 +1167,8 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp } } + pre_press_cursor = current_canvas_cursor; + track_canvas->grab_focus(); if (_session && _session->actively_recording()) { @@ -1093,6 +1199,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp break; default: + return button_press_dispatch (&event->button); break; } @@ -1100,12 +1207,37 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp return false; } +bool +Editor::button_press_dispatch (GdkEventButton* ev) +{ + /* this function is intended only for buttons 4 and above. + */ + + Gtkmm2ext::MouseButton b (ev->state, ev->button); + return button_bindings->activate (b, Gtkmm2ext::Bindings::Press); +} + +bool +Editor::button_release_dispatch (GdkEventButton* ev) +{ + /* this function is intended only for buttons 4 and above. + */ + + Gtkmm2ext::MouseButton b (ev->state, ev->button); + return button_bindings->activate (b, Gtkmm2ext::Bindings::Release); +} + bool Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) { - nframes64_t where = event_frame (event, 0, 0); + framepos_t where = event_frame (event, 0, 0); AutomationTimeAxisView* atv = 0; + if (pre_press_cursor) { + set_canvas_cursor (pre_press_cursor); + pre_press_cursor = 0; + } + /* no action if we're recording */ if (_session && _session->actively_recording()) { @@ -1125,12 +1257,14 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT were_dragging = true; } + update_region_layering_order_editor (); + /* edit events get handled here */ if (!_drags->active () && Keyboard::is_edit_event (&event->button)) { switch (item_type) { case RegionItem: - edit_region (); + show_region_properties (); break; case TempoMarkerItem: @@ -1180,7 +1314,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case StreamItem: - popup_track_context_menu (1, event->button.time, item_type, false, where); + popup_track_context_menu (1, event->button.time, item_type, false); break; case RegionItem: @@ -1188,15 +1322,15 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case LeftFrameHandle: case RightFrameHandle: case RegionViewName: - popup_track_context_menu (1, event->button.time, item_type, false, where); + popup_track_context_menu (1, event->button.time, item_type, false); break; case SelectionItem: - popup_track_context_menu (1, event->button.time, item_type, true, where); + popup_track_context_menu (1, event->button.time, item_type, true); break; case AutomationTrackItem: - popup_track_context_menu (1, event->button.time, item_type, false, where); + popup_track_context_menu (1, event->button.time, item_type, false); break; case MarkerBarItem: @@ -1221,7 +1355,11 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case CrossfadeViewItem: - popup_track_context_menu (1, event->button.time, item_type, false, where); + popup_track_context_menu (1, event->button.time, item_type, false); + break; + + case ControlPointItem: + popup_control_point_context_menu (item, event); break; #ifdef WITH_CMT @@ -1273,11 +1411,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case ControlPointItem: - if (eff == MouseGain) { - remove_gain_control_point (item, event); - } else { - remove_control_point (item, event); - } + remove_control_point (item); break; case NoteItem: @@ -1379,7 +1513,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case MouseAudition: - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); if (scrubbing_direction == 0) { /* no drag, just a click */ switch (item_type) { @@ -1400,6 +1534,8 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT } + /* do any (de)selection operations that should occur on button release */ + button_selection (item, event, item_type); return true; break; @@ -1444,6 +1580,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT default: break; } + return false; } @@ -1455,10 +1592,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ double fraction; bool ret = true; - if (last_item_entered != item) { - last_item_entered = item; - last_item_entered_n = 0; - } + last_item_entered = item; switch (item_type) { case ControlPointItem: @@ -1476,14 +1610,11 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ fraction = 1.0 - (cp->get_y() / cp->line().height()); if (is_drawable() && !_drags->active ()) { - track_canvas->get_window()->set_cursor (*fader_cursor); + set_canvas_cursor (_cursors->fader); } - last_item_entered_n++; - set_verbose_canvas_cursor (cp->line().get_verbose_cursor_string (fraction), at_x, at_y); - if (last_item_entered_n < 10) { - show_verbose_canvas_cursor (); - } + _verbose_cursor->set (cp->line().get_verbose_cursor_string (fraction), at_x, at_y); + _verbose_cursor->show (); } break; @@ -1493,7 +1624,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ if (line) line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredGainLine.get(); if (is_drawable()) { - track_canvas->get_window()->set_cursor (*fader_cursor); + set_canvas_cursor (_cursors->fader); } } break; @@ -1506,26 +1637,22 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredAutomationLine.get(); } if (is_drawable()) { - track_canvas->get_window()->set_cursor (*fader_cursor); + set_canvas_cursor (_cursors->fader); } } break; case RegionViewNameHighlight: - if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) { - track_canvas->get_window()->set_cursor (*trimmer_cursor); + if (is_drawable() && mouse_mode == MouseObject && entered_regionview) { + set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview); + _over_region_trim_target = true; } break; case LeftFrameHandle: - if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) { - track_canvas->get_window()->set_cursor (*left_side_trim_cursor); - } - break; - case RightFrameHandle: - if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) { - track_canvas->get_window()->set_cursor (*right_side_trim_cursor); + if (is_drawable() && mouse_mode == MouseObject && !internal_editing() && entered_regionview) { + set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview); } break; @@ -1540,7 +1667,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ #endif if (is_drawable()) { - track_canvas->get_window()->set_cursor (*trimmer_cursor); + set_canvas_cursor (_cursors->trimmer); } break; @@ -1548,10 +1675,10 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ if (is_drawable()) { switch (_edit_point) { case EditAtMouse: - track_canvas->get_window()->set_cursor (*grabber_edit_point_cursor); + set_canvas_cursor (_cursors->grabber_edit_point); break; default: - track_canvas->get_window()->set_cursor (*grabber_cursor); + set_canvas_cursor (_cursors->grabber); break; } } @@ -1563,7 +1690,8 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ if (!reinterpret_cast (item->get_data ("regionview"))->name_active()) { if (mouse_mode == MouseObject && is_drawable()) { - track_canvas->get_window()->set_cursor (*trimmer_cursor); + set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview); + _over_region_trim_target = true; } } break; @@ -1574,17 +1702,17 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ Gdk::Cursor *cursor; switch (mouse_mode) { case MouseRange: - cursor = selector_cursor; + cursor = _cursors->selector; break; case MouseZoom: - cursor = zoom_cursor; + cursor = _cursors->zoom_in; break; default: - cursor = cross_hair_cursor; + cursor = _cursors->cross_hair; break; } - track_canvas->get_window()->set_cursor (*cursor); + set_canvas_cursor (cursor); AutomationTimeAxisView* atv; if ((atv = static_cast(item->get_data ("trackview"))) != 0) { @@ -1601,7 +1729,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ case MeterBarItem: case TempoBarItem: if (is_drawable()) { - track_canvas->get_window()->set_cursor (*timebar_cursor); + set_canvas_cursor (_cursors->timebar); } break; @@ -1615,7 +1743,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ case MeterMarkerItem: case TempoMarkerItem: if (is_drawable()) { - track_canvas->get_window()->set_cursor (*timebar_cursor); + set_canvas_cursor (_cursors->timebar); } break; @@ -1623,29 +1751,33 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ if (mouse_mode == MouseObject && !internal_editing()) { ArdourCanvas::SimpleRect *rect = dynamic_cast (item); if (rect) { - rect->property_fill_color_rgba() = 0; - rect->property_outline_pixels() = 1; + rect->property_fill_color_rgba() = 0xBBBBBBAA; } - track_canvas->get_window()->set_cursor (*fade_in_cursor); + set_canvas_cursor (_cursors->fade_in); } - break; + break; case FadeOutHandleItem: if (mouse_mode == MouseObject && !internal_editing()) { ArdourCanvas::SimpleRect *rect = dynamic_cast (item); if (rect) { - rect->property_fill_color_rgba() = 0; - rect->property_outline_pixels() = 1; + rect->property_fill_color_rgba() = 0xBBBBBBAA; } - track_canvas->get_window()->set_cursor (*fade_out_cursor); + set_canvas_cursor (_cursors->fade_out); } break; case FeatureLineItem: { - ArdourCanvas::SimpleLine *line = dynamic_cast (item); - line->property_color_rgba() = 0xFF0000FF; + ArdourCanvas::Line *line = dynamic_cast (item); + line->property_fill_color_rgba() = 0xFF0000FF; + } + break; + case SelectionItem: + if (join_object_range_button.get_active()) { + set_canvas_cursor (); } break; + default: break; } @@ -1674,7 +1806,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ } bool -Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) +Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) { AutomationLine* al; ControlPoint* cp; @@ -1682,7 +1814,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ Location *loc; RegionView* rv; bool is_start; - bool ret = true; + bool ret = true; switch (item_type) { case ControlPointItem: @@ -1694,10 +1826,10 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ } if (is_drawable()) { - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); } - hide_verbose_canvas_cursor (); + _verbose_cursor->hide (); break; case RegionViewNameHighlight: @@ -1714,8 +1846,10 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ case MarkerViewHandleEndItem: #endif + _over_region_trim_target = false; + if (is_drawable()) { - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); } break; @@ -1728,15 +1862,17 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ line->property_fill_color_rgba() = al->get_line_color(); } if (is_drawable()) { - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); } break; case RegionViewName: /* see enter_handler() for notes */ + _over_region_trim_target = false; + if (!reinterpret_cast (item->get_data ("regionview"))->name_active()) { if (is_drawable() && mouse_mode == MouseObject) { - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); } } break; @@ -1748,7 +1884,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ case TempoBarItem: case MarkerBarItem: if (is_drawable()) { - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); } break; @@ -1765,7 +1901,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ case TempoMarkerItem: if (is_drawable()) { - track_canvas->get_window()->set_cursor (*timebar_cursor); + set_canvas_cursor (_cursors->timebar); } break; @@ -1780,20 +1916,20 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ rect->property_outline_pixels() = 0; } } - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); break; case AutomationTrackItem: if (is_drawable()) { - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); clear_entered_track = true; Glib::signal_idle().connect (sigc::mem_fun(*this, &Editor::left_automation_track)); } break; case FeatureLineItem: { - ArdourCanvas::SimpleLine *line = dynamic_cast (item); - line->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();; + ArdourCanvas::Line *line = dynamic_cast (item); + line->property_fill_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();; } break; @@ -1815,7 +1951,7 @@ Editor::left_automation_track () } void -Editor::scrub (nframes64_t frame, double current_x) +Editor::scrub (framepos_t frame, double current_x) { double delta; @@ -1846,7 +1982,7 @@ Editor::scrub (nframes64_t frame, double current_x) scrub_reverse_distance = 0; delta = 0.01 * (last_scrub_x - current_x); - _session->request_transport_speed (_session->transport_speed() - delta); + _session->request_transport_speed_nonzero (_session->transport_speed() - delta); } } else { @@ -1865,7 +2001,7 @@ Editor::scrub (nframes64_t frame, double current_x) scrub_reverse_distance = 0; delta = 0.01 * (current_x - last_scrub_x); - _session->request_transport_speed (_session->transport_speed() + delta); + _session->request_transport_speed_nonzero (_session->transport_speed() + delta); } } @@ -1896,6 +2032,8 @@ Editor::scrub (nframes64_t frame, double current_x) bool Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from_autoscroll) { + _last_motion_y = event->motion.y; + if (event->motion.is_hint) { gint x, y; @@ -1928,11 +2066,15 @@ Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from set_canvas_cursor (); } + if (_over_region_trim_target) { + set_canvas_cursor_for_region_view (event->motion.x, entered_regionview); + } + bool handled = false; if (_drags->active ()) { handled = _drags->motion_handler (event, from_autoscroll); } - + if (!handled) { return false; } @@ -1941,8 +2083,8 @@ Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from return true; } -void -Editor::remove_gain_control_point (ArdourCanvas::Item*item, GdkEvent* /*event*/) +bool +Editor::can_remove_control_point (ArdourCanvas::Item* item) { ControlPoint* control_point; @@ -1951,18 +2093,24 @@ Editor::remove_gain_control_point (ArdourCanvas::Item*item, GdkEvent* /*event*/) /*NOTREACHED*/ } - // We shouldn't remove the first or last gain point - if (control_point->line().is_last_point(*control_point) || - control_point->line().is_first_point(*control_point)) { - return; + AutomationLine& line = control_point->line (); + if (dynamic_cast (&line)) { + /* we shouldn't remove the first or last gain point in region gain lines */ + if (line.is_last_point(*control_point) || line.is_first_point(*control_point)) { + return false; + } } - control_point->line().remove_point (*control_point); + return true; } void -Editor::remove_control_point (ArdourCanvas::Item* item, GdkEvent* /*event*/) +Editor::remove_control_point (ArdourCanvas::Item* item) { + if (!can_remove_control_point (item)) { + return; + } + ControlPoint* control_point; if ((control_point = reinterpret_cast (item->get_data ("control_point"))) == 0) { @@ -2006,7 +2154,7 @@ Editor::edit_note (ArdourCanvas::Item* item) d.run (); } - + void Editor::visible_order_range (int* low, int* high) const @@ -2046,166 +2194,26 @@ Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event) speed = rtv->track()->speed(); } - nframes64_t where = get_preferred_edit_position(); + framepos_t where = get_preferred_edit_position(); if (where >= 0) { if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) { - align_region (rv.region(), SyncPoint, (nframes64_t) (where * speed)); + align_region (rv.region(), SyncPoint, (framepos_t) (where * speed)); } else if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { - align_region (rv.region(), End, (nframes64_t) (where * speed)); + align_region (rv.region(), End, (framepos_t) (where * speed)); } else { - align_region (rv.region(), Start, (nframes64_t) (where * speed)); + align_region (rv.region(), Start, (framepos_t) (where * speed)); } } } } -void -Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, double ypos) -{ - char buf[128]; - Timecode::Time timecode; - BBT_Time bbt; - int hours, mins; - nframes64_t frame_rate; - float secs; - - if (_session == 0) { - return; - } - - AudioClock::Mode m; - - if (Profile->get_sae() || Profile->get_small_screen()) { - m = ARDOUR_UI::instance()->primary_clock.mode(); - } else { - m = ARDOUR_UI::instance()->secondary_clock.mode(); - } - - switch (m) { - case AudioClock::BBT: - _session->bbt_time (frame, bbt); - snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, bbt.bars, bbt.beats, bbt.ticks); - break; - - case AudioClock::Timecode: - _session->timecode_time (frame, timecode); - snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); - break; - - case AudioClock::MinSec: - /* XXX this is copied from show_verbose_duration_cursor() */ - frame_rate = _session->frame_rate(); - hours = frame / (frame_rate * 3600); - frame = frame % (frame_rate * 3600); - mins = frame / (frame_rate * 60); - frame = frame % (frame_rate * 60); - secs = (float) frame / (float) frame_rate; - snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%07.4f", hours, mins, secs); - break; - - default: - snprintf (buf, sizeof(buf), "%" PRIi64, frame); - break; - } - - if (xpos >= 0 && ypos >=0) { - set_verbose_canvas_cursor (buf, xpos + offset, ypos + offset); - } else { - set_verbose_canvas_cursor (buf, _drags->current_pointer_x() + offset - horizontal_position(), _drags->current_pointer_y() + offset - vertical_adjustment.get_value() + canvas_timebars_vsize); - } - show_verbose_canvas_cursor (); -} - -void -Editor::show_verbose_duration_cursor (nframes64_t start, nframes64_t end, double offset, double xpos, double ypos) -{ - char buf[128]; - Timecode::Time timecode; - BBT_Time sbbt; - BBT_Time ebbt; - int hours, mins; - nframes64_t distance, frame_rate; - float secs; - Meter meter_at_start(_session->tempo_map().meter_at(start)); - - if (_session == 0) { - return; - } - - AudioClock::Mode m; - - if (Profile->get_sae() || Profile->get_small_screen()) { - m = ARDOUR_UI::instance()->primary_clock.mode (); - } else { - m = ARDOUR_UI::instance()->secondary_clock.mode (); - } - - switch (m) { - case AudioClock::BBT: - _session->bbt_time (start, sbbt); - _session->bbt_time (end, ebbt); - - /* subtract */ - /* XXX this computation won't work well if the - user makes a selection that spans any meter changes. - */ - - ebbt.bars -= sbbt.bars; - if (ebbt.beats >= sbbt.beats) { - ebbt.beats -= sbbt.beats; - } else { - ebbt.bars--; - ebbt.beats = int(meter_at_start.beats_per_bar()) + ebbt.beats - sbbt.beats; - } - if (ebbt.ticks >= sbbt.ticks) { - ebbt.ticks -= sbbt.ticks; - } else { - ebbt.beats--; - ebbt.ticks = int(Meter::ticks_per_beat) + ebbt.ticks - sbbt.ticks; - } - - snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, ebbt.bars, ebbt.beats, ebbt.ticks); - break; - - case AudioClock::Timecode: - _session->timecode_duration (end - start, timecode); - snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); - break; - - case AudioClock::MinSec: - /* XXX this stuff should be elsewhere.. */ - distance = end - start; - frame_rate = _session->frame_rate(); - hours = distance / (frame_rate * 3600); - distance = distance % (frame_rate * 3600); - mins = distance / (frame_rate * 60); - distance = distance % (frame_rate * 60); - secs = (float) distance / (float) frame_rate; - snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%07.4f", hours, mins, secs); - break; - - default: - snprintf (buf, sizeof(buf), "%" PRIi64, end - start); - break; - } - - if (xpos >= 0 && ypos >=0) { - set_verbose_canvas_cursor (buf, xpos + offset, ypos + offset); - } - else { - set_verbose_canvas_cursor (buf, _drags->current_pointer_x() + offset, _drags->current_pointer_y() + offset); - } - - show_verbose_canvas_cursor (); -} - void Editor::collect_new_region_view (RegionView* rv) { @@ -2232,141 +2240,14 @@ Editor::cancel_selection () void -Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool swap_direction) -{ - boost::shared_ptr region (rv.region()); - - if (region->locked()) { - return; - } - - nframes64_t new_bound; - - double speed = 1.0; - TimeAxisView* tvp = clicked_axisview; - RouteTimeAxisView* tv = dynamic_cast(tvp); - - if (tv && tv->is_track()) { - speed = tv->track()->speed(); - } - - if (left_direction) { - if (swap_direction) { - new_bound = (nframes64_t) (region->position()/speed) + frame_delta; - } else { - new_bound = (nframes64_t) (region->position()/speed) - frame_delta; - } - } else { - if (swap_direction) { - new_bound = (nframes64_t) (region->position()/speed) - frame_delta; - } else { - new_bound = (nframes64_t) (region->position()/speed) + frame_delta; - } - } - - region->trim_start ((nframes64_t) (new_bound * speed), this); - rv.region_changed (PropertyChange (ARDOUR::Properties::start)); -} - -void -Editor::single_start_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap) -{ - boost::shared_ptr region (rv.region()); - - if (region->locked()) { - return; - } - - double speed = 1.0; - TimeAxisView* tvp = clicked_axisview; - RouteTimeAxisView* tv = dynamic_cast(tvp); - - if (tv && tv->is_track()) { - speed = tv->track()->speed(); - } - - nframes64_t pre_trim_first_frame = region->first_frame(); - - region->trim_front ((nframes64_t) (new_bound * speed), this); - - if (no_overlap) { - //Get the next region on the left of this region and shrink/expand it. - boost::shared_ptr playlist (region->playlist()); - boost::shared_ptr region_left = playlist->find_next_region (pre_trim_first_frame, End, 0); - - bool regions_touching = false; - - if (region_left != 0 && (pre_trim_first_frame == region_left->last_frame() + 1)){ - regions_touching = true; - } - - //Only trim region on the left if the first frame has gone beyond the left region's last frame. - if (region_left != 0 && - (region_left->last_frame() > region->first_frame() || regions_touching)) - { - region_left->trim_end(region->first_frame() - 1, this); - } - } - - rv.region_changed (ARDOUR::bounds_change); -} - -void -Editor::single_end_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap) -{ - boost::shared_ptr region (rv.region()); - - if (region->locked()) { - return; - } - - double speed = 1.0; - TimeAxisView* tvp = clicked_axisview; - RouteTimeAxisView* tv = dynamic_cast(tvp); - - if (tv && tv->is_track()) { - speed = tv->track()->speed(); - } - - nframes64_t pre_trim_last_frame = region->last_frame(); - - region->trim_end ((nframes64_t) (new_bound * speed), this); - - if (no_overlap) { - //Get the next region on the right of this region and shrink/expand it. - boost::shared_ptr playlist (region->playlist()); - boost::shared_ptr region_right = playlist->find_next_region (pre_trim_last_frame, Start, 1); - - bool regions_touching = false; - - if (region_right != 0 && (pre_trim_last_frame == region_right->first_frame() - 1)) { - regions_touching = true; - } - - //Only trim region on the right if the last frame has gone beyond the right region's first frame. - if (region_right != 0 && - (region_right->first_frame() < region->last_frame() || regions_touching)) - { - region_right->trim_front(region->last_frame() + 1, this); - } - - rv.region_changed (ARDOUR::bounds_change); - - } else { - rv.region_changed (PropertyChange (ARDOUR::Properties::length)); - } -} - - -void -Editor::point_trim (GdkEvent* event, nframes64_t new_bound) +Editor::point_trim (GdkEvent* event, framepos_t new_bound) { RegionView* rv = clicked_regionview; /* Choose action dependant on which button was pressed */ switch (event->button.button) { case 1: - begin_reversible_command (_("Start point trim")); + begin_reversible_command (_("start point trim")); if (selection->selected (rv)) { for (list::const_iterator i = selection->regions.by_layer().begin(); @@ -2377,16 +2258,16 @@ Editor::point_trim (GdkEvent* event, nframes64_t new_bound) } if (!(*i)->region()->locked()) { - (*i)->region()->clear_history (); - (*i)->region()->trim_front (new_bound, this); + (*i)->region()->clear_changes (); + (*i)->region()->trim_front (new_bound); _session->add_command(new StatefulDiffCommand ((*i)->region())); } } } else { if (!rv->region()->locked()) { - rv->region()->clear_history (); - rv->region()->trim_front (new_bound, this); + rv->region()->clear_changes (); + rv->region()->trim_front (new_bound); _session->add_command(new StatefulDiffCommand (rv->region())); } } @@ -2402,8 +2283,8 @@ Editor::point_trim (GdkEvent* event, nframes64_t new_bound) for (list::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) { if (!(*i)->region()->locked()) { - (*i)->region()->clear_history(); - (*i)->region()->trim_end (new_bound, this); + (*i)->region()->clear_changes(); + (*i)->region()->trim_end (new_bound); _session->add_command(new StatefulDiffCommand ((*i)->region())); } } @@ -2411,8 +2292,8 @@ Editor::point_trim (GdkEvent* event, nframes64_t new_bound) } else { if (!rv->region()->locked()) { - rv->region()->clear_history (); - rv->region()->trim_end (new_bound, this); + rv->region()->clear_changes (); + rv->region()->trim_end (new_bound); _session->add_command (new StatefulDiffCommand (rv->region())); } } @@ -2425,24 +2306,6 @@ Editor::point_trim (GdkEvent* event, nframes64_t new_bound) } } -void -Editor::thaw_region_after_trim (RegionView& rv) -{ - boost::shared_ptr region (rv.region()); - - if (region->locked()) { - return; - } - - region->resume_property_changes (); - - AudioRegionView* arv = dynamic_cast(&rv); - - if (arv) { - arv->unhide_envelope (); - } -} - void Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/) { @@ -2460,7 +2323,7 @@ Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/) void -Editor::reposition_zoom_rect (nframes64_t start, nframes64_t end) +Editor::reposition_zoom_rect (framepos_t start, framepos_t end) { double x1 = frame_to_pixel (start); double x2 = frame_to_pixel (end); @@ -2499,7 +2362,7 @@ Editor::mouse_rename_region (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/) void -Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos) +Editor::mouse_brush_insert_region (RegionView* rv, framepos_t pos) { /* no brushing without a useful snap setting */ @@ -2533,9 +2396,9 @@ Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos) boost::shared_ptr playlist = rtv->playlist(); double speed = rtv->track()->speed(); - playlist->clear_history (); - boost::shared_ptr new_region (RegionFactory::create (rv->region())); - playlist->add_region (new_region, (nframes64_t) (pos * speed)); + playlist->clear_changes (); + boost::shared_ptr new_region (RegionFactory::create (rv->region(), true)); + playlist->add_region (new_region, (framepos_t) (pos * speed)); _session->add_command (new StatefulDiffCommand (playlist)); // playlist is frozen, so we have to update manually XXX this is disgusting @@ -2554,10 +2417,14 @@ Editor::track_height_step_timeout () } void -Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); + if (!region_view->region()->playlist()) { + return; + } + _region_motion_group->raise_to_top (); if (Config->get_edit_mode() == Splice) { @@ -2572,10 +2439,14 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* } void -Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); + if (!region_view->region()->playlist()) { + return; + } + _region_motion_group->raise_to_top (); RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); @@ -2583,10 +2454,14 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionV } void -Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); + if (!region_view->region()->playlist()) { + return; + } + if (Config->get_edit_mode() == Splice) { return; } @@ -2594,7 +2469,7 @@ Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent* event, Region RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), true, false)); - begin_reversible_command (_("Drag region brush")); + begin_reversible_command (Operations::drag_region_brush); } /** Start a grab where a time range is selected, track(s) are selected, and the @@ -2635,11 +2510,11 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event) creating the new region and another for moving it. */ - begin_reversible_command (_("selection grab")); + begin_reversible_command (Operations::selection_grab); boost::shared_ptr playlist = clicked_axisview->playlist(); - playlist->clear_history (); + playlist->clear_changes (); clicked_routeview->playlist()->add_region (region, selection->time[clicked_selection].start); _session->add_command(new StatefulDiffCommand (playlist)); @@ -2678,20 +2553,30 @@ Editor::set_internal_edit (bool yn) if (yn) { mouse_select_button.set_image (*(manage (new Image (::get_icon("midi_tool_pencil"))))); mouse_select_button.get_image ()->show (); - ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Draw/Edit MIDI Notes")); - set_canvas_cursor (); + ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Draw/Edit MIDI Notes")); + mouse_mode_toggled (mouse_mode); - /* deselect everything to avoid confusion when e.g. we can't now cut a previously selected - region because cut means "cut note" rather than "cut region". - */ - selection->clear (); + pre_internal_mouse_mode = mouse_mode; + + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + (*i)->enter_internal_edit_mode (); + } } else { mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range"))))); mouse_select_button.get_image ()->show (); - ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges")); - mouse_mode_toggled (mouse_mode); // sets cursor + ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges")); + mouse_mode_toggled (mouse_mode); // sets cursor + + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + (*i)->leave_internal_edit_mode (); + } + + if (mouse_mode == MouseRange && pre_internal_mouse_mode != MouseRange) { + /* we were drawing .. flip back to something sensible */ + set_mouse_mode (pre_internal_mouse_mode); + } } } @@ -2699,18 +2584,18 @@ Editor::set_internal_edit (bool yn) * used by the `join object/range' tool mode. */ void -Editor::update_join_object_range_location (double x, double y) +Editor::update_join_object_range_location (double /*x*/, double y) { /* XXX: actually, this decides based on whether the mouse is in the top or bottom half of a RouteTimeAxisView; entered_{track,regionview} is not always setup (e.g. if the mouse is over a TimeSelection), and to get a Region that we're over requires searching the playlist. */ - + if (join_object_range_button.get_active() == false || (mouse_mode != MouseRange && mouse_mode != MouseObject)) { _join_object_range_state = JOIN_OBJECT_RANGE_NONE; return; } - + if (mouse_mode == MouseObject) { _join_object_range_state = JOIN_OBJECT_RANGE_OBJECT; } else if (mouse_mode == MouseRange) { @@ -2719,7 +2604,7 @@ Editor::update_join_object_range_location (double x, double y) /* XXX: maybe we should make entered_track work in all cases, rather than resorting to this */ pair tvp = trackview_by_y_position (y + vertical_adjustment.get_value() - canvas_timebars_vsize); - + if (tvp.first) { RouteTimeAxisView* rtv = dynamic_cast (tvp.first); @@ -2729,9 +2614,11 @@ Editor::update_join_object_range_location (double x, double y) double cy = y; rtv->canvas_display()->w2i (cx, cy); - bool const top_half = cy < rtv->current_height () / 2; - - _join_object_range_state = top_half ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT; + double const c = cy / rtv->view()->child_height(); + double d; + double const f = modf (c, &d); + + _join_object_range_state = f < 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT; } } } @@ -2756,3 +2643,46 @@ Editor::remove_midi_note (ArdourCanvas::Item* item, GdkEvent *) e->region_view().delete_note (e->note ()); } + +void +Editor::set_canvas_cursor_for_region_view (double x, RegionView* rv) +{ + assert (rv); + + ArdourCanvas::Group* g = rv->get_canvas_group (); + ArdourCanvas::Group* p = g->get_parent_group (); + + /* Compute x in region view parent coordinates */ + double dy = 0; + p->w2i (x, dy); + + double x1, x2, y1, y2; + g->get_bounds (x1, y1, x2, y2); + + /* Halfway across the region */ + double const h = (x1 + x2) / 2; + + Trimmable::CanTrim ct = rv->region()->can_trim (); + if (x <= h) { + if (ct & Trimmable::FrontTrimEarlier) { + set_canvas_cursor (_cursors->left_side_trim); + } else { + set_canvas_cursor (_cursors->left_side_trim_right_only); + } + } else { + if (ct & Trimmable::EndTrimLater) { + set_canvas_cursor (_cursors->right_side_trim); + } else { + set_canvas_cursor (_cursors->right_side_trim_left_only); + } + } +} + +/** Obtain the pointer position in world coordinates */ +void +Editor::get_pointer_position (double& x, double& y) const +{ + int px, py; + track_canvas->get_pointer (px, py); + track_canvas->window_to_world (px, py, x, y); +}