refine video-tools installer:
[ardour.git] / gtk2_ardour / time_axis_view.cc
index 1f50e938818ec4a0549781660a8619fcb491afda..8d2276bfb9cd76ef3bdb264fdf4b8a9158489b09 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <libgnomecanvasmm/item.h>
 
 #include "pbd/error.h"
+#include "pbd/convert.h"
 
+#include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
-
-#include "ardour/session.h"
-#include "ardour/utils.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/processor.h"
-#include "ardour/location.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 "rgb_macros.h"
 #include "utils.h"
 #include "streamview.h"
+#include "editor_drag.h"
+#include "editor.h"
 
 #include "i18n.h"
 
 using namespace std;
 using namespace Gtk;
 using namespace Gdk;
-using namespace sigc; 
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
 using namespace ArdourCanvas;
+using Gtkmm2ext::Keyboard;
 
 const double trim_handle_size = 6.0; /* pixels */
-
-uint32_t TimeAxisView::hLargest = 0;
-uint32_t TimeAxisView::hLarge = 0;
-uint32_t TimeAxisView::hLarger = 0;
-uint32_t TimeAxisView::hNormal = 0;
-uint32_t TimeAxisView::hSmaller = 0;
-uint32_t TimeAxisView::hSmall = 0;
-bool TimeAxisView::need_size_info = true;
+uint32_t TimeAxisView::button_height = 0;
+uint32_t TimeAxisView::extra_height = 0;
 int const TimeAxisView::_max_order = 512;
-
-TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisViewPtr rent, Canvas& canvas) 
-       : AxisView (sess), 
-         controls_table (2, 8),
-         _y_position (0),
-         _editor (ed),
-         _order (0)
-{
-       if (need_size_info) {
-               compute_controls_size_info ();
-               need_size_info = false;
+PBD::Signal1<void,TimeAxisView*> 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)
+       , _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)
+       , _ghost_group (0)
+       , _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->hide(); // reveal as needed
 
        selection_group = new Group (*_canvas_display);
+       selection_group->set_data (X_("timeselection"), (void *) 1);
        selection_group->hide();
 
        _ghost_group = new Group (*_canvas_display);
        _ghost_group->lower_to_bottom();
        _ghost_group->show();
 
-       control_parent = 0;
-       display_menu = 0;
-       size_menu = 0;
-       _hidden = false;
-       in_destructor = false;
-       height = 0;
-       _effective_height = 0;
-       parent = rent;
-       _has_state = false;
-       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 (mem_fun (*this, &TimeAxisView::name_entry_button_release));
-       name_entry.signal_button_press_event().connect (mem_fun (*this, &TimeAxisView::name_entry_button_press));
-       name_entry.signal_key_release_event().connect (mem_fun (*this, &TimeAxisView::name_entry_key_release));
-       name_entry.signal_activate().connect (mem_fun(*this, &TimeAxisView::name_entry_activated));
-       name_entry.signal_focus_in_event().connect (mem_fun (*this, &TimeAxisView::name_entry_focus_in));
-       name_entry.signal_focus_out_event().connect (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 (2);
+       controls_table.set_col_spacings (2);
        controls_table.set_border_width (2);
-       controls_table.set_row_spacings (0);
-       controls_table.set_col_spacings (0);
        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, 10);
-       resizer.set_name ("ResizeHandle");
-       resizer.signal_expose_event().connect (mem_fun (*this, &TimeAxisView::resizer_expose));
-       resizer.signal_button_press_event().connect (mem_fun (*this, &TimeAxisView::resizer_button_press));
-       resizer.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::resizer_button_release));
-       resizer.signal_motion_notify_event().connect (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());
 
        controls_vbox.pack_start (controls_table, false, false);
-       controls_vbox.pack_end (*separator, false, false);
-       controls_vbox.pack_end (resizer_box, false, true);
        controls_vbox.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_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 (mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
-       controls_ebox.signal_scroll_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_scroll), true);
+       /* 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,true,true);
+       controls_hbox.pack_start (controls_ebox, true, true);
        controls_hbox.show ();
 
-       ColorsChanged.connect (mem_fun (*this, &TimeAxisView::color_handler));
+       time_axis_vbox.pack_start (controls_hbox, true, true);
+       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), boost::bind (&TimeAxisView::erase_ghost, this, _1), gui_context());
 }
 
 TimeAxisView::~TimeAxisView()
@@ -199,10 +189,6 @@ TimeAxisView::~TimeAxisView()
                delete (*i)->end_trim;
        }
 
-       for (list<SimpleLine*>::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
-               delete (*i);
-       }
-
        delete selection_group;
        selection_group = 0;
 
@@ -214,6 +200,40 @@ TimeAxisView::~TimeAxisView()
 
        delete display_menu;
        display_menu = 0;
+
+       delete _size_menu;
+}
+
+void
+TimeAxisView::hide ()
+{
+       if (_hidden) {
+               return;
+       }
+
+       _canvas_display->hide ();
+       _canvas_background->hide ();
+
+       if (control_parent) {
+               control_parent->remove (time_axis_vbox);
+               control_parent = 0;
+       }
+
+       _y_position = -1;
+       _hidden = true;
+
+       /* now hide children */
+
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+               (*i)->hide ();
+       }
+
+       /* if its hidden, it cannot be selected */
+       _editor.get_selection().remove (this);
+       /* and neither can its regions */
+       _editor.get_selection().remove_regions (this);
+
+       Hiding ();
 }
 
 /** Display this TimeAxisView as the nth component of the parent box, at y.
@@ -227,11 +247,11 @@ guint32
 TimeAxisView::show_at (double y, int& nth, VBox *parent)
 {
        if (control_parent) {
-               control_parent->reorder_child (controls_hbox, nth);
+               control_parent->reorder_child (time_axis_vbox, nth);
        } else {
                control_parent = parent;
-               parent->pack_start (controls_hbox, false, false);
-               parent->reorder_child (controls_hbox, nth);
+               parent->pack_start (time_axis_vbox, false, false);
+               parent->reorder_child (time_axis_vbox, nth);
        }
 
        _order = nth;
@@ -249,22 +269,21 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
        _canvas_background->raise_to_top ();
        _canvas_display->raise_to_top ();
 
-       if (_marked_for_display) {
-               controls_hbox.show ();
-               controls_ebox.show ();
-               _canvas_background->show ();
-       }
+       _canvas_background->show ();
+       _canvas_display->show ();
 
        _hidden = false;
 
        _effective_height = current_height ();
 
-       /* now show children */
+       /* now show relevant children */
 
        for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-               if (canvas_item_visible ((*i)->_canvas_display)) {
+               if ((*i)->marked_for_display()) {
                        ++nth;
                        _effective_height += (*i)->show_at (y + _effective_height, nth, parent);
+               } else {
+                       (*i)->hide ();
                }
        }
 
@@ -274,7 +293,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
 void
 TimeAxisView::clip_to_viewport ()
 {
-       if (_marked_for_display) {
+       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 ();
@@ -292,7 +311,12 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
        switch (ev->direction) {
        case GDK_SCROLL_UP:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-                       step_height (true);
+                       /* See Editor::_stepping_axis_view for notes on this hack */
+                       Editor& e = dynamic_cast<Editor&> (_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();
@@ -302,7 +326,12 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 
        case GDK_SCROLL_DOWN:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-                       step_height (false);
+                       /* See Editor::_stepping_axis_view for notes on this hack */
+                       Editor& e = dynamic_cast<Editor&> (_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();
@@ -318,9 +347,124 @@ 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; 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;
+               controls_ebox.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, false, ev->y_root < _resize_drag_start);
+
+               /* 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;
+        } else {
+               /* not dragging but ... */
+               maybe_set_cursor (ev->y);
+       }
+
+       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<Gdk::Window> 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);
@@ -337,73 +481,64 @@ TimeAxisView::controls_ebox_button_release (GdkEventButton* ev)
 void
 TimeAxisView::selection_click (GdkEventButton* ev)
 {
-       Selection::Operation op = Keyboard::selection_type (ev->state);
-       _editor.set_selected_track (shared_from_this (), op, false);
+       Selection::Operation op = ArdourKeyboard::selection_type (ev->state);
+       _editor.set_selected_track (*this, op, false);
 }
 
+
+/** Steps through the defined heights for this TrackView.
+ *  @param coarser true if stepping should decrease in size, otherwise false.
+ */
 void
-TimeAxisView::hide ()
+TimeAxisView::step_height (bool coarser)
 {
-       if (_hidden) {
-               return;
-       }
+       static const uint32_t step = 25;
 
-       _canvas_display->hide ();
-       _canvas_background->hide ();
+       if (coarser) {
 
-       if (control_parent) {
-               control_parent->remove (controls_hbox);
-               control_parent = 0;
-       }
+               if (height <= preset_height (HeightSmall)) {
+                       return;
+               } else if (height <= preset_height (HeightNormal) && height > preset_height (HeightSmall)) {
+                       set_height_enum (HeightSmall);
+               } else {
+                       set_height (height - step);
+               }
 
-       _y_position = -1;
-       _hidden = true;
+       } else {
 
-       /* now hide children */
+               if (height <= preset_height(HeightSmall)) {
+                       set_height_enum (HeightNormal);
+               } else {
+                       set_height (height + step);
+               }
 
-       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-               (*i)->hide ();
        }
-
-       /* if its hidden, it cannot be selected */
-
-       _editor.get_selection().remove (shared_from_this ());
-
-       Hiding ();
 }
 
 void
-TimeAxisView::step_height (bool bigger)
+TimeAxisView::set_height_enum (Height h, bool apply_to_selection)
 {
-       static const uint32_t step = 20;
-
-       if (bigger) {
-               set_height (height + step);
+       if (apply_to_selection) {
+               _editor.get_selection().tracks.foreach_time_axis (boost::bind (&TimeAxisView::set_height_enum, _1, h, false));
        } else {
-               if (height > step) {
-                       set_height (std::max (height - step, hSmall));
-               } else if (height != hSmall) {
-                       set_height (hSmall);
-               }
+               set_height (preset_height (h));
        }
 }
 
 void
-TimeAxisView::set_heights (uint32_t h)
+TimeAxisView::set_height (uint32_t h)
 {
-       TrackSelection& ts (_editor.get_selection().tracks);
-
-       for (TrackSelection::iterator i = ts.begin(); i != ts.end(); ++i) {
-               (*i)->set_height (h);
+       if (h < preset_height (HeightSmall)) {
+               h = preset_height (HeightSmall);
        }
-}
 
-void
-TimeAxisView::set_height(uint32_t h)
-{
-       controls_ebox.property_height_request () = h;
+       time_axis_vbox.property_height_request () = h;
        height = h;
 
+       char buf[32];
+       snprintf (buf, sizeof (buf), "%u", height);
+       set_gui_property ("height", buf);
+
        for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                (*i)->set_height ();
        }
@@ -412,127 +547,188 @@ TimeAxisView::set_height(uint32_t h)
                /* resize the selection rect */
                show_selection (_editor.get_selection().time);
        }
+}
+
+bool
+TimeAxisView::name_entry_key_press (GdkEventKey* ev)
+{
+       /* steal escape, tabs from GTK */
 
-       reshow_feature_lines ();
+       switch (ev->keyval) {
+       case GDK_Escape:
+       case GDK_ISO_Left_Tab:
+       case GDK_Tab:
+               return true;
+       }
+       return false;
 }
 
 bool
 TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 {
-       PublicEditor::TrackViewList *allviews = 0;
-       PublicEditor::TrackViewList::iterator i;
+       TrackViewList::iterator i;
 
        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
-        * generates a different ev->keyval, rather than setting 
+        * generates a different ev->keyval, rather than setting
         * ev->state.
         */
        case GDK_ISO_Left_Tab:
-       case GDK_Tab:
-               name_entry_changed ();
-               allviews = _editor.get_valid_views (TimeAxisViewPtr ());
-               if (allviews != 0) {
-                       i = find (allviews->begin(), allviews->end(), shared_from_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; }
-                                       } while ((*i)->hidden());
-                               }
-                       }
-
-
-                       /* resize to show editable name display */
-
-                       if ((*i)->current_height() >= hSmall && (*i)->current_height() < hNormal) {
-                               (*i)->set_height (hSmaller);
-                       }
-
-                       (*i)->name_entry.grab_focus();
-               }
+               end_name_edit (RESPONSE_APPLY);
                return true;
 
-       case GDK_Up:
-       case GDK_Down:
-               name_entry_changed ();
+       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 (mem_fun (*this, &TimeAxisView::name_entry_key_timed_out), name_entry_timeout);
-#endif
-
        return false;
 }
 
 bool
-TimeAxisView::name_entry_focus_in (GdkEventFocus* ev)
+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* ev)
+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));
+
+               if (name_label.is_ancestor (name_hbox)) {
+                       name_hbox.remove (name_label);
+               }
+               
+               name_hbox.pack_start (*name_entry);
+               name_entry->show ();
 
-bool
-TimeAxisView::name_entry_key_timed_out ()
-{
-       name_entry_activated();
-       return false;
+               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<RouteTimeAxisView*>(*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<RouteTimeAxisView*>(*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
@@ -541,22 +737,9 @@ TimeAxisView::name_entry_changed ()
 }
 
 bool
-TimeAxisView::name_entry_button_press (GdkEventButton *ev)
+TimeAxisView::can_edit_name () const
 {
-       if (ev->button == 3) {
-               return true;
-       }
-       return false;
-}
-
-bool
-TimeAxisView::name_entry_button_release (GdkEventButton *ev)
-{
-       if (ev->button == 3) {
-               popup_display_menu (ev->time);
-               return true;
-       }
-       return false;
+       return true;
 }
 
 void
@@ -564,37 +747,18 @@ TimeAxisView::conditionally_add_to_selection ()
 {
        Selection& s (_editor.get_selection ());
 
-       if (!s.selected (shared_from_this ())) {
-               _editor.set_selected_track (shared_from_this (), Selection::Set);
+       if (!s.selected (this)) {
+               _editor.set_selected_track (*this, Selection::Set);
        }
 }
 
 void
 TimeAxisView::popup_display_menu (guint32 when)
 {
-       if (display_menu == 0) {
-               build_display_menu ();
-       }
-
        conditionally_add_to_selection ();
-       display_menu->popup (1, when);  
-}
 
-gint
-TimeAxisView::size_click (GdkEventButton *ev)
-{
-       conditionally_add_to_selection ();
-       popup_size_menu (ev->time);
-       return TRUE;
-}
-
-void
-TimeAxisView::popup_size_menu (guint32 when)
-{
-       if (size_menu == 0) {
-               build_size_menu ();
-       }
-       size_menu->popup (1, when);
+       build_display_menu ();
+       display_menu->popup (1, when);
 }
 
 void
@@ -608,17 +772,11 @@ TimeAxisView::set_selected (bool yn)
 
        if (_selected) {
                controls_ebox.set_name (controls_base_selected_name);
-               controls_hbox.set_name (controls_base_selected_name);
+               time_axis_vbox.set_name (controls_base_selected_name);
                controls_vbox.set_name (controls_base_selected_name);
-               /* propagate any existing selection, if the mode is right */
-
-               if (_editor.current_mouse_mode() == Editing::MouseRange && !_editor.get_selection().time.empty()) {
-                       show_selection (_editor.get_selection().time);
-               }
-
        } else {
                controls_ebox.set_name (controls_base_unselected_name);
-               controls_hbox.set_name (controls_base_unselected_name);
+               time_axis_vbox.set_name (controls_base_unselected_name);
                controls_vbox.set_name (controls_base_unselected_name);
                hide_selection ();
 
@@ -631,25 +789,6 @@ TimeAxisView::set_selected (bool yn)
                        (*i)->set_selected (false);
                }
        }
-
-       resizer.queue_draw ();
-}
-
-void
-TimeAxisView::build_size_menu ()
-{
-       using namespace Menu_Helpers;
-
-       size_menu = new Menu;
-       size_menu->set_name ("ArdourContextMenu");
-       MenuList& items = size_menu->items();
-
-       items.push_back (MenuElem (_("Largest"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLargest)));
-       items.push_back (MenuElem (_("Large"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLarge)));
-       items.push_back (MenuElem (_("Larger"), bind (mem_fun (*this, &TimeAxisView::set_heights), hLarger)));
-       items.push_back (MenuElem (_("Normal"), bind (mem_fun (*this, &TimeAxisView::set_heights), hNormal)));
-       items.push_back (MenuElem (_("Smaller"), bind (mem_fun (*this, &TimeAxisView::set_heights),hSmaller)));
-       items.push_back (MenuElem (_("Small"), bind (mem_fun (*this, &TimeAxisView::set_heights), hSmall)));
 }
 
 void
@@ -657,6 +796,8 @@ TimeAxisView::build_display_menu ()
 {
        using namespace Menu_Helpers;
 
+       delete display_menu;
+
        display_menu = new Menu;
        display_menu->set_name ("ArdourContextMenu");
 
@@ -672,18 +813,13 @@ TimeAxisView::set_samples_per_unit (double spu)
 
        AnalysisFeatureList::const_iterator i;
        list<ArdourCanvas::SimpleLine*>::iterator l;
-
-       for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
-               (*l)->property_x1() = _editor.frame_to_pixel (*i);
-               (*l)->property_x2() = _editor.frame_to_pixel (*i);
-       }
 }
 
 void
-TimeAxisView::show_timestretch (nframes_t start, nframes_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);
        }
 }
 
@@ -722,7 +858,8 @@ TimeAxisView::show_selection (TimeSelection& ts)
        selection_group->raise_to_top();
 
        for (list<AudioRange>::iterator i = ts.begin(); i != ts.end(); ++i) {
-               nframes_t start, end, cnt;
+               framepos_t start, end;
+               framecnt_t cnt;
 
                start = (*i).start;
                end = (*i).end;
@@ -745,12 +882,12 @@ TimeAxisView::show_selection (TimeSelection& ts)
                        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() = 1.0 + 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() = 1.0 + trim_handle_size;
+                       rect->end_trim->property_y2() = y2;
 
                        rect->start_trim->show();
                        rect->end_trim->show();
@@ -846,31 +983,29 @@ 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->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
 
                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->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
-               rect->start_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
 
                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->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
-               rect->end_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
 
                free_selection_rects.push_front (rect);
 
-               rect->rect->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_selection_rect_event), rect->rect, rect));
-               rect->start_trim->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_selection_start_trim_event), rect->rect, rect));
-               rect->end_trim->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_selection_end_trim_event), rect->rect, 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 = free_selection_rects.front();
        rect->id = id;
@@ -878,10 +1013,12 @@ TimeAxisView::get_selection_rect (uint32_t id)
        return rect;
 }
 
+struct null_deleter { void operator()(void const *) const {} };
+
 bool
-TimeAxisView::is_child (TimeAxisViewPtr tav)
+TimeAxisView::is_child (TimeAxisView* tav)
 {
-       return find (children.begin(), children.end(), tav) != children.end();
+       return find (children.begin(), children.end(), boost::shared_ptr<TimeAxisView>(tav, null_deleter())) != children.end();
 }
 
 void
@@ -900,14 +1037,21 @@ TimeAxisView::remove_child (boost::shared_ptr<TimeAxisView> child)
        }
 }
 
+/** Get selectable things within a given range.
+ *  @param start Start time in session frames.
+ *  @param end End time in session frames.
+ *  @param top Top y range, in trackview coordinates (ie 0 is the top of the track view)
+ *  @param bot Bottom y range, in trackview coordinates (ie 0 is the top of the track view)
+ *  @param result Filled in with selectable things.
+ */
 void
-TimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& result)
+TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list<Selectable*>& /*result*/)
 {
        return;
 }
 
 void
-TimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& result)
+TimeAxisView::get_inverted_selectables (Selection& /*sel*/, list<Selectable*>& /*result*/)
 {
        return;
 }
@@ -915,29 +1059,27 @@ TimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& resul
 void
 TimeAxisView::add_ghost (RegionView* rv)
 {
-       GhostRegion* gr = rv->add_ghost (shared_from_this ());
+       GhostRegion* gr = rv->add_ghost (*this);
 
-       if(gr) {
+       if (gr) {
                ghosts.push_back(gr);
-               gr->GoingAway.connect (mem_fun(*this, &TimeAxisView::erase_ghost));
        }
 }
 
 void
 TimeAxisView::remove_ghost (RegionView* rv)
 {
-       rv->remove_ghost_in (shared_from_this ());
+       rv->remove_ghost_in (*this);
 }
 
 void
-TimeAxisView::erase_ghost (GhostRegion* gr) {
-       if(in_destructor) {
+TimeAxisView::erase_ghost (GhostRegion* gr)
+{
+       if (in_destructor) {
                return;
        }
 
-       list<GhostRegion*>::iterator i;
-
-       for (i = ghosts.begin(); i != ghosts.end(); ++i) {
+       for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                if ((*i) == gr) {
                        ghosts.erase (i);
                        break;
@@ -953,89 +1095,20 @@ TimeAxisView::touched (double top, double bot)
        */
 
        double mybot = _y_position + current_height();
-       
-       return ((_y_position <= bot && _y_position >= top) || 
-               ((mybot <= bot) && (top < mybot)) || 
-               (mybot >= bot && _y_position < top));
-}              
-
-void
-TimeAxisView::set_parent (TimeAxisViewPtr p)
-{
-       parent = p;
-}
-
-bool
-TimeAxisView::has_state () const
-{
-       return _has_state;
-}
-
-TimeAxisViewPtr
-TimeAxisView::get_parent_with_state ()
-{
-       if (parent == 0 || parent->has_state()) {
-               return parent;
-       }
 
-       return parent->get_parent_with_state ();
+       return ((_y_position <= bot && _y_position >= top) ||
+               ((mybot <= bot) && (top < mybot)) ||
+               (mybot >= bot && _y_position < top));
 }
 
-
-XMLNode&
-TimeAxisView::get_state ()
+void
+TimeAxisView::set_parent (TimeAxisView& p)
 {
-       XMLNode* node = new XMLNode ("TAV-" + name());
-       char buf[32];
-
-       snprintf (buf, sizeof(buf), "%u", height);
-       node->add_property ("height", buf);
-       node->add_property ("marked-for-display", (_marked_for_display ? "1" : "0"));
-       return *node;
-}
-
-int
-TimeAxisView::set_state (const XMLNode& node)
-{
-       const XMLProperty *prop;
-
-       if ((prop = node.property ("marked-for-display")) != 0) {
-               _marked_for_display = (prop->value() == "1");
-       }
-
-       if ((prop = node.property ("track-height")) != 0) {
-
-               if (prop->value() == "largest") {
-                       set_height (hLargest);
-               } else if (prop->value() == "large") {
-                       set_height (hLarge);
-               } else if (prop->value() == "larger") {
-                       set_height (hLarger);
-               } else if (prop->value() == "normal") {
-                       set_height (hNormal);
-               } else if (prop->value() == "smaller") {
-                       set_height (hSmaller);
-               } else if (prop->value() == "small") {
-                       set_height (hSmall);
-               } else {
-                       error << string_compose(_("unknown track height name \"%1\" in XML GUI information"), prop->value()) << endmsg;
-                       set_height (Normal);
-               }
-
-       } else if ((prop = node.property ("height")) != 0) {
-
-               set_height (atoi (prop->value()));
-               
-       } else {
-
-               set_height (hNormal);
-       }
-
-       return 0;
+       parent = &p;
 }
 
 void
-TimeAxisView::reset_height()
+TimeAxisView::reset_height ()
 {
        set_height (height);
 
@@ -1043,18 +1116,18 @@ TimeAxisView::reset_height()
                (*i)->set_height ((*i)->height);
        }
 }
-       
+
 void
-TimeAxisView::compute_controls_size_info ()
+TimeAxisView::compute_heights ()
 {
        Gtk::Window window (Gtk::WINDOW_TOPLEVEL);
        Gtk::Table two_row_table (2, 8);
        Gtk::Table one_row_table (1, 8);
        Button* buttons[5];
        const int border_width = 2;
-       const int extra_height = (2 * border_width)
-               //+ 2   // 2 pixels for the hseparator between TimeAxisView control areas
-               + 10; // 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);
 
@@ -1074,86 +1147,18 @@ TimeAxisView::compute_controls_size_info ()
        }
 
        one_row_table.attach (*buttons[0], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-       
+
        one_row_table.show_all ();
        Gtk::Requisition req(one_row_table.size_request ());
 
-
        // height required to show 1 row of buttons
-
-       hSmaller = req.height + extra_height;
-
-       window.remove ();
-       window.add (two_row_table);
-
-       two_row_table.attach (*buttons[1], 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-       two_row_table.attach (*buttons[2], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-       two_row_table.attach (*buttons[3], 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-       two_row_table.attach (*buttons[4], 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-
-       two_row_table.show_all ();
-       req = two_row_table.size_request ();
-
-       // height required to show all normal buttons 
-
-       hNormal = /*req.height*/ 48 + extra_height;
-
-       // these heights are all just larger than normal. no more 
-       // elements are visible (yet).
-
-       hLarger = hNormal + 50;
-       hLarge = hNormal + 150;
-       hLargest = hNormal + 250;
-
-       // height required to show track name
-
-       hSmall = 27;
-}
-
-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
 TimeAxisView::color_handler ()
 {
-       for (list<GhostRegion*>::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) {
+       for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); i++) {
                (*i)->set_colors();
        }
 
@@ -1186,175 +1191,154 @@ 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<TimeAxisViewPtr, layer_t>
+std::pair<TimeAxisView*, double>
 TimeAxisView::covers_y_position (double y)
 {
        if (hidden()) {
-               return std::make_pair (TimeAxisViewPtr (), 0);
+               return std::make_pair ((TimeAxisView *) 0, 0);
        }
 
        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 (shared_from_this (), l);
+
+               return std::make_pair (this, l);
        }
 
        for (Children::const_iterator i = children.begin(); i != children.end(); ++i) {
 
-               std::pair<TimeAxisViewPtr, int> const r = (*i)->covers_y_position (y);
+               std::pair<TimeAxisView*, int> const r = (*i)->covers_y_position (y);
                if (r.first) {
                        return r;
                }
        }
 
-       return std::make_pair (TimeAxisViewPtr (), 0);
-}
-
-void
-TimeAxisView::show_feature_lines (const AnalysisFeatureList& pos)
-{
-       analysis_features = pos;
-       reshow_feature_lines ();
+       return std::make_pair ((TimeAxisView *) 0, 0);
 }
 
 
-void
-TimeAxisView::hide_feature_lines ()
+uint32_t
+TimeAxisView::preset_height (Height h)
 {
-       list<ArdourCanvas::SimpleLine*>::iterator l;
-
-       for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
-               (*l)->hide();
+       switch (h) {
+       case HeightLargest:
+               return (button_height * 2) + extra_height + 260;
+       case HeightLarger:
+               return (button_height * 2) + extra_height + 160;
+       case HeightLarge:
+               return (button_height * 2) + extra_height + 60;
+       case HeightNormal:
+               return (button_height * 2) + extra_height + 10;
+       case HeightSmall:
+               return button_height + extra_height;
        }
+
+       /* NOTREACHED */
+       return 0;
 }
 
-void
-TimeAxisView::reshow_feature_lines ()
+/** @return Child time axis views that are not hidden */
+TimeAxisView::Children
+TimeAxisView::get_child_list ()
 {
-       while (feature_lines.size()< analysis_features.size()) {
-               ArdourCanvas::SimpleLine* l = new ArdourCanvas::SimpleLine (*_canvas_display);
-               l->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();
-               feature_lines.push_back (l);
-       }
-
-       while (feature_lines.size() > analysis_features.size()) {
-               ArdourCanvas::SimpleLine *line = feature_lines.back();
-               feature_lines.pop_back ();
-               delete line;
-       }
-
-       AnalysisFeatureList::const_iterator i;
-       list<ArdourCanvas::SimpleLine*>::iterator l;
+       Children c;
 
-       for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
-               (*l)->property_x1() = _editor.frame_to_pixel (*i);
-               (*l)->property_x2() = _editor.frame_to_pixel (*i);
-               (*l)->property_y1() = 0;
-               (*l)->property_y2() = current_height();
-               (*l)->show ();
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+               if (!(*i)->hidden()) {
+                       c.push_back(*i);
+               }
        }
-}
 
-bool
-TimeAxisView::resizer_button_press (GdkEventButton* event)
-{
-       _resize_drag_start = event->y_root;
-       return true;
-}
-
-bool
-TimeAxisView::resizer_button_release (GdkEventButton* ev)
-{
-       _resize_drag_start = -1;
-       return true;
+       return c;
 }
 
 void
-TimeAxisView::idle_resize (uint32_t h)
-{
-       set_height (h);
-}
-
-bool
-TimeAxisView::resizer_motion (GdkEventMotion* ev)
+TimeAxisView::build_size_menu ()
 {
-       if (_resize_drag_start < 0) {
-               return true;
+       if (_size_menu && _size_menu->gobj ()) {
+               return;
        }
 
-       int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
-       _editor.add_to_idle_resize (shared_from_this (), delta);
-       _resize_drag_start = ev->y_root;
+       delete _size_menu;
 
-       return true;
-}
+       using namespace Menu_Helpers;
 
-bool
-TimeAxisView::resizer_expose (GdkEventExpose* event)
-{
-       int w, h, x, y, d;
-       Glib::RefPtr<Gdk::Window> win (resizer.get_window());
-       Glib::RefPtr<Gdk::GC> dark (resizer.get_style()->get_fg_gc (STATE_NORMAL));
-       Glib::RefPtr<Gdk::GC> light (resizer.get_style()->get_bg_gc (STATE_NORMAL));
+       _size_menu = new Menu;
+       _size_menu->set_name ("ArdourContextMenu");
+       MenuList& items = _size_menu->items();
 
-       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);
+       items.push_back (MenuElem (_("Largest"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightLargest, true)));
+       items.push_back (MenuElem (_("Larger"),  sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightLarger, true)));
+       items.push_back (MenuElem (_("Large"),   sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightLarge, true)));
+       items.push_back (MenuElem (_("Normal"),  sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightNormal, true)));
+       items.push_back (MenuElem (_("Small"),   sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightSmall, true)));
+}
 
-       win->get_geometry (x, y, w, h, d);
+void
+TimeAxisView::reset_visual_state ()
+{
+       /* this method is not required to trigger a global redraw */
 
-       /* handle/line #1 */
+       string str = gui_property ("height");
        
-       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 */
-
-       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);
-
-       /* handle/line #3 */
-
-       win->draw_line (dark, 0, 8, w - 2, 8);
-       win->draw_point (dark, 0, 9);
-       win->draw_line (light, 1, 9, w - 1, 9);
-       win->draw_point (light, w - 1, 8);
-
-       return true;
+       if (!str.empty()) {
+               set_height (atoi (str));
+       } else {
+               set_height (preset_height (HeightNormal));
+       }
 }
 
-TimeAxisViewPtr
-TimeAxisView::find_time_axis (TimeAxisView* v)
+TrackViewList
+TrackViewList::filter_to_unique_playlists ()
 {
-       Children::iterator i = children.begin ();
-       while (i != children.end() && i->get() != v) {
-               ++i;
-       }
+       std::set<boost::shared_ptr<ARDOUR::Playlist> > playlists;
+       TrackViewList ts;
 
-       if (i == children.end()) {
-               return TimeAxisViewPtr ();
+       for (iterator i = begin(); i != end(); ++i) {
+               RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*i);
+               if (!rtav) {
+                       /* not a route: include it anyway */
+                       ts.push_back (*i);
+               } else {
+                       boost::shared_ptr<ARDOUR::Track> 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 *i;
+       return ts;
 }