X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mouse.cc;h=68899e67a20c4d5d6448eddcb0e06ae6257b4652;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=b04f74844c67489097f7cbdfc28ec9b8062f10dc;hpb=95c214c923363e169beab2ef104e1db1743d75ae;p=ardour.git diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index b04f74844c..68899e67a2 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -60,7 +60,6 @@ #include "automation_time_axis.h" #include "control_point.h" #include "prompter.h" -#include "utils.h" #include "selection.h" #include "keyboard.h" #include "editing.h" @@ -114,7 +113,7 @@ Editor::mouse_frame (framepos_t& where, bool& in_track_canvas) const return false; } - if (pointer_window != canvas_window && pointer_window != _time_bars_canvas->get_window()) { + if (pointer_window != canvas_window) { in_track_canvas = false; return false; } @@ -134,18 +133,16 @@ Editor::mouse_frame (framepos_t& where, bool& in_track_canvas) const framepos_t Editor::window_event_sample (GdkEvent const * event, double* pcx, double* pcy) const { - double x; - double y; + ArdourCanvas::Duple d; - if (!gdk_event_get_coords (event, &x, &y)) { + if (!gdk_event_get_coords (event, &d.x, &d.y)) { return 0; } /* event coordinates are in window units, so convert to canvas - * (i.e. account for scrolling) */ - ArdourCanvas::Duple d = _track_canvas->window_to_canvas (ArdourCanvas::Duple (x, y)); + d = _track_canvas->window_to_canvas (d); if (pcx) { *pcx = d.x; @@ -179,57 +176,12 @@ Editor::canvas_event_sample (GdkEvent const * event, double* pcx, double* pcy) c *pcy = y; } - /* note that pixel_to_sample() never returns less than zero, so even if the pixel + /* note that pixel_to_sample_from_event() never returns less than zero, so even if the pixel position is negative (as can be the case with motion events in particular), the frame location is always positive. */ - return pixel_to_sample (x); -} - -Gdk::Cursor* -Editor::which_grabber_cursor () -{ - Gdk::Cursor* c = _cursors->grabber; - - if (_internal_editing) { - switch (mouse_mode) { - case MouseDraw: - c = _cursors->midi_pencil; - break; - - case MouseObject: - c = _cursors->grabber_note; - break; - - case MouseTimeFX: - c = _cursors->midi_resize; - break; - - case MouseRange: - c = _cursors->grabber_note; - break; - - default: - break; - } - - } else { - - switch (_edit_point) { - case EditAtMouse: - c = _cursors->grabber_edit_point; - break; - default: - boost::shared_ptr m = _movable.lock(); - if (m && m->locked()) { - c = _cursors->speaker; - } - break; - } - } - - return c; + return pixel_to_sample_from_event (x); } void @@ -239,7 +191,6 @@ Editor::set_current_trimmable (boost::shared_ptr t) if (!st || st == t) { _trimmable = t; - set_canvas_cursor (); } } @@ -250,91 +201,7 @@ Editor::set_current_movable (boost::shared_ptr m) if (!sm || sm != m) { _movable = m; - set_canvas_cursor (); - } -} - -void -Editor::set_canvas_cursor () -{ - switch (mouse_mode) { - case MouseRange: - current_canvas_cursor = _cursors->selector; - if (_internal_editing) { - current_canvas_cursor = which_grabber_cursor(); - } - break; - - case MouseObject: - current_canvas_cursor = which_grabber_cursor(); - break; - - case MouseDraw: - current_canvas_cursor = _cursors->midi_pencil; - break; - - case MouseGain: - current_canvas_cursor = _cursors->cross_hair; - break; - - case MouseZoom: - 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 = _cursors->time_fx; // just use playhead - break; - - case MouseAudition: - current_canvas_cursor = _cursors->speaker; - break; } - - if (!_internal_editing) { - switch (_join_object_range_state) { - case JOIN_OBJECT_RANGE_NONE: - break; - case JOIN_OBJECT_RANGE_OBJECT: - current_canvas_cursor = which_grabber_cursor (); - break; - case JOIN_OBJECT_RANGE_RANGE: - current_canvas_cursor = _cursors->selector; - break; - } - } - - /* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */ - if (!_internal_editing && get_smart_mode() ) { - - double x, y; - get_pointer_position (x, y); - - if (x >= 0 && y >= 0) { - - vector items; - - _track_canvas->root()->add_items_at_point (ArdourCanvas::Duple (x,y), items); - - // first item will be the upper most - - if (!items.empty()) { - const ArdourCanvas::Item* i = items.front(); - - if (i && i->parent() && i->parent()->get_data (X_("timeselection"))) { - pair tvp = trackview_by_y_position (_last_motion_y); - if (dynamic_cast (tvp.first)) { - current_canvas_cursor = _cursors->up_down; - } - } - } - } - } - - set_canvas_cursor (current_canvas_cursor, true); } void @@ -365,6 +232,10 @@ Editor::set_mouse_mode (MouseMode m, bool force) return; } + if (ARDOUR::Profile->get_mixbus()) { + if ( m == MouseCut) m = MouseObject; + } + Glib::RefPtr act; switch (m) { @@ -372,6 +243,10 @@ Editor::set_mouse_mode (MouseMode m, bool force) act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range")); break; + case MouseCut: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-cut")); + break; + case MouseObject: act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object")); break; @@ -380,18 +255,14 @@ Editor::set_mouse_mode (MouseMode m, bool force) act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw")); break; - case MouseGain: - act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-gain")); - break; - - case MouseZoom: - act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-zoom")); - break; - case MouseTimeFX: act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-timefx")); break; + case MouseContent: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-content")); + break; + case MouseAudition: act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-audition")); break; @@ -415,6 +286,10 @@ Editor::mouse_mode_toggled (MouseMode m) Glib::RefPtr act; Glib::RefPtr tact; + if (ARDOUR::Profile->get_mixbus()) { + if ( m == MouseCut) m = MouseObject; + } + switch (m) { case MouseRange: act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range")); @@ -424,22 +299,22 @@ Editor::mouse_mode_toggled (MouseMode m) act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object")); break; - case MouseDraw: - act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw")); - break; - - case MouseGain: - act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-gain")); + case MouseCut: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-cut")); break; - case MouseZoom: - act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-zoom")); + case MouseDraw: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw")); break; case MouseTimeFX: act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-timefx")); break; + case MouseContent: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-content")); + break; + case MouseAudition: act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-audition")); break; @@ -458,16 +333,6 @@ Editor::mouse_mode_toggled (MouseMode m) return; } - switch (m) { - case MouseDraw: - act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit")); - tact = Glib::RefPtr::cast_dynamic(act); - tact->set_active (true); - break; - default: - break; - } - if (_session && mouse_mode == MouseAudition) { /* stop transport and reset default speed to avoid oddness with auditioning */ @@ -478,26 +343,14 @@ Editor::mouse_mode_toggled (MouseMode m) instant_save (); - //TODO: set button styles for smart buttons -/* - if ( smart_mode_action->get_active() ) { - if( mouse_mode == MouseObject ) { //smart active and object active - smart_mode_button.set_active(1); - smart_mode_button.set_name("smart mode button"); - mouse_move_button.set_name("smart mode button"); - } else { //smart active but object inactive - smart_mode_button.set_active(0); - smart_mode_button.set_name("smart mode button"); - mouse_move_button.set_name("mouse mode button"); - } - } else { - smart_mode_button.set_active(0); - smart_mode_button.set_name("mouse mode button"); - mouse_move_button.set_name("mouse mode button"); + /* this should generate a new enter event which will + trigger the appropiate cursor. + */ + + if (_track_canvas) { + _track_canvas->re_enter (); } -*/ - - set_canvas_cursor (); + set_gain_envelope_visibility (); update_time_selection_display (); @@ -505,106 +358,35 @@ Editor::mouse_mode_toggled (MouseMode m) MouseModeChanged (); /* EMIT SIGNAL */ } -void -Editor::update_time_selection_display () +bool +Editor::internal_editing() const { - if (smart_mode_action->get_active()) { - /* not sure what to do here */ - if (mouse_mode == MouseObject) { - } else { - } - } else { - switch (mouse_mode) { - case MouseRange: - selection->clear_objects (); - break; - default: - selection->clear_time (); - break; - } - } + return mouse_mode == Editing::MouseContent || mouse_mode == Editing::MouseDraw; } void -Editor::step_mouse_mode (bool next) +Editor::update_time_selection_display () { - switch (current_mouse_mode()) { - case MouseObject: - if (next) { - if (Profile->get_sae()) { - set_mouse_mode (MouseZoom); - } else { - set_mouse_mode (MouseRange); - } - } else { - set_mouse_mode (MouseTimeFX); - } - break; - + switch (mouse_mode) { case MouseRange: - if (next) set_mouse_mode (MouseDraw); - else set_mouse_mode (MouseObject); - break; - - case MouseDraw: - if (next) set_mouse_mode (MouseZoom); - else set_mouse_mode (MouseRange); - break; - - case MouseZoom: - if (next) { - if (Profile->get_sae()) { - set_mouse_mode (MouseTimeFX); - } else { - set_mouse_mode (MouseGain); - } - } else { - if (Profile->get_sae()) { - set_mouse_mode (MouseObject); - } else { - set_mouse_mode (MouseDraw); - } - } - break; - - case MouseGain: - if (next) set_mouse_mode (MouseTimeFX); - else set_mouse_mode (MouseZoom); + selection->clear_objects (); break; - - case MouseTimeFX: - if (next) { - set_mouse_mode (MouseAudition); - } else { - if (Profile->get_sae()) { - set_mouse_mode (MouseZoom); - } else { - set_mouse_mode (MouseGain); - } - } - break; - - case MouseAudition: - if (next) set_mouse_mode (MouseObject); - else set_mouse_mode (MouseTimeFX); + default: + selection->clear_time (); break; } } -bool -Editor::toggle_internal_editing_from_double_click (GdkEvent* event) +void +Editor::step_mouse_mode (bool next) { - if (_drags->active()) { - _drags->end_grab (event); - } - - ActionManager::do_action ("MouseMode", "toggle-internal-edit"); - - /* prevent reversion of edit cursor on button release */ - - pre_press_cursor = 0; - - return true; + const int n_mouse_modes = (int)MouseContent + 1; + int current = (int)current_mouse_mode(); + if (next) { + set_mouse_mode((MouseMode)((current + 1) % n_mouse_modes)); + } else { + set_mouse_mode((MouseMode)((current + n_mouse_modes - 1) % n_mouse_modes)); + } } void @@ -623,7 +405,12 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp to cut notes or regions. */ - MouseMode eff_mouse_mode = mouse_mode; + MouseMode eff_mouse_mode = effective_mouse_mode (); + + if (eff_mouse_mode == MouseCut) { + /* never change selection in cut mode */ + return; + } if (get_smart_mode() && eff_mouse_mode == MouseRange && event->button.button == 3 && item_type == RegionItem) { /* context clicks are always about object properties, even if @@ -632,16 +419,25 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp eff_mouse_mode = MouseObject; } + /* special case: allow drag of region fade in/out in object mode with join object/range enabled */ + if (get_smart_mode()) { + switch (item_type) { + case FadeInHandleItem: + case FadeInTrimHandleItem: + case FadeOutHandleItem: + case FadeOutTrimHandleItem: + eff_mouse_mode = MouseObject; + break; + default: + break; + } + } + if (((mouse_mode != MouseObject) && (mouse_mode != MouseAudition || item_type != RegionItem) && (mouse_mode != MouseTimeFX || item_type != RegionItem) && - (mouse_mode != MouseGain) && (mouse_mode != MouseDraw)) || - ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3) || - (internal_editing() && mouse_mode != MouseTimeFX)) { - - cerr << "gone\n"; - + ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) { return; } @@ -686,21 +482,15 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp case RegionViewName: case LeftFrameHandle: case RightFrameHandle: - if (eff_mouse_mode != MouseRange) { - set_selected_regionview_from_click (press, op); - } else if (event->type == GDK_BUTTON_PRESS) { - set_selected_track_as_side_effect (op); - } - break; - case FadeInHandleItem: + case FadeInTrimHandleItem: case FadeInItem: case FadeOutHandleItem: + case FadeOutTrimHandleItem: case FadeOutItem: case StartCrossFadeItem: case EndCrossFadeItem: - if (eff_mouse_mode != MouseRange) { - cerr << "Should be setting selected regionview\n"; + if (get_smart_mode() || eff_mouse_mode != MouseRange) { set_selected_regionview_from_click (press, op); } else if (event->type == GDK_BUTTON_PRESS) { set_selected_track_as_side_effect (op); @@ -740,6 +530,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT them to be modeless. */ + NoteBase* note = NULL; + switch (item_type) { case PlayheadCursorItem: _drags->set (new CursorDrag (this, *playhead_cursor, true), event); @@ -755,8 +547,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case TempoMarkerItem: { - TempoMarker* m = reinterpret_cast (item->get_data ("marker")); - assert (m); _drags->set ( new TempoMarkerDrag ( this, @@ -770,8 +560,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MeterMarkerItem: { - MeterMarker* m = reinterpret_cast (item->get_data ("marker")); - assert (m); _drags->set ( new MeterMarkerDrag ( this, @@ -791,6 +579,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MarkerBarItem: case TempoBarItem: case MeterBarItem: + case TimecodeRulerItem: + case SamplesRulerItem: + case MinsecRulerItem: + case BBTRulerItem: if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { _drags->set (new CursorDrag (this, *playhead_cursor, false), event); } @@ -799,10 +591,12 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case RangeMarkerBarItem: - if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - _drags->set (new CursorDrag (this, *playhead_cursor, false), event); - } else { + if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) { + _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateSkipMarker), event); + } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { _drags->set (new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateRangeMarker), event); + } else { + _drags->set (new CursorDrag (this, *playhead_cursor, false), event); } return true; break; @@ -846,13 +640,17 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT Editing::MouseMode eff = effective_mouse_mode (); /* special case: allow drag of region fade in/out in object mode with join object/range enabled */ - if (item_type == FadeInHandleItem || item_type == FadeOutHandleItem) { - eff = MouseObject; - } - - /* there is no Range mode when in internal edit mode */ - if (eff == MouseRange && internal_editing()) { - eff = MouseObject; + if (get_smart_mode()) { + switch (item_type) { + case FadeInHandleItem: + case FadeInTrimHandleItem: + case FadeOutHandleItem: + case FadeOutTrimHandleItem: + eff = MouseObject; + break; + default: + break; + } } switch (eff) { @@ -874,36 +672,19 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT /* grab selection for moving */ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionMove), event); } else { - double const y = event->button.y; - pair tvp = trackview_by_y_position (y); - if (tvp.first) { - AutomationTimeAxisView* atv = dynamic_cast (tvp.first); - if ( get_smart_mode() && atv) { - /* smart "join" mode: drag automation */ - _drags->set (new AutomationRangeDrag (this, atv, selection->time), event, _cursors->up_down); - } else { - /* this was debated, but decided the more common action was to - make a new selection */ - _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); - } - } + /* this was debated, but decided the more common action was to + make a new selection */ + _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); } break; case StreamItem: - if (internal_editing()) { - if (dynamic_cast (clicked_axisview)) { - _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); - return true; - } + if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) { + _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event); } else { - if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) { - _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event); - } else { - _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); - } - return true; + _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); } + return true; break; case RegionViewNameHighlight: @@ -914,67 +695,71 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; default: - if (!internal_editing()) { - if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) { - _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event); - } else { - _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); - } + if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) { + _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event); + } else { + _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); } } return true; break; - case MouseDraw: + case MouseCut: switch (item_type) { - case NoteItem: - /* Existing note: allow trimming/motion */ - if (internal_editing()) { - /* trim notes if we're in internal edit mode and near the ends of the note */ - NoteBase* cn = reinterpret_cast(item->get_data ("notebase")); - assert (cn); - if (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; - } - break; + case RegionItem: + case FadeInHandleItem: + case FadeOutHandleItem: + case LeftFrameHandle: + case RightFrameHandle: + case FeatureLineItem: + case RegionViewNameHighlight: + case RegionViewName: case StreamItem: - if (internal_editing()) { - if (dynamic_cast (clicked_axisview)) { - _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); - } - return true; - } + case AutomationTrackItem: + _drags->set (new RegionCutDrag (this, item, canvas_event_sample (event)), event, current_canvas_cursor); + return true; break; - default: break; } break; - case MouseObject: + case MouseContent: switch (item_type) { case NoteItem: /* Existing note: allow trimming/motion */ - if (internal_editing()) { - NoteBase* cn = reinterpret_cast (item->get_data ("notebase")); - assert (cn); - if (cn->big_enough_to_trim() && cn->mouse_near_ends()) { + if ((note = reinterpret_cast (item->get_data ("notebase")))) { + if (note->big_enough_to_trim() && note->mouse_near_ends()) { _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor); } else { _drags->set (new NoteDrag (this, item), event); } + } + return true; + + case ControlPointItem: + _drags->set (new ControlPointDrag (this, item), event); + return true; + break; + + case StreamItem: + if (dynamic_cast (clicked_axisview)) { + _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); return true; } break; + case AutomationTrackItem: + /* rubberband drag to select automation points */ + _drags->set (new EditorRubberbandSelectDrag (this, item), event); + break; + default: break; } + break; + case MouseObject: if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) && event->type == GDK_BUTTON_PRESS) { @@ -1024,10 +809,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; } - if (internal_editing ()) { - 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); @@ -1038,28 +819,34 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT } -// if (!internal_editing() && (_join_object_range_state == JOIN_OBJECT_RANGE_RANGE && !selection->regions.empty())) { -// _drags->add (new SelectionDrag (this, clicked_axisview->get_selection_rect (clicked_selection)->rect, SelectionDrag::SelectionMove)); -// } - _drags->start_grab (event); return true; break; case RegionViewNameHighlight: case LeftFrameHandle: - case RightFrameHandle: + case RightFrameHandle: if (!clicked_regionview->region()->locked()) { _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event); return true; } break; + case FadeInTrimHandleItem: + case FadeOutTrimHandleItem: + if (!clicked_regionview->region()->locked()) { + _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer(), true), event); + return true; + } + break; + case RegionViewName: { /* rename happens on edit clicks */ - _drags->set (new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, selection->regions.by_layer()), event); - return true; + if (clicked_regionview->get_name_highlight()) { + _drags->set (new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, selection->regions.by_layer()), event); + return true; + } break; } @@ -1074,15 +861,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; 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 EditorRubberbandSelectDrag (this, item), event); - } - break; + _drags->set (new EditorRubberbandSelectDrag (this, item), event); + return true; case AutomationTrackItem: { @@ -1116,45 +896,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case SelectionItem: { - if ( get_smart_mode() ) { - /* we're in "smart" joined mode, and we've clicked on a Selection */ - double const y = event->button.y; - pair tvp = trackview_by_y_position (y); - if (tvp.first) { - /* 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, selection->time), event, _cursors->up_down); - } - - /* if we're over a track and a region, and in the `object' part of a region, - put a selection around the region and drag both - */ -/* RouteTimeAxisView* rtv = dynamic_cast (tvp.first); - if (rtv && _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) { - boost::shared_ptr t = boost::dynamic_pointer_cast (rtv->route ()); - if (t) { - boost::shared_ptr pl = t->playlist (); - if (pl) { - - boost::shared_ptr r = pl->top_region_at (canvas_event_sample (event)); - if (r) { - RegionView* rv = rtv->view()->find_view (r); - clicked_selection = select_range (rv->region()->position(), - rv->region()->last_frame()+1); - _drags->add (new SelectionDrag (this, item, SelectionDrag::SelectionMove)); - list rvs; - rvs.push_back (rv); - _drags->add (new RegionMoveDrag (this, item, rv, rvs, false, false)); - _drags->start_grab (event); - return true; - } - } - } - } -*/ - } - } break; } @@ -1169,7 +910,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; break; - case MouseGain: + case MouseDraw: switch (item_type) { case GainLineItem: _drags->set (new LineDrag (this, item), event); @@ -1185,7 +926,16 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT AudioRegionView* arv = dynamic_cast (clicked_regionview); if (arv) { _drags->set (new AutomationRangeDrag (this, arv, selection->time), event, _cursors->up_down); - _drags->start_grab (event); + } else { + double const y = event->button.y; + pair tvp = trackview_by_y_position (y); + if (tvp.first) { + AutomationTimeAxisView* atv = dynamic_cast (tvp.first); + if ( atv) { + /* smart "join" mode: drag automation */ + _drags->set (new AutomationRangeDrag (this, atv, selection->time), event, _cursors->up_down); + } + } } return true; break; @@ -1194,28 +944,39 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case AutomationLineItem: _drags->set (new LineDrag (this, item), event); break; - + + case NoteItem: + if ((note = reinterpret_cast(item->get_data ("notebase")))) { + if (note->big_enough_to_trim() && note->mouse_near_ends()) { + /* Note is big and pointer is near the end, trim */ + _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor); + } else { + /* Drag note */ + _drags->set (new NoteDrag (this, item), event); + } + return true; + } + return true; + + case StreamItem: + if (dynamic_cast (clicked_axisview)) { + _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); + } + return true; + default: break; } return true; break; - case MouseZoom: - if (event->type == GDK_BUTTON_PRESS) { - _drags->set (new MouseZoomDrag (this, item), event); - } - - return true; - break; - case MouseTimeFX: - if (internal_editing() && item_type == NoteItem ) { - /* drag notes if we're in internal edit mode */ - NoteBase* cn = reinterpret_cast(item->get_data ("notebase")); - assert (cn); - if (cn->big_enough_to_trim()) { - _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor); + if (item_type == NoteItem) { + /* resize-drag notes */ + if ((note = reinterpret_cast(item->get_data ("notebase")))) { + if (note->big_enough_to_trim()) { + _drags->set (new NoteResizeDrag (this, item), event, current_canvas_cursor); + } } return true; } else if (clicked_regionview) { @@ -1231,7 +992,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; - set_canvas_cursor (_cursors->transparent); + push_canvas_cursor (_cursors->transparent); return true; break; @@ -1250,11 +1011,6 @@ 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 { @@ -1274,15 +1030,13 @@ 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; + _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event); + return true; + break; - case LeftFrameHandle: - case RightFrameHandle: - if (!internal_editing ()) { - _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event); - } + case LeftFrameHandle: + case RightFrameHandle: + _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event); return true; break; @@ -1305,16 +1059,6 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; break; - - case MouseZoom: - if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - temporal_zoom_to_frame (false, canvas_event_sample (event)); - } else { - temporal_zoom_to_frame (true, canvas_event_sample(event)); - } - return true; - break; - default: break; } @@ -1335,65 +1079,12 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp return false; } - Glib::RefPtr canvas_window = const_cast(this)->_track_canvas_viewport->get_window(); - - if (canvas_window) { - Glib::RefPtr pointer_window; - int x, y; - double wx, wy; - Gdk::ModifierType mask; - - pointer_window = canvas_window->get_pointer (x, y, mask); - - if (pointer_window == _track_canvas->get_window()) { - _track_canvas->window_to_canvas (x, y, wx, wy); - } - } - - pre_press_cursor = current_canvas_cursor; - - _track_canvas->grab_focus(); - - if (_session && _session->actively_recording()) { - return true; - } - - if (internal_editing()) { - bool leave_internal_edit_mode = false; - - switch (item_type) { - case NoteItem: - break; - - case RegionItem: - if (!dynamic_cast (clicked_regionview) && !dynamic_cast (clicked_regionview)) { - leave_internal_edit_mode = true; - } - break; - - case PlayheadCursorItem: - case MarkerItem: - case TempoMarkerItem: - case MeterMarkerItem: - case MarkerBarItem: - case TempoBarItem: - case MeterBarItem: - case RangeMarkerBarItem: - case CdMarkerBarItem: - case TransportMarkerBarItem: - case StreamItem: - /* button press on these events never does anything to - change the editing mode. - */ - break; + pre_press_cursor = current_canvas_cursor; - default: - break; - } - - if (leave_internal_edit_mode) { - ActionManager::do_action ("MouseMode", "toggle-internal-edit"); - } + _track_canvas->grab_focus(); + + if (_session && _session->actively_recording()) { + return true; } button_selection (item, event, item_type); @@ -1408,7 +1099,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp } //not rolling, range mode click + join_play_range : locate the PH here - if ( !_drags->active () && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && Config->get_always_play_range() ) { + if ( !_drags->active () && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && Config->get_follow_edits() ) { framepos_t where = canvas_event_sample (event); snap_to(where); _session->request_locate (where, false); @@ -1501,12 +1192,12 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if ((tempo_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } edit_tempo_marker (*tempo_marker); @@ -1519,12 +1210,12 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT if ((marker = reinterpret_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if ((meter_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for meter is not a meter marker!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } edit_meter_marker (*meter_marker); break; @@ -1560,27 +1251,28 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT switch (item_type) { case FadeInItem: case FadeInHandleItem: - case FadeOutItem: - case FadeOutHandleItem: - popup_fade_context_menu (1, event->button.time, item, item_type); - break; - + case FadeInTrimHandleItem: case StartCrossFadeItem: popup_xfade_in_context_menu (1, event->button.time, item, item_type); break; + case FadeOutItem: + case FadeOutHandleItem: + case FadeOutTrimHandleItem: case EndCrossFadeItem: popup_xfade_out_context_menu (1, event->button.time, item, item_type); break; + case LeftFrameHandle: + case RightFrameHandle: + break; + case StreamItem: popup_track_context_menu (1, event->button.time, item_type, false); break; case RegionItem: case RegionViewNameHighlight: - case LeftFrameHandle: - case RightFrameHandle: case RegionViewName: popup_track_context_menu (1, event->button.time, item_type, false); break; @@ -1600,6 +1292,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case TempoBarItem: case MeterBarItem: case VideoBarItem: + case TimecodeRulerItem: + case SamplesRulerItem: + case MinsecRulerItem: + case BBTRulerItem: popup_ruler_menu (where, item_type); break; @@ -1685,7 +1381,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MarkerBarItem: if (!_dragging_playhead) { - snap_to_with_modifier (where, event, 0, true); + snap_to_with_modifier (where, event, RoundNearest, true); mouse_add_new_marker (where); } return true; @@ -1693,7 +1389,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case CdMarkerBarItem: if (!_dragging_playhead) { // if we get here then a dragged range wasn't done - snap_to_with_modifier (where, event, 0, true); + snap_to_with_modifier (where, event, RoundNearest, true); mouse_add_new_marker (where, true); } return true; @@ -1712,27 +1408,19 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; break; + case TimecodeRulerItem: + case SamplesRulerItem: + case MinsecRulerItem: + case BBTRulerItem: + return true; + break; + default: break; } switch (eff) { - case MouseObject: - switch (item_type) { - case AutomationTrackItem: - atv = dynamic_cast(clicked_axisview); - if (atv) { - bool with_guard_points = Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier); - atv->add_automation_event (event, where, event->button.y, with_guard_points); - } - return true; - break; - default: - break; - } - break; - - case MouseGain: + case MouseDraw: switch (item_type) { case RegionItem: { @@ -1751,8 +1439,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case AutomationTrackItem: { bool with_guard_points = Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier); - dynamic_cast(clicked_axisview)-> - add_automation_event (event, where, event->button.y, with_guard_points); + atv = dynamic_cast(clicked_axisview); + if (atv) { + atv->add_automation_event (event, where, event->button.y, with_guard_points); + } return true; break; } @@ -1762,7 +1452,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case MouseAudition: - set_canvas_cursor (current_canvas_cursor); + pop_canvas_cursor (); if (scrubbing_direction == 0) { /* no drag, just a click */ switch (item_type) { @@ -1843,150 +1533,51 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ double fraction; bool ret = true; + /* by the time we reach here, entered_regionview and entered trackview + * will have already been set as appropriate. Things are done this + * way because this method isn't passed a pointer to a variable type of + * thing that is entered (which may or may not be canvas item). + * (e.g. the actual entered regionview) + */ + + choose_canvas_cursor_on_entry (&event->crossing, item_type); + switch (item_type) { case ControlPointItem: - if (mouse_mode == MouseGain || mouse_mode == MouseObject) { + if (mouse_mode == MouseDraw || mouse_mode == MouseObject) { cp = static_cast(item->get_data ("control_point")); cp->show (); - double at_x, at_y; - at_x = cp->get_x(); - at_y = cp->get_y (); - cp->i2w (at_x, at_y); - at_x += 10.0; - at_y += 10.0; - fraction = 1.0 - (cp->get_y() / cp->line().height()); - if (is_drawable() && !_drags->active ()) { - set_canvas_cursor (_cursors->fader); - } - - _verbose_cursor->set (cp->line().get_verbose_cursor_string (fraction), at_x, at_y); + _verbose_cursor->set (cp->line().get_verbose_cursor_string (fraction)); _verbose_cursor->show (); } break; case GainLineItem: - if (mouse_mode == MouseGain) { + if (mouse_mode == MouseDraw) { ArdourCanvas::Line *line = dynamic_cast (item); if (line) { - line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EnteredGainLine()); - } - if (is_drawable()) { - set_canvas_cursor (_cursors->fader); + line->set_outline_color (ARDOUR_UI::config()->color ("entered gain line")); } } break; case AutomationLineItem: - if (mouse_mode == MouseGain || mouse_mode == MouseObject) { + if (mouse_mode == MouseDraw || mouse_mode == MouseObject) { ArdourCanvas::Line *line = dynamic_cast (item); if (line) { - line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EnteredAutomationLine()); - } - if (is_drawable()) { - set_canvas_cursor (_cursors->fader); - } - } - break; - - case RegionViewNameHighlight: - if (is_drawable() && effective_mouse_mode() == MouseObject && entered_regionview) { - set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview); - _over_region_trim_target = true; - } - break; - - case LeftFrameHandle: - case RightFrameHandle: - if (is_drawable() && effective_mouse_mode() == MouseObject && !internal_editing() && entered_regionview) { - set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview); - } - break; - - case RegionItem: - switch (effective_mouse_mode()) { - case MouseRange: - set_canvas_cursor (_cursors->selector); - break; - default: - set_canvas_cursor (which_grabber_cursor()); - break; - } - break; - - case StartSelectionTrimItem: - if (is_drawable()) { - set_canvas_cursor (_cursors->left_side_trim); - } - break; - case EndSelectionTrimItem: - if (is_drawable()) { - set_canvas_cursor (_cursors->right_side_trim); - } - break; - - case PlayheadCursorItem: - if (is_drawable()) { - switch (_edit_point) { - case EditAtMouse: - set_canvas_cursor (_cursors->grabber_edit_point); - break; - default: - set_canvas_cursor (_cursors->grabber); - break; + line->set_outline_color (ARDOUR_UI::config()->color ("entered automation line")); } } break; - - case RegionViewName: - - /* when the name is not an active item, the entire name highlight is for trimming */ - - if (!reinterpret_cast (item->get_data ("regionview"))->name_active()) { - if (mouse_mode == MouseObject && is_drawable()) { - set_canvas_cursor_for_region_view (event->crossing.x, entered_regionview); - _over_region_trim_target = true; - } - } - break; - - case AutomationTrackItem: - if (is_drawable()) { - Gdk::Cursor *cursor; - switch (mouse_mode) { - case MouseRange: - cursor = _cursors->selector; - break; - case MouseZoom: - cursor = _cursors->zoom_in; - break; - default: - cursor = _cursors->cross_hair; - break; - } - - set_canvas_cursor (cursor); - - AutomationTimeAxisView* atv; - if ((atv = static_cast(item->get_data ("trackview"))) != 0) { - clear_entered_track = false; - set_entered_track (atv); - } - } - break; - - case MarkerBarItem: - case RangeMarkerBarItem: - case TransportMarkerBarItem: - case CdMarkerBarItem: - case MeterBarItem: - case TempoBarItem: - if (is_drawable()) { - set_canvas_cursor (_cursors->timebar); + AutomationTimeAxisView* atv; + if ((atv = static_cast(item->get_data ("trackview"))) != 0) { + clear_entered_track = false; + set_entered_track (atv); } break; @@ -1995,36 +1586,34 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; } entered_marker = marker; - marker->set_color_rgba (ARDOUR_UI::config()->get_canvasvar_EnteredMarker()); + marker->set_color_rgba (ARDOUR_UI::config()->color ("entered marker")); // fall through case MeterMarkerItem: case TempoMarkerItem: - if (is_drawable()) { - set_canvas_cursor (_cursors->timebar); - } break; case FadeInHandleItem: - if (mouse_mode == MouseObject && !internal_editing()) { + case FadeInTrimHandleItem: + if (mouse_mode == MouseObject) { ArdourCanvas::Rectangle *rect = dynamic_cast (item); if (rect) { RegionView* rv = static_cast(item->get_data ("regionview")); rect->set_fill_color (rv->get_fill_color()); - set_canvas_cursor (_cursors->fade_in); } } break; case FadeOutHandleItem: - if (mouse_mode == MouseObject && !internal_editing()) { + case FadeOutTrimHandleItem: + if (mouse_mode == MouseObject) { ArdourCanvas::Rectangle *rect = dynamic_cast (item); if (rect) { RegionView* rv = static_cast(item->get_data ("regionview")); rect->set_fill_color (rv->get_fill_color ()); - set_canvas_cursor (_cursors->fade_out); } } break; + case FeatureLineItem: { ArdourCanvas::Line *line = dynamic_cast (item); @@ -2033,16 +1622,13 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; case SelectionItem: - if ( get_smart_mode() ) { - set_canvas_cursor (); - } break; default: break; } - /* second pass to handle entered track status in a comprehensible way. + /* third pass to handle entered track status in a comprehensible way. */ switch (item_type) { @@ -2058,7 +1644,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; default: - set_entered_track (0); + break; } @@ -2071,31 +1657,14 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) AutomationLine* al; Marker *marker; Location *loc; - RegionView* rv; bool is_start; bool ret = true; + reset_canvas_cursor (); + switch (item_type) { case ControlPointItem: - if (is_drawable()) { - set_canvas_cursor (current_canvas_cursor); - } - - _verbose_cursor->hide (); - break; - - case RegionViewNameHighlight: - case LeftFrameHandle: - case RightFrameHandle: - case StartSelectionTrimItem: - case EndSelectionTrimItem: - case PlayheadCursorItem: - - _over_region_trim_target = false; - - if (is_drawable()) { - set_canvas_cursor (current_canvas_cursor); - } + _verbose_cursor->hide (); break; case GainLineItem: @@ -2107,31 +1676,6 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) line->set_outline_color (al->get_line_color()); } } - if (is_drawable()) { - 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) { - set_canvas_cursor (current_canvas_cursor); - } - } - break; - - case RangeMarkerBarItem: - case TransportMarkerBarItem: - case CdMarkerBarItem: - case MeterBarItem: - case TempoBarItem: - case MarkerBarItem: - if (is_drawable()) { - set_canvas_cursor (current_canvas_cursor); - } break; case MarkerItem: @@ -2140,43 +1684,34 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) } entered_marker = 0; if ((loc = find_location_from_marker (marker, is_start)) != 0) { - location_flags_changed (loc, this); + location_flags_changed (loc); } // fall through case MeterMarkerItem: case TempoMarkerItem: - - if (is_drawable()) { - set_canvas_cursor (current_canvas_cursor); - } - break; + case FadeInTrimHandleItem: + case FadeOutTrimHandleItem: case FadeInHandleItem: case FadeOutHandleItem: - rv = static_cast(item->get_data ("regionview")); - { - ArdourCanvas::Rectangle *rect = dynamic_cast (item); - if (rect) { - rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle()); - } + { + ArdourCanvas::Rectangle *rect = dynamic_cast (item); + if (rect) { + rect->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle")); } - set_canvas_cursor (current_canvas_cursor); - break; + } + break; case AutomationTrackItem: - if (is_drawable()) { - 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::Line *line = dynamic_cast (item); - line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine()); - } - break; + { + ArdourCanvas::Line *line = dynamic_cast (item); + line->set_outline_color (ARDOUR_UI::config()->color ("zero line")); + } + break; default: break; @@ -2185,16 +1720,6 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) return ret; } -gint -Editor::left_automation_track () -{ - if (clear_entered_track) { - set_entered_track (0); - clear_entered_track = false; - } - return false; -} - void Editor::scrub (framepos_t frame, double current_x) { @@ -2299,34 +1824,19 @@ Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from current_stepping_trackview = 0; step_timeout.disconnect (); } - + if (_session && _session->actively_recording()) { /* Sorry. no dragging stuff around while we record */ return true; } - - JoinObjectRangeState const old = _join_object_range_state; - update_join_object_range_location (event->motion.x, event->motion.y); - - if (!_internal_editing && _join_object_range_state != old) { - set_canvas_cursor (); - } - - if (!_internal_editing && _over_region_trim_target) { - set_canvas_cursor_for_region_view (event->motion.x, entered_regionview); - } - - bool handled = false; + + update_join_object_range_location (event->motion.y); + if (_drags->active ()) { - handled = _drags->motion_handler (event, from_autoscroll); + return _drags->motion_handler (event, from_autoscroll); } - if (!handled) { - return false; - } - - track_canvas_motion (event); - return true; + return false; } bool @@ -2336,7 +1846,7 @@ Editor::can_remove_control_point (ArdourCanvas::Item* item) if ((control_point = reinterpret_cast (item->get_data ("control_point"))) == 0) { fatal << _("programming error: control point canvas item has no control point object pointer!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } AutomationLine& line = control_point->line (); @@ -2361,7 +1871,7 @@ Editor::remove_control_point (ArdourCanvas::Item* item) if ((control_point = reinterpret_cast (item->get_data ("control_point"))) == 0) { fatal << _("programming error: control point canvas item has no control point object pointer!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } control_point->line().remove_point (*control_point); @@ -2374,7 +1884,7 @@ Editor::edit_control_point (ArdourCanvas::Item* item) if (p == 0) { fatal << _("programming error: control point canvas item has no control point object pointer!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } ControlPointDialog d (p); @@ -2401,19 +1911,19 @@ Editor::edit_notes (TimeAxisViewItem& tavi) if (s.empty ()) { return; } - + EditNoteDialog* d = new EditNoteDialog (&(*s.begin())->region_view(), s); - d->show_all (); + d->show_all (); ensure_float (*d); - d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &Editor::note_edit_done), d)); + d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &Editor::note_edit_done), d)); } void Editor::note_edit_done (int r, EditNoteDialog* d) { - d->done (r); - delete d; + d->done (r); + delete d; } void @@ -2483,7 +1993,7 @@ Editor::collect_new_region_view (RegionView* rv) void Editor::collect_and_select_new_region_view (RegionView* rv) { - selection->add(rv); + selection->add(rv); latest_regionviews.push_back (rv); } @@ -2501,7 +2011,7 @@ Editor::cancel_selection () void Editor::cancel_time_selection () { - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { (*i)->hide_selection (); } selection->time.clear (); @@ -2579,25 +2089,13 @@ Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/) if ((marker = static_cast (item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } Location* location = find_location_from_marker (marker, is_start); location->set_hidden (true, this); } - -void -Editor::reposition_zoom_rect (framepos_t start, framepos_t end) -{ - double x1 = sample_to_pixel (start); - double x2 = sample_to_pixel (end); - double y2 = _full_canvas_height - 1.0; - - zoom_rect->set (ArdourCanvas::Rect (x1, 1.0, x2, y2)); -} - - gint Editor::mouse_rename_region (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/) { @@ -2687,12 +2185,17 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region return; } - _region_motion_group->raise_to_top (); + switch (Config->get_edit_mode()) { + case Splice: + _drags->add (new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer())); + break; + case Ripple: + _drags->add (new RegionRippleDrag (this, item, region_view, selection->regions.by_layer())); + break; + default: + _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, false)); + break; - if (Config->get_edit_mode() == Splice) { - _drags->add (new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer())); - } else { - _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, false)); } } @@ -2705,8 +2208,6 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* r return; } - _region_motion_group->raise_to_top (); - _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, true)); } @@ -2719,7 +2220,7 @@ Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* return; } - if (Config->get_edit_mode() == Splice) { + if (Config->get_edit_mode() == Splice || Config->get_edit_mode() == Ripple) { return; } @@ -2774,8 +2275,6 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event) clicked_routeview->playlist()->add_region (region, selection->time[clicked_selection].start); _session->add_command(new StatefulDiffCommand (playlist)); - commit_reversible_command (); - c.disconnect (); if (latest_regionviews.empty()) { @@ -2786,8 +2285,11 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event) /* we need to deselect all other regionviews, and select this one i'm ignoring undo stuff, because the region creation will take care of it */ + selection->set (latest_regionviews); + commit_reversible_command (); + _drags->set (new RegionMoveDrag (this, latest_regionviews.front()->get_canvas_group(), latest_regionviews.front(), latest_regionviews, false, false), event); } @@ -2799,90 +2301,72 @@ Editor::escape () } else { selection->clear (); } -} - -void -Editor::set_internal_edit (bool yn) -{ - if (_internal_editing == yn) { - return; - } - _internal_editing = yn; - - if (yn) { - pre_internal_mouse_mode = mouse_mode; - pre_internal_snap_type = _snap_type; - pre_internal_snap_mode = _snap_mode; - - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - (*i)->enter_internal_edit_mode (); - } - - set_snap_to (internal_snap_type); - set_snap_mode (internal_snap_mode); - - } else { - - internal_snap_mode = _snap_mode; - internal_snap_type = _snap_type; - - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - (*i)->leave_internal_edit_mode (); - } - - if (mouse_mode == MouseDraw && pre_internal_mouse_mode != MouseDraw) { - /* we were drawing .. flip back to something sensible */ - set_mouse_mode (pre_internal_mouse_mode); - } - - set_snap_to (pre_internal_snap_type); - set_snap_mode (pre_internal_snap_mode); - } - - set_canvas_cursor (); + reset_focus (); } -/** Update _join_object_range_state which indicate whether we are over the top or bottom half of a region view, - * used by the `join object/range' tool mode. +/** Update _join_object_range_state which indicate whether we are over the top + * or bottom half of a route view, used by the `join object/range' tool + * mode. Coordinates in canvas space. */ void -Editor::update_join_object_range_location (double /*x*/, double y) +Editor::update_join_object_range_location (double y) { - /* XXX: actually, this decides based on whether the mouse is in the top - or bottom half of a the waveform part RouteTimeAxisView; - - Note that 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 ( !get_smart_mode() ) { + if (!get_smart_mode()) { _join_object_range_state = JOIN_OBJECT_RANGE_NONE; return; } + JoinObjectRangeState const old = _join_object_range_state; + if (mouse_mode == MouseObject) { _join_object_range_state = JOIN_OBJECT_RANGE_OBJECT; } else if (mouse_mode == MouseRange) { _join_object_range_state = JOIN_OBJECT_RANGE_RANGE; } - /* XXX: maybe we should make entered_track work in all cases, rather than resorting to this */ - pair tvp = trackview_by_y_position (y); + if (entered_regionview) { - if (tvp.first) { + ArdourCanvas::Duple const item_space = entered_regionview->get_canvas_group()->canvas_to_item (ArdourCanvas::Duple (0, y)); + double const c = item_space.y / entered_regionview->height(); + + _join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT; + + if (_join_object_range_state != old) { + set_canvas_cursor (which_track_cursor ()); + } + + } else if (entered_track) { - RouteTimeAxisView* rtv = dynamic_cast (tvp.first); - if (rtv) { + RouteTimeAxisView* entered_route_view = dynamic_cast (entered_track); + + if (entered_route_view) { double cx = 0; double cy = y; - rtv->canvas_display()->canvas_to_item (cx, cy); - double const c = cy / (rtv->view()->child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE); + entered_route_view->canvas_display()->canvas_to_item (cx, cy); + + double track_height = entered_route_view->view()->child_height(); + if (Config->get_show_name_highlight()) { + track_height -= TimeAxisViewItem::NAME_HIGHLIGHT_SIZE; + } + double const c = cy / track_height; + - _join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT; + if (c <= 0.5) { + _join_object_range_state = JOIN_OBJECT_RANGE_RANGE; + } else { + _join_object_range_state = JOIN_OBJECT_RANGE_OBJECT; + } + + } else { + /* Other kinds of tracks use object mode */ + _join_object_range_state = JOIN_OBJECT_RANGE_OBJECT; + } + + if (_join_object_range_state != old) { + set_canvas_cursor (which_track_cursor ()); } } } @@ -2908,46 +2392,6 @@ 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) -{ - /* XXX: this check should not be necessary */ - if (rv == 0) { - return; - } - - assert (rv); - - ArdourCanvas::Group* g = rv->get_canvas_group (); - ArdourCanvas::Group* p = g->parent (); - - /* Compute x in region view parent coordinates */ - double dy = 0; - p->canvas_to_item (x, dy); - - boost::optional item_bbox = g->bounding_box (); - assert (item_bbox); - ArdourCanvas::Rect parent_bbox = g->item_to_parent (item_bbox.get ()); - - /* Halfway across the region */ - double const h = (parent_bbox.x0 + parent_bbox.x1) / 2; - - Trimmable::CanTrim ct = rv->region()->can_trim (); - if (x <= h) { - if (ct & Trimmable::FrontTrimEarlier) { - set_canvas_cursor (_cursors->left_side_trim, true); - } else { - set_canvas_cursor (_cursors->left_side_trim_right_only, true); - } - } else { - if (ct & Trimmable::EndTrimLater) { - set_canvas_cursor (_cursors->right_side_trim, true); - } else { - set_canvas_cursor (_cursors->right_side_trim_left_only, true); - } - } -} - /** Obtain the pointer position in canvas coordinates */ void Editor::get_pointer_position (double& x, double& y) const