X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas_events.cc;h=30e2504edc927c70bcc20bbf77eb9538f94386a3;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=9e9564594a2f3cdabd95b677d4ebdc7fc71e0ccc;hpb=d45a25e4a834e7f25217f811dedba005226385c8;p=ardour.git diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 9e9564594a..30e2504edc 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -37,7 +37,6 @@ #include "editor.h" #include "keyboard.h" #include "public_editor.h" -#include "ardour_ui.h" #include "audio_region_view.h" #include "audio_streamview.h" #include "audio_time_axis.h" @@ -49,9 +48,10 @@ #include "editor_drag.h" #include "midi_time_axis.h" #include "editor_regions.h" +#include "ui_config.h" #include "verbose_cursor.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -64,11 +64,6 @@ using Gtkmm2ext::Keyboard; bool Editor::track_canvas_scroll (GdkEventScroll* ev) { - if (Keyboard::some_magic_widget_has_focus()) { - return false; - } - - framepos_t xdelta; int direction = ev->direction; /* this event arrives without transformation by the canvas, so we have @@ -77,19 +72,18 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) Duple event_coords = _track_canvas->window_to_canvas (Duple (ev->x, ev->y)); - retry: switch (direction) { case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) { - //for mouse-wheel zoom, force zoom-focus to mouse - Editing::ZoomFocus temp_focus = zoom_focus; - zoom_focus = Editing::ZoomFocusMouse; - temporal_zoom_step (false); - zoom_focus = temp_focus; + if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { + temporal_zoom_step_mouse_focus (false); + } else { + temporal_zoom_step (false); + } return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { - direction = GDK_SCROLL_LEFT; - goto retry; + scroll_left_step (); + return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) { if (!current_stepping_trackview) { step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500); @@ -110,15 +104,15 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) case GDK_SCROLL_DOWN: if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) { - //for mouse-wheel zoom, force zoom-focus to mouse - Editing::ZoomFocus temp_focus = zoom_focus; - zoom_focus = Editing::ZoomFocusMouse; - temporal_zoom_step (true); - zoom_focus = temp_focus; + if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { + temporal_zoom_step_mouse_focus (true); + } else { + temporal_zoom_step (true); + } return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { - direction = GDK_SCROLL_RIGHT; - goto retry; + scroll_right_step (); + return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) { if (!current_stepping_trackview) { step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500); @@ -138,21 +132,13 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) break; case GDK_SCROLL_LEFT: - xdelta = (current_page_samples() / 8); - if (leftmost_frame > xdelta) { - reset_x_origin (leftmost_frame - xdelta); - } else { - reset_x_origin (0); - } + scroll_left_step (); + return true; break; case GDK_SCROLL_RIGHT: - xdelta = (current_page_samples() / 8); - if (max_framepos - xdelta > leftmost_frame) { - reset_x_origin (leftmost_frame + xdelta); - } else { - reset_x_origin (max_framepos - current_page_samples()); - } + scroll_right_step (); + return true; break; default: @@ -329,7 +315,7 @@ Editor::canvas_wave_view_event (GdkEvent *event, ArdourCanvas::Item* item, Regio } return ret; -} +} bool @@ -688,13 +674,23 @@ bool Editor::canvas_line_event (GdkEvent *event, ArdourCanvas::Item* item, AutomationLine* al) { ItemType type; - - if (dynamic_cast (al) != 0) { + AudioRegionGainLine* gl; + if ((gl = dynamic_cast (al)) != 0) { type = GainLineItem; + if (event->type == GDK_BUTTON_PRESS) { + clicked_regionview = &gl->region_view (); + } } else { type = AutomationLineItem; + if (event->type == GDK_BUTTON_PRESS) { + clicked_regionview = 0; + } } + + clicked_control_point = 0; clicked_axisview = &al->trackview; + clicked_routeview = dynamic_cast(clicked_axisview); + return typed_event (item, event, type); } @@ -976,7 +972,7 @@ Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, Re } bool -Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Marker* /*marker*/) +Editor::canvas_marker_event (GdkEvent *event, ArdourCanvas::Item* item, ArdourMarker* /*marker*/) { return typed_event (item, event, MarkerItem); } @@ -1017,6 +1013,12 @@ Editor::canvas_tempo_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Te return typed_event (item, event, TempoMarkerItem); } +bool +Editor::canvas_tempo_curve_event (GdkEvent *event, ArdourCanvas::Item* item, TempoCurve* /*marker*/) +{ + return typed_event (item, event, TempoCurveItem); +} + bool Editor::canvas_meter_marker_event (GdkEvent *event, ArdourCanvas::Item* item, MeterMarker* /*marker*/) { @@ -1026,63 +1028,49 @@ Editor::canvas_meter_marker_event (GdkEvent *event, ArdourCanvas::Item* item, Me bool Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType type) { - framepos_t xdelta; bool handled = false; if (event->type == GDK_SCROLL) { - + /* scroll events in the rulers are handled a little differently from scrolling elsewhere in the canvas. */ switch (event->scroll.direction) { case GDK_SCROLL_UP: - - if (Profile->get_mixbus()) { - //for mouse-wheel zoom, force zoom-focus to mouse - Editing::ZoomFocus temp_focus = zoom_focus; - zoom_focus = Editing::ZoomFocusMouse; - temporal_zoom_step (false); - zoom_focus = temp_focus; + if (Keyboard::modifier_state_equals(event->scroll.state, + Keyboard::ScrollHorizontalModifier)) { + scroll_left_step (); + } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { + temporal_zoom_step_mouse_focus (false); } else { temporal_zoom_step (false); } handled = true; break; - + case GDK_SCROLL_DOWN: - if (Profile->get_mixbus()) { - //for mouse-wheel zoom, force zoom-focus to mouse - Editing::ZoomFocus temp_focus = zoom_focus; - zoom_focus = Editing::ZoomFocusMouse; - temporal_zoom_step (true); - zoom_focus = temp_focus; + if (Keyboard::modifier_state_equals(event->scroll.state, + Keyboard::ScrollHorizontalModifier)) { + scroll_right_step (); + } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { + temporal_zoom_step_mouse_focus (true); } else { temporal_zoom_step (true); } handled = true; break; - + case GDK_SCROLL_LEFT: - xdelta = (current_page_samples() / 2); - if (leftmost_frame > xdelta) { - reset_x_origin (leftmost_frame - xdelta); - } else { - reset_x_origin (0); - } + scroll_left_half_page (); handled = true; break; - + case GDK_SCROLL_RIGHT: - xdelta = (current_page_samples() / 2); - if (max_framepos - xdelta > leftmost_frame) { - reset_x_origin (leftmost_frame + xdelta); - } else { - reset_x_origin (max_framepos - current_page_samples()); - } + scroll_right_half_page (); handled = true; break; - + default: /* what? */ break; @@ -1124,9 +1112,9 @@ Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item) bool Editor::canvas_drop_zone_event (GdkEvent* event) { - GdkEventScroll scroll; + GdkEventScroll scroll; ArdourCanvas::Duple winpos; - + switch (event->type) { case GDK_BUTTON_RELEASE: if (event->button.button == 1) { @@ -1187,18 +1175,18 @@ Editor::track_canvas_drag_motion (Glib::RefPtr const& context, std::pair const tv = trackview_by_y_position (py, false); bool can_drop = false; - + if (tv.first != 0) { /* over a time axis view of some kind */ rtav = dynamic_cast (tv.first); - + if (rtav != 0 && rtav->is_track ()) { /* over a track, not a bus */ can_drop = true; } - + } else { /* not over a time axis view, so drop is possible */ @@ -1207,7 +1195,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr const& context, if (can_drop) { region = _regions->get_dragged_region (); - + if (region) { if (tv.first == 0 @@ -1221,17 +1209,17 @@ Editor::track_canvas_drag_motion (Glib::RefPtr const& context, context->drag_status (context->get_suggested_action(), time); return true; } - + if ((boost::dynamic_pointer_cast (region) != 0 && dynamic_cast (tv.first) != 0) || (boost::dynamic_pointer_cast (region) != 0 && dynamic_cast (tv.first) != 0)) { - - /* audio to audio - OR + + /* audio to audio + OR midi to midi */ - + context->drag_status (context->get_suggested_action(), time); return true; } @@ -1241,7 +1229,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr const& context, * TODO: check if file is audio/midi, allow drops on same track-type only, * currently: if audio is dropped on a midi-track, it is only added to the region-list */ - if (Profile->get_sae() || ARDOUR_UI::config()->get_only_copy_imported_files()) { + if (UIConfiguration::instance().get_only_copy_imported_files()) { context->drag_status(Gdk::ACTION_COPY, time); } else { if ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY) { @@ -1292,13 +1280,15 @@ Editor::drop_regions (const Glib::RefPtr& /*context*/, output_chan = session()->master_out()->n_inputs().n_audio(); } list > audio_tracks; - audio_tracks = session()->new_audio_track (region->n_channels(), output_chan, ARDOUR::Normal, 0, 1, region->name()); - rtav = axis_view_from_route (audio_tracks.front()); + audio_tracks = session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order); + rtav = dynamic_cast (axis_view_from_stripable (audio_tracks.front())); } else if (boost::dynamic_pointer_cast (region)) { ChanCount one_midi_port (DataType::MIDI, 1); list > midi_tracks; - midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), ARDOUR::Normal, 0, 1, region->name()); - rtav = axis_view_from_route (midi_tracks.front()); + midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), + (ARDOUR::Plugin::PresetRecord*) 0, + (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order); + rtav = dynamic_cast (axis_view_from_stripable (midi_tracks.front())); } else { return; }