X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=f67ca6a3cea5e70c0eda4861612a17912732b588;hb=a8f11b6004bfd247dd192ef642bffa0a0b46f80f;hp=37e434c7d841fdb3eb37bbc3ee5648ac9acaea6f;hpb=10cb0a7646ae7da18e5e6f49b940a5e921a73b57;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 37e434c7d8..f67ca6a3ce 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -23,37 +23,34 @@ #include #include -#include -#include -#include #include "pbd/error.h" #include "pbd/convert.h" +#include "pbd/stacktrace.h" +#include #include #include -#include "ardour/session.h" -#include "ardour/utils.h" -#include "ardour/ladspa_plugin.h" -#include "ardour/processor.h" -#include "ardour/location.h" +#include "canvas/canvas.h" +#include "canvas/rectangle.h" +#include "canvas/debug.h" #include "ardour_ui.h" +#include "ardour_dialog.h" #include "global_signals.h" #include "gui_thread.h" #include "public_editor.h" #include "time_axis_view.h" #include "region_view.h" #include "ghostregion.h" -#include "simplerect.h" -#include "simpleline.h" #include "selection.h" #include "keyboard.h" #include "rgb_macros.h" #include "utils.h" #include "streamview.h" #include "editor_drag.h" +#include "editor.h" #include "i18n.h" @@ -67,120 +64,113 @@ using namespace ArdourCanvas; using Gtkmm2ext::Keyboard; const double trim_handle_size = 6.0; /* pixels */ -uint32_t TimeAxisView::extra_height; -uint32_t TimeAxisView::small_height; +uint32_t TimeAxisView::button_height = 0; +uint32_t TimeAxisView::extra_height = 0; int const TimeAxisView::_max_order = 512; PBD::Signal1 TimeAxisView::CatchDeletion; TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/) : AxisView (sess) , controls_table (2, 8) + , _name_editing (false) + , height (0) + , display_menu (0) + , parent (rent) + , selection_group (0) + , _ghost_group (0) + , _hidden (false) + , in_destructor (false) , _size_menu (0) + , _canvas_display (0) , _y_position (0) , _editor (ed) + , name_entry (0) + , control_parent (0) , _order (0) + , _effective_height (0) + , _resize_drag_start (-1) + , _preresize_cursor (0) + , _have_preresize_cursor (false) + , _ebox_release_can_act (true) { if (extra_height == 0) { compute_heights (); } - _canvas_background = new Group (*ed.get_background_group (), 0.0, 0.0); - _canvas_display = new Group (*ed.get_trackview_group (), 0.0, 0.0); + _canvas_display = new Group (ed.get_trackview_group (), ArdourCanvas::Duple (0.0, 0.0)); + CANVAS_DEBUG_NAME (_canvas_display, "main for TAV"); _canvas_display->hide(); // reveal as needed - selection_group = new Group (*_canvas_display); + selection_group = new Group (_canvas_display); + CANVAS_DEBUG_NAME (selection_group, "selection for TAV"); selection_group->set_data (X_("timeselection"), (void *) 1); selection_group->hide(); - _ghost_group = new Group (*_canvas_display); + _ghost_group = new Group (_canvas_display); + CANVAS_DEBUG_NAME (_ghost_group, "ghost for TAV"); _ghost_group->lower_to_bottom(); _ghost_group->show(); - control_parent = 0; - display_menu = 0; - _hidden = false; - in_destructor = false; - height = 0; - _effective_height = 0; - parent = rent; - last_name_entry_key_press_event = 0; - name_packing = NamePackingBits (0); - _resize_drag_start = -1; - - /* - Create the standard LHS Controls - We create the top-level container and name add the name label here, - subclasses can add to the layout as required - */ - - name_entry.set_name ("EditorTrackNameDisplay"); - name_entry.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_release)); - name_entry.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_press)); - name_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_release)); - name_entry.signal_activate().connect (sigc::mem_fun(*this, &TimeAxisView::name_entry_activated)); - name_entry.signal_focus_in_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_in)); - name_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out)); - Gtkmm2ext::set_size_request_to_display_given_text (name_entry, N_("gTortnam"), 10, 10); // just represents a short name - name_label.set_name ("TrackLabel"); name_label.set_alignment (0.0, 0.5); + ARDOUR_UI::instance()->set_tip (name_label, _("Track/Bus name (double click to edit)")); - /* typically, either name_label OR name_entry are visible, - but not both. its up to derived classes to show/hide them as they - wish. - */ + Gtk::Entry* an_entry = new Gtk::Entry; + Gtk::Requisition req; + an_entry->size_request (req); + name_label.set_size_request (-1, req.height); + delete an_entry; + name_hbox.pack_start (name_label, true, true); name_hbox.show (); - + name_label.show (); + controls_table.set_size_request (200); - controls_table.set_row_spacings (0); - controls_table.set_col_spacings (0); + controls_table.set_row_spacings (2); + controls_table.set_col_spacings (2); + controls_table.set_border_width (2); controls_table.set_homogeneous (true); controls_table.attach (name_hbox, 0, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0); controls_table.show_all (); controls_table.set_no_show_all (); - resizer.set_size_request (10, 6); - resizer.set_name ("ResizeHandle"); - resizer.signal_expose_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_expose)); - resizer.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_button_press)); - resizer.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_button_release)); - resizer.signal_motion_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::resizer_motion)); - - resizer.set_events (Gdk::BUTTON_PRESS_MASK| - Gdk::BUTTON_RELEASE_MASK| - Gdk::POINTER_MOTION_MASK| - Gdk::SCROLL_MASK); - - resizer_box.pack_start (resizer, false, false); - resizer.show (); - resizer_box.show(); - HSeparator* separator = manage (new HSeparator()); + separator->set_name("TrackSeparator"); + separator->set_size_request(-1, 1); + separator->show(); controls_vbox.pack_start (controls_table, false, false); - controls_vbox.pack_end (resizer_box, false, false); controls_vbox.show (); + controls_hbox.pack_start (controls_vbox, true, true); + controls_hbox.show (); + //controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected"); - controls_ebox.add (controls_vbox); - controls_ebox.add_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|SCROLL_MASK); + controls_ebox.add (controls_hbox); + controls_ebox.add_events (Gdk::BUTTON_PRESS_MASK| + Gdk::BUTTON_RELEASE_MASK| + Gdk::POINTER_MOTION_MASK| + Gdk::ENTER_NOTIFY_MASK| + Gdk::LEAVE_NOTIFY_MASK| + Gdk::SCROLL_MASK); controls_ebox.set_flags (CAN_FOCUS); - controls_ebox.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_release)); + /* note that this handler connects *before* the default handler */ controls_ebox.signal_scroll_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true); + controls_ebox.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_press)); + controls_ebox.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_button_release)); + controls_ebox.signal_motion_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_motion)); + controls_ebox.signal_leave_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_leave)); + controls_ebox.show (); - controls_hbox.pack_start (controls_ebox, false, false); - controls_hbox.show (); - - time_axis_vbox.pack_start (controls_hbox, true, true); + time_axis_vbox.pack_start (controls_ebox, true, true, 0); time_axis_vbox.pack_end (*separator, false, false); time_axis_vbox.show(); ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler)); - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&TimeAxisView::erase_ghost, this, _1), gui_context()); + GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&TimeAxisView::erase_ghost, this, _1), gui_context()); } TimeAxisView::~TimeAxisView() @@ -207,9 +197,6 @@ TimeAxisView::~TimeAxisView() delete selection_group; selection_group = 0; - delete _canvas_background; - _canvas_background = 0; - delete _canvas_display; _canvas_display = 0; @@ -219,15 +206,6 @@ TimeAxisView::~TimeAxisView() delete _size_menu; } -#if 0 -void -TimeAxisView::show () -{ - canvas_display()->show(); - canvas_background()->show(); -} -#endif - void TimeAxisView::hide () { @@ -236,7 +214,6 @@ TimeAxisView::hide () } _canvas_display->hide (); - _canvas_background->hide (); if (control_parent) { control_parent->remove (time_axis_vbox); @@ -281,21 +258,13 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent) _order = nth; if (_y_position != y) { - _canvas_display->property_y () = y; - _canvas_background->property_y () = y; - /* silly canvas */ - _canvas_display->move (0.0, 0.0); - _canvas_background->move (0.0, 0.0); + _canvas_display->set_y_position (y); _y_position = y; } - _canvas_background->raise_to_top (); _canvas_display->raise_to_top (); - - time_axis_vbox.show (); - controls_ebox.show (); - _canvas_background->show (); + _canvas_display->show (); _hidden = false; @@ -315,45 +284,36 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent) return _effective_height; } -void -TimeAxisView::clip_to_viewport () -{ - if (marked_for_display()) { - if (_y_position + _effective_height < _editor.get_trackview_group_vertical_offset () || _y_position > _editor.get_trackview_group_vertical_offset () + _canvas_display->get_canvas()->get_height()) { - _canvas_background->hide (); - _canvas_display->hide (); - return; - } - _canvas_background->show (); - _canvas_display->show (); - } - return; -} - bool TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) { - if (Keyboard::some_magic_widget_has_focus()) { - return false; - } - switch (ev->direction) { case GDK_SCROLL_UP: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { - step_height (false); + if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) { + /* See Editor::_stepping_axis_view for notes on this hack */ + Editor& e = dynamic_cast (_editor); + if (!e.stepping_axis_view ()) { + e.set_stepping_axis_view (this); + } + e.stepping_axis_view()->step_height (false); return true; } else if (Keyboard::no_modifiers_active (ev->state)) { - _editor.scroll_tracks_up_line(); + _editor.scroll_up_one_track(); return true; } break; case GDK_SCROLL_DOWN: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { - step_height (true); + if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) { + /* See Editor::_stepping_axis_view for notes on this hack */ + Editor& e = dynamic_cast (_editor); + if (!e.stepping_axis_view ()) { + e.set_stepping_axis_view (this); + } + e.stepping_axis_view()->step_height (true); return true; } else if (Keyboard::no_modifiers_active (ev->state)) { - _editor.scroll_tracks_down_line(); + _editor.scroll_down_one_track(); return true; } break; @@ -366,9 +326,122 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) return false; } +bool +TimeAxisView::controls_ebox_button_press (GdkEventButton* event) +{ + if ((event->button == 1 && event->type == GDK_2BUTTON_PRESS) || Keyboard::is_edit_event (event)) { + /* see if it is inside the name label */ + if (name_label.is_ancestor (controls_ebox)) { + int nlx; + int nly; + controls_ebox.translate_coordinates (name_label, event->x, event->y, nlx, nly); + Gtk::Allocation a = name_label.get_allocation (); + if (nlx > 0 && nlx < a.get_width() && nly > 0 && nly < a.get_height()) { + begin_name_edit (); + _ebox_release_can_act = false; + return true; + } + } + + } + + _ebox_release_can_act = true; + + if (maybe_set_cursor (event->y) > 0) { + _resize_drag_start = event->y_root; + } + + return true; +} + +void +TimeAxisView::idle_resize (uint32_t h) +{ + set_height (h); +} + + +bool +TimeAxisView::controls_ebox_motion (GdkEventMotion* ev) +{ + if (_resize_drag_start >= 0) { + + /* (ab)use the DragManager to do autoscrolling - basically we + * are pretending that the drag is taking place over the canvas + * (which perhaps in the glorious future, when track headers + * and the canvas are unified, will actually be true.) + */ + + _editor.maybe_autoscroll (false, true, true); + + /* now schedule the actual TAV resize */ + int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start); + _editor.add_to_idle_resize (this, delta); + _resize_drag_start = ev->y_root; + } else { + /* not dragging but ... */ + maybe_set_cursor (ev->y); + } + + gdk_event_request_motions(ev); + return true; +} + +bool +TimeAxisView::controls_ebox_leave (GdkEventCrossing*) +{ + if (_have_preresize_cursor) { + gdk_window_set_cursor (controls_ebox.get_window()->gobj(), _preresize_cursor); + _have_preresize_cursor = false; + } + return true; +} + +bool +TimeAxisView::maybe_set_cursor (int y) +{ + /* XXX no Gtkmm Gdk::Window::get_cursor() */ + Glib::RefPtr win = controls_ebox.get_window(); + + if (y > (gint) floor (controls_ebox.get_height() * 0.75)) { + + /* y-coordinate in lower 25% */ + + if (!_have_preresize_cursor) { + _preresize_cursor = gdk_window_get_cursor (win->gobj()); + _have_preresize_cursor = true; + win->set_cursor (Gdk::Cursor(Gdk::SB_V_DOUBLE_ARROW)); + } + + return 1; + + } else if (_have_preresize_cursor) { + gdk_window_set_cursor (win->gobj(), _preresize_cursor); + _have_preresize_cursor = false; + + return -1; + } + + return 0; +} + bool TimeAxisView::controls_ebox_button_release (GdkEventButton* ev) { + if (_resize_drag_start >= 0) { + if (_have_preresize_cursor) { + gdk_window_set_cursor (controls_ebox.get_window()->gobj(), _preresize_cursor); + _preresize_cursor = 0; + _have_preresize_cursor = false; + } + _editor.stop_canvas_autoscroll (); + _resize_drag_start = -1; + } + + if (!_ebox_release_can_act) { + return true; + } + switch (ev->button) { case 1: selection_click (ev); @@ -419,16 +492,6 @@ TimeAxisView::step_height (bool coarser) } } -void -TimeAxisView::set_heights (uint32_t h) -{ - TrackSelection& ts (_editor.get_selection().tracks); - - for (TrackSelection::iterator i = ts.begin(); i != ts.end(); ++i) { - (*i)->set_height (h); - } -} - void TimeAxisView::set_height_enum (Height h, bool apply_to_selection) { @@ -457,10 +520,26 @@ TimeAxisView::set_height (uint32_t h) (*i)->set_height (); } - if (canvas_item_visible (selection_group)) { + if (selection_group->visible ()) { /* resize the selection rect */ show_selection (_editor.get_selection().time); } + + _editor.override_visible_track_count (); +} + +bool +TimeAxisView::name_entry_key_press (GdkEventKey* ev) +{ + /* steal escape, tabs from GTK */ + + switch (ev->keyval) { + case GDK_Escape: + case GDK_ISO_Left_Tab: + case GDK_Tab: + return true; + } + return false; } bool @@ -470,9 +549,7 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev) switch (ev->keyval) { case GDK_Escape: - name_entry.select_region (0,0); - controls_ebox.grab_focus (); - name_entry_changed (); + end_name_edit (RESPONSE_CANCEL); return true; /* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually @@ -480,103 +557,157 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev) * ev->state. */ case GDK_ISO_Left_Tab: - case GDK_Tab: - { - name_entry_changed (); - TrackViewList const & allviews = _editor.get_track_views (); - TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this); - if (ev->keyval == GDK_Tab) { - if (i != allviews.end()) { - do { - if (++i == allviews.end()) { - return true; - } - } while((*i)->hidden()); - } - } else { - if (i != allviews.begin()) { - do { - if (i == allviews.begin()) { - return true; - } - --i; - } while ((*i)->hidden()); - } - } - - (*i)->name_entry.grab_focus(); - } - return true; - - case GDK_Up: - case GDK_Down: - name_entry_changed (); + end_name_edit (RESPONSE_APPLY); return true; + case GDK_Tab: + end_name_edit (RESPONSE_ACCEPT); + return true; default: break; } -#ifdef TIMEOUT_NAME_EDIT - /* adapt the timeout to reflect the user's typing speed */ - - guint32 name_entry_timeout; - - if (last_name_entry_key_press_event) { - /* timeout is 1/2 second or 5 times their current inter-char typing speed */ - name_entry_timeout = std::max (500U, (5 * (ev->time - last_name_entry_key_press_event))); - } else { - /* start with a 1 second timeout */ - name_entry_timeout = 1000; - } - - last_name_entry_key_press_event = ev->time; - - /* wait 1 seconds and if no more keys are pressed, act as if they pressed enter */ - - name_entry_key_timeout.disconnect(); - name_entry_key_timeout = Glib::signal_timeout().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_timed_out), name_entry_timeout); -#endif - return false; } bool -TimeAxisView::name_entry_focus_in (GdkEventFocus*) +TimeAxisView::name_entry_focus_out (GdkEventFocus*) { - name_entry.select_region (0, -1); - name_entry.set_name ("EditorActiveTrackNameDisplay"); + end_name_edit (RESPONSE_OK); return false; } -bool -TimeAxisView::name_entry_focus_out (GdkEventFocus*) +void +TimeAxisView::begin_name_edit () { - /* clean up */ - - last_name_entry_key_press_event = 0; - name_entry_key_timeout.disconnect (); - name_entry.set_name ("EditorTrackNameDisplay"); - name_entry.select_region (0,0); - - /* do the real stuff */ + if (name_entry) { + return; + } - name_entry_changed (); + if (can_edit_name()) { - return false; -} + name_entry = manage (new Gtkmm2ext::FocusEntry); + + name_entry->set_name ("EditorTrackNameDisplay"); + name_entry->signal_key_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_press), false); + name_entry->signal_key_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_release), false); + name_entry->signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out)); + name_entry->set_text (name_label.get_text()); + name_entry->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisView::end_name_edit), RESPONSE_OK)); -bool -TimeAxisView::name_entry_key_timed_out () -{ - name_entry_activated(); - return false; + if (name_label.is_ancestor (name_hbox)) { + name_hbox.remove (name_label); + } + + name_hbox.pack_start (*name_entry); + name_entry->show (); + + name_entry->select_region (0, -1); + name_entry->set_state (STATE_SELECTED); + name_entry->grab_focus (); + name_entry->start_editing (0); + } } void -TimeAxisView::name_entry_activated () +TimeAxisView::end_name_edit (int response) { - controls_ebox.grab_focus(); + if (!name_entry) { + return; + } + + bool edit_next = false; + bool edit_prev = false; + + switch (response) { + case RESPONSE_CANCEL: + break; + case RESPONSE_OK: + name_entry_changed (); + break; + case RESPONSE_ACCEPT: + name_entry_changed (); + edit_next = true; + case RESPONSE_APPLY: + name_entry_changed (); + edit_prev = true; + } + + /* this will delete the name_entry. but it will also drop focus, which + * will cause another callback to this function, so set name_entry = 0 + * first to ensure we don't double-remove etc. etc. + */ + + Gtk::Entry* tmp = name_entry; + name_entry = 0; + name_hbox.remove (*tmp); + + /* put the name label back */ + + name_hbox.pack_start (name_label); + name_label.show (); + + if (edit_next) { + + TrackViewList const & allviews = _editor.get_track_views (); + TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this); + + if (i != allviews.end()) { + + do { + if (++i == allviews.end()) { + return; + } + + RouteTimeAxisView* rtav = dynamic_cast(*i); + + if (rtav && rtav->route()->record_enabled()) { + continue; + } + + if (!(*i)->hidden()) { + break; + } + + } while (true); + } + + if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) { + _editor.ensure_time_axis_view_is_visible (**i); + (*i)->begin_name_edit (); + } + + } else if (edit_prev) { + + TrackViewList const & allviews = _editor.get_track_views (); + TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this); + + if (i != allviews.begin()) { + do { + if (i == allviews.begin()) { + return; + } + + --i; + + RouteTimeAxisView* rtav = dynamic_cast(*i); + + if (rtav && rtav->route()->record_enabled()) { + continue; + } + + if (!(*i)->hidden()) { + break; + } + + } while (true); + } + + if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) { + _editor.ensure_time_axis_view_is_visible (**i); + (*i)->begin_name_edit (); + } + } } void @@ -585,22 +716,9 @@ TimeAxisView::name_entry_changed () } bool -TimeAxisView::name_entry_button_press (GdkEventButton *ev) -{ - if (ev->button == 3) { - return true; - } - return false; -} - -bool -TimeAxisView::name_entry_button_release (GdkEventButton *ev) +TimeAxisView::can_edit_name () const { - if (ev->button == 3) { - popup_display_menu (ev->time); - return true; - } - return false; + return true; } void @@ -650,8 +768,6 @@ TimeAxisView::set_selected (bool yn) (*i)->set_selected (false); } } - - resizer.queue_draw (); } void @@ -668,21 +784,18 @@ TimeAxisView::build_display_menu () } void -TimeAxisView::set_samples_per_unit (double spu) +TimeAxisView::set_samples_per_pixel (double fpp) { for (Children::iterator i = children.begin(); i != children.end(); ++i) { - (*i)->set_samples_per_unit (spu); + (*i)->set_samples_per_pixel (fpp); } - - AnalysisFeatureList::const_iterator i; - list::iterator l; } void -TimeAxisView::show_timestretch (framepos_t start, framepos_t end) +TimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layers, int layer) { for (Children::iterator i = children.begin(); i != children.end(); ++i) { - (*i)->show_timestretch (start, end); + (*i)->show_timestretch (start, end, layers, layer); } } @@ -706,7 +819,7 @@ TimeAxisView::show_selection (TimeSelection& ts) (*i)->show_selection (ts); } - if (canvas_item_visible (selection_group)) { + if (selection_group->visible ()) { while (!used_selection_rects.empty()) { free_selection_rects.push_front (used_selection_rects.front()); used_selection_rects.pop_front(); @@ -730,27 +843,17 @@ TimeAxisView::show_selection (TimeSelection& ts) rect = get_selection_rect ((*i).id); - x1 = _editor.frame_to_unit (start); - x2 = _editor.frame_to_unit (start + cnt - 1); + x1 = _editor.sample_to_pixel (start); + x2 = _editor.sample_to_pixel (start + cnt - 1); y2 = current_height(); - rect->rect->property_x1() = x1; - rect->rect->property_y1() = 1.0; - rect->rect->property_x2() = x2; - rect->rect->property_y2() = y2; + rect->rect->set (ArdourCanvas::Rect (x1, 1, x2, y2)); // trim boxes are at the top for selections if (x2 > x1) { - rect->start_trim->property_x1() = x1; - rect->start_trim->property_y1() = 1.0; - rect->start_trim->property_x2() = x1 + trim_handle_size; - rect->start_trim->property_y2() = y2; - - rect->end_trim->property_x1() = x2 - trim_handle_size; - rect->end_trim->property_y1() = 1.0; - rect->end_trim->property_x2() = x2; - rect->end_trim->property_y2() = y2; + rect->start_trim->set (ArdourCanvas::Rect (x1, 1, x1 + trim_handle_size, y2)); + rect->end_trim->set (ArdourCanvas::Rect (x2 - trim_handle_size, 1, x2, y2)); rect->start_trim->show(); rect->end_trim->show(); @@ -777,7 +880,7 @@ TimeAxisView::reshow_selection (TimeSelection& ts) void TimeAxisView::hide_selection () { - if (canvas_item_visible (selection_group)) { + if (selection_group->visible ()) { while (!used_selection_rects.empty()) { free_selection_rects.push_front (used_selection_rects.front()); used_selection_rects.pop_front(); @@ -845,29 +948,26 @@ TimeAxisView::get_selection_rect (uint32_t id) rect = new SelectionRect; - rect->rect = new SimpleRect (*selection_group); - rect->rect->property_outline_what() = 0x0; - rect->rect->property_x1() = 0.0; - rect->rect->property_y1() = 0.0; - rect->rect->property_x2() = 0.0; - rect->rect->property_y2() = 0.0; - rect->rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectionRect.get(); + rect->rect = new ArdourCanvas::Rectangle (selection_group); + CANVAS_DEBUG_NAME (rect->rect, "selection rect"); + rect->rect->set_outline (false); + rect->rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectionRect()); - rect->start_trim = new SimpleRect (*selection_group); - rect->start_trim->property_outline_what() = 0x0; - rect->start_trim->property_x1() = 0.0; - rect->start_trim->property_x2() = 0.0; + rect->start_trim = new ArdourCanvas::Rectangle (selection_group); + CANVAS_DEBUG_NAME (rect->rect, "selection rect start trim"); + rect->start_trim->set_outline (false); + rect->start_trim->set_fill (false); - rect->end_trim = new SimpleRect (*selection_group); - rect->end_trim->property_outline_what() = 0x0; - rect->end_trim->property_x1() = 0.0; - rect->end_trim->property_x2() = 0.0; + rect->end_trim = new ArdourCanvas::Rectangle (selection_group); + CANVAS_DEBUG_NAME (rect->rect, "selection rect end trim"); + rect->end_trim->set_outline (false); + rect->end_trim->set_fill (false); free_selection_rects.push_front (rect); - rect->rect->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_rect_event), rect->rect, rect)); - rect->start_trim->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_start_trim_event), rect->rect, rect)); - rect->end_trim->signal_event().connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_end_trim_event), rect->rect, rect)); + rect->rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_rect_event), rect->rect, rect)); + rect->start_trim->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_start_trim_event), rect->rect, rect)); + rect->end_trim->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_selection_end_trim_event), rect->rect, rect)); } rect = free_selection_rects.front(); @@ -988,9 +1088,9 @@ TimeAxisView::compute_heights () Gtk::Table one_row_table (1, 8); Button* buttons[5]; const int border_width = 2; - extra_height = (2 * border_width) - //+ 2 // 2 pixels for the hseparator between TimeAxisView control areas - + 6; // resizer button (3 x 2 pixel elements + 2 x 2 pixel gaps) + + const int separator_height = 2; + extra_height = (2 * border_width) + separator_height; window.add (one_row_table); @@ -1015,48 +1115,7 @@ TimeAxisView::compute_heights () Gtk::Requisition req(one_row_table.size_request ()); // height required to show 1 row of buttons - - small_height = req.height + (2 * border_width); -} - -void -TimeAxisView::show_name_label () -{ - if (!(name_packing & NameLabelPacked)) { - name_hbox.pack_start (name_label, true, true); - name_packing = NamePackingBits (name_packing | NameLabelPacked); - name_hbox.show (); - name_label.show (); - } -} - -void -TimeAxisView::show_name_entry () -{ - if (!(name_packing & NameEntryPacked)) { - name_hbox.pack_start (name_entry, true, true); - name_packing = NamePackingBits (name_packing | NameEntryPacked); - name_hbox.show (); - name_entry.show (); - } -} - -void -TimeAxisView::hide_name_label () -{ - if (name_packing & NameLabelPacked) { - name_hbox.remove (name_label); - name_packing = NamePackingBits (name_packing & ~NameLabelPacked); - } -} - -void -TimeAxisView::hide_name_entry () -{ - if (name_packing & NameEntryPacked) { - name_hbox.remove (name_entry); - name_packing = NamePackingBits (name_packing & ~NameEntryPacked); - } + button_height = req.height; } void @@ -1068,26 +1127,26 @@ TimeAxisView::color_handler () for (list::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) { - (*i)->rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectionRect.get(); - (*i)->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); + (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectionRect()); + (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection()); - (*i)->start_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - (*i)->start_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - - (*i)->end_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - (*i)->end_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); + (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_canvasvar_Selection()); + (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection()); + + (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_canvasvar_Selection()); + (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection()); } - + for (list::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) { - - (*i)->rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectionRect.get(); - (*i)->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - - (*i)->start_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - (*i)->start_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - - (*i)->end_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - (*i)->end_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); + + (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectionRect()); + (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection()); + + (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_canvasvar_Selection()); + (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection()); + + (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_canvasvar_Selection()); + (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection()); } } @@ -1095,11 +1154,11 @@ TimeAxisView::color_handler () * TimeAxisView is non-0 if this object covers y, or one of its children does. * If the covering object is a child axis, then the child is returned. * TimeAxisView is 0 otherwise. - * Layer index is the layer number if the TimeAxisView is valid and is in stacked - * region display mode, otherwise 0. + * Layer index is the layer number (possibly fractional) if the TimeAxisView is valid + * and is in stacked or expanded * region display mode, otherwise 0. */ -std::pair -TimeAxisView::covers_y_position (double y) +std::pair +TimeAxisView::covers_y_position (double y) const { if (hidden()) { return std::make_pair ((TimeAxisView *) 0, 0); @@ -1108,18 +1167,33 @@ TimeAxisView::covers_y_position (double y) if (_y_position <= y && y < (_y_position + height)) { /* work out the layer index if appropriate */ - layer_t l = 0; - if (layer_display () == Stacked && view ()) { - /* compute layer */ - l = layer_t ((_y_position + height - y) / (view()->child_height ())); - /* clamp to max layers to be on the safe side; sometimes the above calculation - returns a too-high value */ - if (l >= view()->layers ()) { - l = view()->layers() - 1; + double l = 0; + switch (layer_display ()) { + case Overlaid: + break; + case Stacked: + if (view ()) { + /* compute layer */ + l = layer_t ((_y_position + height - y) / (view()->child_height ())); + /* clamp to max layers to be on the safe side; sometimes the above calculation + returns a too-high value */ + if (l >= view()->layers ()) { + l = view()->layers() - 1; + } + } + break; + case Expanded: + if (view ()) { + int const n = floor ((_y_position + height - y) / (view()->child_height ())); + l = n * 0.5 - 0.5; + if (l >= (view()->layers() - 0.5)) { + l = view()->layers() - 0.5; + } } + break; } - return std::make_pair (this, l); + return std::make_pair (const_cast(this), l); } for (Children::const_iterator i = children.begin(); i != children.end(); ++i) { @@ -1134,84 +1208,26 @@ TimeAxisView::covers_y_position (double y) } bool -TimeAxisView::resizer_button_press (GdkEventButton* event) +TimeAxisView::covered_by_y_range (double y0, double y1) const { - _resize_drag_start = event->y_root; - return true; -} - -bool -TimeAxisView::resizer_button_release (GdkEventButton*) -{ - _editor.stop_canvas_autoscroll (); - _resize_drag_start = -1; - return true; -} - -void -TimeAxisView::idle_resize (uint32_t h) -{ - set_height (h); -} - -bool -TimeAxisView::resizer_motion (GdkEventMotion* ev) -{ - if (_resize_drag_start >= 0) { - /* (ab)use the DragManager to do autoscrolling; adjust the event coordinates - into the world coordinate space that DragManager::motion_handler is expecting, - and then fake a DragManager motion event so that when maybe_autoscroll - asks DragManager for the current pointer position it will get the correct - answers. - */ - int tx, ty; - resizer.translate_coordinates (*control_parent, ev->x, ev->y, tx, ty); - ev->y = ty - _editor.get_trackview_group_vertical_offset(); - _editor.drags()->motion_handler ((GdkEvent *) ev, false); - _editor.maybe_autoscroll (false, true); - - /* now do the actual TAV resize */ - int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start); - _editor.add_to_idle_resize (this, delta); - _resize_drag_start = ev->y_root; - } - - return true; -} - -bool -TimeAxisView::resizer_expose (GdkEventExpose* event) -{ - int w, h, x, y, d; - Glib::RefPtr win (resizer.get_window()); - Glib::RefPtr dark (resizer.get_style()->get_fg_gc (STATE_NORMAL)); - Glib::RefPtr light (resizer.get_style()->get_bg_gc (STATE_NORMAL)); - - win->draw_rectangle (controls_ebox.get_style()->get_bg_gc(STATE_NORMAL), - true, - event->area.x, - event->area.y, - event->area.width, - event->area.height); - - win->get_geometry (x, y, w, h, d); - - /* handle/line #1 */ - - win->draw_line (dark, 0, 0, w - 2, 0); - win->draw_point (dark, 0, 1); - win->draw_line (light, 1, 1, w - 1, 1); - win->draw_point (light, w - 1, 0); - - /* handle/line #2 */ + if (hidden()) { + return false; + } - win->draw_line (dark, 0, 4, w - 2, 4); - win->draw_point (dark, 0, 5); - win->draw_line (light, 1, 5, w - 1, 5); - win->draw_point (light, w - 1, 4); + /* if either the top or bottom of the axisview is in the vertical + * range, we cover it. + */ + + if ((y0 < _y_position && y1 < _y_position) || + (y0 >= _y_position + height && y1 >= _y_position + height)) { + return false; + } - /* use vertical resize mouse cursor */ - win->set_cursor(Gdk::Cursor(Gdk::SB_V_DOUBLE_ARROW)); + for (Children::const_iterator i = children.begin(); i != children.end(); ++i) { + if ((*i)->covered_by_y_range (y0, y1)) { + return true; + } + } return true; } @@ -1221,15 +1237,15 @@ TimeAxisView::preset_height (Height h) { switch (h) { case HeightLargest: - return extra_height + 48 + 250; + return (button_height * 2) + extra_height + 260; case HeightLarger: - return extra_height + 48 + 150; + return (button_height * 2) + extra_height + 160; case HeightLarge: - return extra_height + 48 + 50; + return (button_height * 2) + extra_height + 60; case HeightNormal: - return extra_height + 48; + return (button_height * 2) + extra_height + 10; case HeightSmall: - return small_height; + return button_height + extra_height; } /* NOTREACHED */ @@ -1279,10 +1295,37 @@ TimeAxisView::reset_visual_state () /* this method is not required to trigger a global redraw */ string str = gui_property ("height"); - + if (!str.empty()) { set_height (atoi (str)); } else { set_height (preset_height (HeightNormal)); } } + +TrackViewList +TrackViewList::filter_to_unique_playlists () +{ + std::set > playlists; + TrackViewList ts; + + for (iterator i = begin(); i != end(); ++i) { + RouteTimeAxisView* rtav = dynamic_cast (*i); + if (!rtav) { + /* not a route: include it anyway */ + ts.push_back (*i); + } else { + boost::shared_ptr t = rtav->track(); + if (t) { + if (playlists.insert (t->playlist()).second) { + /* playlist not seen yet */ + ts.push_back (*i); + } + } else { + /* not a track: include it anyway */ + ts.push_back (*i); + } + } + } + return ts; +}