Fix insane formatting (how did this even happen? copy paste from an email diff or something?).

git-svn-id: svn://localhost/ardour2/branches/3.0@4631 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 912 insertions, 911 deletions

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 8c56fb6585..be3c0655b8 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1,936 +1,937 @@
- /*
-     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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <cstdlib>
+#include <cmath>
+#include <algorithm>
+#include <string>
+#include <list>
+
+#include <libgnomecanvasmm.h>
+#include <libgnomecanvasmm/canvas.h>
+#include <libgnomecanvasmm/item.h>
+
+#include <pbd/error.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 "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 "i18n.h"
+
+using namespace Gtk;
+using namespace Gdk;
+using namespace sigc; 
+using namespace ARDOUR;
+using namespace PBD;
+using namespace Editing;
+using namespace ArdourCanvas;
+
+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;
+int const TimeAxisView::_max_order = 512;
+
+TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* 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;
+	}
+	_canvas_background = new Group (*ed.get_background_group (), 0.0, 0.0);
+	_canvas_display = new Group (*ed.get_trackview_group (), 0.0, 0.0);
+
+	selection_group = new Group (*_canvas_display);
+	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;
 
-     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
-     the Free Software Foundation; either version 2 of the License, or
-     (at your option) any later version.
+	/*
+	  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);
+
+	/* typically, either name_label OR name_entry are visible,
+	   but not both. its up to derived classes to show/hide them as they
+	   wish.
+	*/
+
+	name_hbox.show ();
+
+	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.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);
+
+	controls_hbox.pack_start (controls_ebox,true,true);
+	controls_hbox.show ();
+
+	// controls_frame.add (controls_hbox);
+	// controls_frame.set_name ("TimeAxisViewControlsBaseUnselected");
+	// controls_vbox.set_name ("TimeAxisViewControlsBaseUnselected");
+	// controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
+
+	ColorsChanged.connect (mem_fun (*this, &TimeAxisView::color_handler));
+}
 
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
+TimeAxisView::~TimeAxisView()
+{
+	in_destructor = true;
 
-     You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+	for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
+		delete *i;
+	}
 
- */
+	for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
+		delete (*i)->rect;
+		delete (*i)->start_trim;
+		delete (*i)->end_trim;
+
+	}
+
+	for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
+		delete (*i)->rect;
+		delete (*i)->start_trim;
+		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;
+
+	delete _canvas_background;
+	_canvas_background = 0;
+
+	delete _canvas_display;
+	_canvas_display = 0;
+
+	delete display_menu;
+	display_menu = 0;
+}
+
+/** Display this TimeAxisView as the nth component of the parent box, at y.
+*
+* @param y y position.
+* @param nth index for this TimeAxisView, increased if this view has children.
+* @param parent parent component.
+* @return height of this TimeAxisView.
+*/
+guint32
+TimeAxisView::show_at (double y, int& nth, VBox *parent)
+{
+	if (control_parent) {
+		control_parent->reorder_child (controls_hbox, nth);
+	} else {
+		control_parent = parent;
+		parent->pack_start (controls_hbox, false, false);
+		parent->reorder_child (controls_hbox, nth);
+	}
+
+	_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);
+		_y_position = y;
+
+	}
+
+	_canvas_background->raise_to_top ();
+	_canvas_display->raise_to_top ();
+
+	if (_marked_for_display) {
+		controls_hbox.show ();
+		controls_ebox.show ();
+		_canvas_background->show ();
+	}
 
- #include <cstdlib>
- #include <cmath>
- #include <algorithm>
- #include <string>
- #include <list>
-
- #include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/canvas.h>
- #include <libgnomecanvasmm/item.h>
-
- #include <pbd/error.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 "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 "i18n.h"
-
- using namespace Gtk;
- using namespace Gdk;
- using namespace sigc; 
- using namespace ARDOUR;
- using namespace PBD;
- using namespace Editing;
- using namespace ArdourCanvas;
-
- 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;
- int const TimeAxisView::_max_order = 512;
-
- TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* 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;
-	 }
-	 _canvas_background = new Group (*ed.get_background_group (), 0.0, 0.0);
-	 _canvas_display = new Group (*ed.get_trackview_group (), 0.0, 0.0);
-
-	 selection_group = new Group (*_canvas_display);
-	 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
+	_hidden = false;
+
+	_effective_height = current_height ();
+
+	/* now show children */
+
+	for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+		if (canvas_item_visible ((*i)->_canvas_display)) {
+			++nth;
+			_effective_height += (*i)->show_at (y + _effective_height, nth, 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)
+{
+	switch (ev->direction) {
+	case GDK_SCROLL_UP:
+		if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+			step_height (true);
+			return true;
+		} else if (Keyboard::no_modifiers_active (ev->state)) {
+			_editor.scroll_tracks_up_line();
+			return true;
+		}
+		break;
+
+	case GDK_SCROLL_DOWN:
+		if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+			step_height (false);
+			return true;
+		} else if (Keyboard::no_modifiers_active (ev->state)) {
+			_editor.scroll_tracks_down_line();
+			return true;
+		}
+		break;
+
+	default:
+		/* no handling for left/right, yet */
+		break;
+	}
+
+	return false;
+}
+
+bool
+TimeAxisView::controls_ebox_button_release (GdkEventButton* ev)
+{
+	switch (ev->button) {
+	case 1:
+		selection_click (ev);
+		break;
+
+	case 3:
+		popup_display_menu (ev->time);
+		break;
+	}
+
+	return true;
+}
+
+void
+TimeAxisView::selection_click (GdkEventButton* ev)
+{
+	Selection::Operation op = Keyboard::selection_type (ev->state);
+	_editor.set_selected_track (*this, op, false);
+}
+
+void
+TimeAxisView::hide ()
+{
+	if (_hidden) {
+		return;
+	}
+
+	_canvas_display->hide ();
+	_canvas_background->hide ();
+	controls_frame.hide ();
+
+	if (control_parent) {
+		control_parent->remove (controls_hbox);
+		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);
+
+	Hiding ();
+}
+
+void
+TimeAxisView::step_height (bool bigger)
+{
+	static const uint32_t step = 20;
+
+	if (bigger) {
+		set_height (height + step);
+	} else {
+		if (height > step) {
+			set_height (std::max (height - step, hSmall));
+		} else if (height != hSmall) {
+			set_height (hSmall);
+		}
+	}
+}
+
+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(uint32_t h)
+{
+	controls_ebox.property_height_request () = h;
+	height = h;
+
+	for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
+		(*i)->set_height ();
+	}
+
+	if (canvas_item_visible (selection_group)) {
+		/* resize the selection rect */
+		show_selection (_editor.get_selection().time);
+	}
+
+	reshow_feature_lines ();
+}
+
+bool
+TimeAxisView::name_entry_key_release (GdkEventKey* ev)
+{
+	PublicEditor::TrackViewList *allviews = 0;
+	PublicEditor::TrackViewList::iterator i;
+
+	switch (ev->keyval) {
+	case GDK_Escape:
+		name_entry.select_region (0,0);
+		controls_ebox.grab_focus ();
+		name_entry_changed ();
+		return true;
+
+	/* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually
+	 * 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 (0);
+		if (allviews != 0) {
+			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; }
+					} 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();
+		}
+		return true;
+
+	case GDK_Up:
+	case GDK_Down:
+		name_entry_changed ();
+		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)
+{
+	name_entry.select_region (0, -1);
+	name_entry.set_name ("EditorActiveTrackNameDisplay");
+	return false;
+}
+
+bool
+TimeAxisView::name_entry_focus_out (GdkEventFocus* ev)
+{
+	/* 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 */
+
+	name_entry_changed ();
+
+	return false;
+}
+
+bool
+TimeAxisView::name_entry_key_timed_out ()
+{
+	name_entry_activated();
+	return false;
+}
+
+void
+TimeAxisView::name_entry_activated ()
+{
+	controls_ebox.grab_focus();
+}
+
+void
+TimeAxisView::name_entry_changed ()
+{
+}
+
+bool
+TimeAxisView::name_entry_button_press (GdkEventButton *ev)
+{
+	if (ev->button == 3) {
+		return true;
+	}
+	return false;
+}
 
-	 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);
-
-	 /* typically, either name_label OR name_entry are visible,
-	    but not both. its up to derived classes to show/hide them as they
-	    wish.
+bool
+TimeAxisView::name_entry_button_release (GdkEventButton *ev)
+{
+	if (ev->button == 3) {
+		popup_display_menu (ev->time);
+		return true;
+	}
+	return false;
+}
+
+void
+TimeAxisView::conditionally_add_to_selection ()
+{
+	Selection& s (_editor.get_selection ());
+
+	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);
+}
+
+void
+TimeAxisView::set_selected (bool yn)
+{
+	if (yn == _selected) {
+		return;
+	}
+
+	Selectable::set_selected (yn);
+
+	if (_selected) {
+		controls_ebox.set_name (controls_base_selected_name);
+		controls_hbox.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);
+		controls_vbox.set_name (controls_base_unselected_name);
+		hide_selection ();
+
+		/* children will be set for the yn=true case. but when deselecting
+		   the editor only has a list of top-level trackviews, so we
+		   have to do this here.
+		*/
+
+		for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+			(*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
+TimeAxisView::build_display_menu ()
+{
+	using namespace Menu_Helpers;
+
+	display_menu = new Menu;
+	display_menu->set_name ("ArdourContextMenu");
+
+	// Just let implementing classes define what goes into the manu
+}
+
+void
+TimeAxisView::set_samples_per_unit (double spu)
+{
+	for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+		(*i)->set_samples_per_unit (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)
+{
+	for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+		(*i)->show_timestretch (start, end);
+	}
+}
+
+void
+TimeAxisView::hide_timestretch ()
+{
+	for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+		(*i)->hide_timestretch ();
+	}
+}
+
+void
+TimeAxisView::show_selection (TimeSelection& ts)
+{
+	double x1;
+	double x2;
+	double y2;
+	SelectionRect *rect;
+
+	for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+		(*i)->show_selection (ts);
+	}
+
+	if (canvas_item_visible (selection_group)) {
+		while (!used_selection_rects.empty()) {
+			free_selection_rects.push_front (used_selection_rects.front());
+			used_selection_rects.pop_front();
+			free_selection_rects.front()->rect->hide();
+			free_selection_rects.front()->start_trim->hide();
+			free_selection_rects.front()->end_trim->hide();
+		}
+		selection_group->hide();
+	}
+
+	selection_group->show();
+	selection_group->raise_to_top();
+
+	for (list<AudioRange>::iterator i = ts.begin(); i != ts.end(); ++i) {
+		nframes_t start, end, cnt;
+
+		start = (*i).start;
+		end = (*i).end;
+		cnt = end - start + 1;
+
+		rect = get_selection_rect ((*i).id);
+
+		x1 = _editor.frame_to_unit (start);
+		x2 = _editor.frame_to_unit (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;
+
+		// 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() = 1.0 + trim_handle_size;
+
+			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->start_trim->show();
+			rect->end_trim->show();
+		} else {
+			rect->start_trim->hide();
+			rect->end_trim->hide();
+		}
+
+		rect->rect->show ();
+		used_selection_rects.push_back (rect);
+	}
+}
+
+void
+TimeAxisView::reshow_selection (TimeSelection& ts)
+{
+	show_selection (ts);
+
+	for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+		(*i)->show_selection (ts);
+	}
+}
+
+void
+TimeAxisView::hide_selection ()
+{
+	if (canvas_item_visible (selection_group)) {
+		while (!used_selection_rects.empty()) {
+			free_selection_rects.push_front (used_selection_rects.front());
+			used_selection_rects.pop_front();
+			free_selection_rects.front()->rect->hide();
+			free_selection_rects.front()->start_trim->hide();
+			free_selection_rects.front()->end_trim->hide();
+		}
+		selection_group->hide();
+	}
+
+	for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+		(*i)->hide_selection ();
+	}
+}
+
+void
+TimeAxisView::order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top)
+{
+	/* find the selection rect this is for. we have the item corresponding to one
+	   of the trim handles.
 	 */
 
-	 name_hbox.show ();
+	for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
+		if ((*i)->start_trim == item || (*i)->end_trim == item) {
+
+			/* make one trim handle be "above" the other so that if they overlap,
+			   the top one is the one last used.
+			*/
+
+			(*i)->rect->raise_to_top ();
+			(put_start_on_top ? (*i)->start_trim : (*i)->end_trim)->raise_to_top ();
+			(put_start_on_top ? (*i)->end_trim : (*i)->start_trim)->raise_to_top ();
+
+			break;
+		}
+	}
+}
 
-	 controls_table.set_border_width (2);
-	 controls_table.set_row_spacings (0);
-	 controls_table.set_col_spacings (0);
-	 controls_table.set_homogeneous (true);
+SelectionRect *
+TimeAxisView::get_selection_rect (uint32_t id)
+{
+	SelectionRect *rect;
 
-	 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 ();
+	/* check to see if we already have a visible rect for this particular selection ID */
 
-	 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);
+	for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
+		if ((*i)->id == id) {
+			return (*i);
+		}
+	}
 
-	 resizer_box.pack_start (resizer, false, false);
-	 resizer.show ();
-	 resizer_box.show();
+	/* ditto for the free rect list */
 
-	 HSeparator* separator = manage (new HSeparator());
+	for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
+		if ((*i)->id == id) {
+			SelectionRect* ret = (*i);
+			free_selection_rects.erase (i);
+			return ret;
+		}
+	}
 
-	 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 ();
+	/* no existing matching rect, so go get a new one from the free list, or create one if there are none */
 
-	 //controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
-	 controls_ebox.add (controls_vbox);
-	 controls_ebox.add_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|SCROLL_MASK);
-	 controls_ebox.set_flags (CAN_FOCUS);
+	if (free_selection_rects.empty()) {
 
-	 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);
+		rect = new SelectionRect;
 
-	 controls_hbox.pack_start (controls_ebox,true,true);
-	 controls_hbox.show ();
+		rect->rect = new SimpleRect (*selection_group);
+		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();
 
-	 // controls_frame.add (controls_hbox);
-	 // controls_frame.set_name ("TimeAxisViewControlsBaseUnselected");
-	 // controls_vbox.set_name ("TimeAxisViewControlsBaseUnselected");
-	 // controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
+		rect->start_trim = new SimpleRect (*selection_group);
+		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();
 
-	 ColorsChanged.connect (mem_fun (*this, &TimeAxisView::color_handler));
- }
+		rect->end_trim = new SimpleRect (*selection_group);
+		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();
 
- TimeAxisView::~TimeAxisView()
- {
-	 in_destructor = true;
+		free_selection_rects.push_front (rect);
 
-	 for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
-		 delete *i;
-	 }
+		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));
+	} 
 
-	 for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
-		 delete (*i)->rect;
-		 delete (*i)->start_trim;
-		 delete (*i)->end_trim;
+	rect = free_selection_rects.front();
+	rect->id = id;
+	free_selection_rects.pop_front();
+	return rect;
+}
 
-	 }
+struct null_deleter { void operator()(void const *) const {} };
 
-	 for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
-		 delete (*i)->rect;
-		 delete (*i)->start_trim;
-		 delete (*i)->end_trim;
-	 }
+bool
+TimeAxisView::is_child (TimeAxisView* tav)
+{
+	return find (children.begin(), children.end(), boost::shared_ptr<TimeAxisView>(tav, null_deleter())) != children.end();
+}
 
-	 for (list<SimpleLine*>::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
-		 delete (*i);
-	 }
+void
+TimeAxisView::add_child (boost::shared_ptr<TimeAxisView> child)
+{
+	children.push_back (child);
+}
 
-	 delete selection_group;
-	 selection_group = 0;
+void
+TimeAxisView::remove_child (boost::shared_ptr<TimeAxisView> child)
+{
+	Children::iterator i;
 
-	 delete _canvas_background;
-	 _canvas_background = 0;
+	if ((i = find (children.begin(), children.end(), child)) != children.end()) {
+		children.erase (i);
+	}
+}
 
-	 delete _canvas_display;
-	 _canvas_display = 0;
+void
+TimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& result)
+{
+	return;
+}
 
-	 delete display_menu;
-	 display_menu = 0;
- }
+void
+TimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& result)
+{
+	return;
+}
 
-/** Display this TimeAxisView as the nth component of the parent box, at y.
- *
- * @param y y position.
- * @param nth index for this TimeAxisView, increased if this view has children.
- * @param parent parent component.
- * @return height of this TimeAxisView.
- */
- guint32
- TimeAxisView::show_at (double y, int& nth, VBox *parent)
- {
-	 if (control_parent) {
-		 control_parent->reorder_child (controls_hbox, nth);
-	 } else {	
-		 control_parent = parent;
-		 parent->pack_start (controls_hbox, false, false);
-		 parent->reorder_child (controls_hbox, nth);
-	 }
-
-	 _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);
-		 _y_position = y;
-
-	 }
-
-	 _canvas_background->raise_to_top ();
-	 _canvas_display->raise_to_top ();
-
-	 if (_marked_for_display) {
-		 controls_hbox.show ();
-		 controls_ebox.show ();
-		 _canvas_background->show ();
-	 }
-
-	 _hidden = false;
-
-	 _effective_height = current_height ();
-
-	 /* now show children */
-
-	 for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-		 if (canvas_item_visible ((*i)->_canvas_display)) {
-			 ++nth;
-			 _effective_height += (*i)->show_at (y + _effective_height, nth, 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)
- {
-	 switch (ev->direction) {
-	 case GDK_SCROLL_UP:
-		 if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-			 step_height (true);
-			 return true;
-		 } else if (Keyboard::no_modifiers_active (ev->state)) {
-			 _editor.scroll_tracks_up_line();
-			 return true;
-		 }
-		 break;
-
-	 case GDK_SCROLL_DOWN:
-		 if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-			 step_height (false);
-			 return true;
-		 } else if (Keyboard::no_modifiers_active (ev->state)) {
-			 _editor.scroll_tracks_down_line();
-			 return true;
-		 }
-		 break;
-
-	 default:
-		 /* no handling for left/right, yet */
-		 break;
-	 }
-
-	 return false;
- }
-
- bool
- TimeAxisView::controls_ebox_button_release (GdkEventButton* ev)
- {
-	 switch (ev->button) {
-	 case 1:
-		 selection_click (ev);
-		 break;
-
-	 case 3:
-		 popup_display_menu (ev->time);
-		 break;
-	 }
-
-	 return true;
- }
-
- void
- TimeAxisView::selection_click (GdkEventButton* ev)
- {
-	 Selection::Operation op = Keyboard::selection_type (ev->state);
-	 _editor.set_selected_track (*this, op, false);
- }
-
- void
- TimeAxisView::hide ()
- {
-	 if (_hidden) {
-		 return;
-	 }
-
-	 _canvas_display->hide ();
-	 _canvas_background->hide ();
-	 controls_frame.hide ();
-
-	 if (control_parent) {
-		 control_parent->remove (controls_hbox);
-		 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);
-
-	 Hiding ();
- }
-
- void
- TimeAxisView::step_height (bool bigger)
- {
-	 static const uint32_t step = 20;
-
-	 if (bigger) {
-		 set_height (height + step);
-	 } else {
-		 if (height > step) {
-			 set_height (std::max (height - step, hSmall));
-		 } else if (height != hSmall) {
-			 set_height (hSmall);
-		 }
-	 }
- }
-
- 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(uint32_t h)
- {
-	 controls_ebox.property_height_request () = h;
-	 height = h;
-
-	 for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
-		 (*i)->set_height ();
-	 }
-
-	 if (canvas_item_visible (selection_group)) {
-		 /* resize the selection rect */
-		 show_selection (_editor.get_selection().time);
-	 }
-
-	 reshow_feature_lines ();
- }
-
- bool
- TimeAxisView::name_entry_key_release (GdkEventKey* ev)
- {
-	 PublicEditor::TrackViewList *allviews = 0;
-	 PublicEditor::TrackViewList::iterator i;
-
-	 switch (ev->keyval) {
-	 case GDK_Escape:
-		 name_entry.select_region (0,0);
-		 controls_ebox.grab_focus ();
-		 name_entry_changed ();
-		 return true;
-
-	 /* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually
-	  * 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 (0);
-		 if (allviews != 0) {
-			 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; }
-					 } 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();
-		 }
-		 return true;
-
-	 case GDK_Up:
-	 case GDK_Down:
-		 name_entry_changed ();
-		 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)
- {
-	 name_entry.select_region (0, -1);
-	 name_entry.set_name ("EditorActiveTrackNameDisplay");
-	 return false;
- }
-
- bool
- TimeAxisView::name_entry_focus_out (GdkEventFocus* ev)
- {
-	 /* 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 */
-
-	 name_entry_changed ();
-
-	 return false;
- }
-
- bool
- TimeAxisView::name_entry_key_timed_out ()
- {
-	 name_entry_activated();
-	 return false;
- }
-
- void
- TimeAxisView::name_entry_activated ()
- {
-	 controls_ebox.grab_focus();
- }
-
- void
- 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)
- {
-	 if (ev->button == 3) {
-		 popup_display_menu (ev->time);
-		 return true;
-	 }
-	 return false;
- }
-
- void
- TimeAxisView::conditionally_add_to_selection ()
- {
-	 Selection& s (_editor.get_selection ());
-
-	 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);
- }
-
- void
- TimeAxisView::set_selected (bool yn)
- {
-	 if (yn == _selected) {
-		 return;
-	 }
-
-	 Selectable::set_selected (yn);
-
-	 if (_selected) {
-		 controls_ebox.set_name (controls_base_selected_name);
-		 controls_hbox.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);
-		 controls_vbox.set_name (controls_base_unselected_name);
-		 hide_selection ();
-
-		 /* children will be set for the yn=true case. but when deselecting
-		    the editor only has a list of top-level trackviews, so we
-		    have to do this here.
-		 */
-
-		 for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-			 (*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
- TimeAxisView::build_display_menu ()
- {
-	 using namespace Menu_Helpers;
-
-	 display_menu = new Menu;
-	 display_menu->set_name ("ArdourContextMenu");
-
-	 // Just let implementing classes define what goes into the manu
- }
-
- void
- TimeAxisView::set_samples_per_unit (double spu)
- {
-	 for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-		 (*i)->set_samples_per_unit (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)
- {
-	 for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-		 (*i)->show_timestretch (start, end);
-	 }
- }
-
- void
- TimeAxisView::hide_timestretch ()
- {
-	 for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-		 (*i)->hide_timestretch ();
-	 }
- }
-
- void
- TimeAxisView::show_selection (TimeSelection& ts)
- {
-	 double x1;
-	 double x2;
-	 double y2;
-	 SelectionRect *rect;
-
-	 for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-		 (*i)->show_selection (ts);
-	 }
-
-	 if (canvas_item_visible (selection_group)) {
-		 while (!used_selection_rects.empty()) {
-			 free_selection_rects.push_front (used_selection_rects.front());
-			 used_selection_rects.pop_front();
-			 free_selection_rects.front()->rect->hide();
-			 free_selection_rects.front()->start_trim->hide();
-			 free_selection_rects.front()->end_trim->hide();
-		 }
-		 selection_group->hide();
-	 }
-
-	 selection_group->show();
-	 selection_group->raise_to_top();
-
-	 for (list<AudioRange>::iterator i = ts.begin(); i != ts.end(); ++i) {
-		 nframes_t start, end, cnt;
-
-		 start = (*i).start;
-		 end = (*i).end;
-		 cnt = end - start + 1;
-
-		 rect = get_selection_rect ((*i).id);
-
-		 x1 = _editor.frame_to_unit (start);
-		 x2 = _editor.frame_to_unit (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;
-
-		 // 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() = 1.0 + trim_handle_size;
-
-			 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->start_trim->show();
-			 rect->end_trim->show();
-		 } else {
-			 rect->start_trim->hide();
-			 rect->end_trim->hide();
-		 }
-
-		 rect->rect->show ();
-		 used_selection_rects.push_back (rect);
-	 }
- }
-
- void
- TimeAxisView::reshow_selection (TimeSelection& ts)
- {
-	 show_selection (ts);
-
-	 for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-		 (*i)->show_selection (ts);
-	 }
- }
-
- void
- TimeAxisView::hide_selection ()
- {
-	 if (canvas_item_visible (selection_group)) {
-		 while (!used_selection_rects.empty()) {
-			 free_selection_rects.push_front (used_selection_rects.front());
-			 used_selection_rects.pop_front();
-			 free_selection_rects.front()->rect->hide();
-			 free_selection_rects.front()->start_trim->hide();
-			 free_selection_rects.front()->end_trim->hide();
-		 }
-		 selection_group->hide();
-	 }
-
-	 for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-		 (*i)->hide_selection ();
-	 }
- }
-
- void
- TimeAxisView::order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top)
- {
-	 /* find the selection rect this is for. we have the item corresponding to one
-	    of the trim handles.
-	  */
-
-	 for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
-		 if ((*i)->start_trim == item || (*i)->end_trim == item) {
-
-			 /* make one trim handle be "above" the other so that if they overlap,
-			    the top one is the one last used.
-			 */
-
-			 (*i)->rect->raise_to_top ();
-			 (put_start_on_top ? (*i)->start_trim : (*i)->end_trim)->raise_to_top ();
-			 (put_start_on_top ? (*i)->end_trim : (*i)->start_trim)->raise_to_top ();
-
-			 break;
-		 }
-	 }
- }
-
- SelectionRect *
- TimeAxisView::get_selection_rect (uint32_t id)
- {
-	 SelectionRect *rect;
-
-	 /* check to see if we already have a visible rect for this particular selection ID */
-
-	 for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
-		 if ((*i)->id == id) {
-			 return (*i);
-		 }
-	 }
-
-	 /* ditto for the free rect list */
-
-	 for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
-		 if ((*i)->id == id) {
-			 SelectionRect* ret = (*i);
-			 free_selection_rects.erase (i);
-			 return ret;
-		 }
-	 }
-
-	 /* no existing matching rect, so go get a new one from the free list, or create one if there are none */
-
-	 if (free_selection_rects.empty()) {
-
-		 rect = new SelectionRect;
-
-		 rect->rect = new SimpleRect (*selection_group);
-		 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_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_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 = free_selection_rects.front();
-	 rect->id = id;
-	 free_selection_rects.pop_front();
-	 return rect;
- }
-
- struct null_deleter { void operator()(void const *) const {} };
-
- bool
- TimeAxisView::is_child (TimeAxisView* tav)
- {
-	 return find (children.begin(), children.end(), boost::shared_ptr<TimeAxisView>(tav, null_deleter())) != children.end();
- }
-
- void
- TimeAxisView::add_child (boost::shared_ptr<TimeAxisView> child)
- {
-	 children.push_back (child);
- }
-
- void
- TimeAxisView::remove_child (boost::shared_ptr<TimeAxisView> child)
- {
-	 Children::iterator i;
-
-	 if ((i = find (children.begin(), children.end(), child)) != children.end()) {
-		 children.erase (i);
-	 }
- }
-
- void
- TimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& result)
- {
-	 return;
- }
-
- void
- TimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& result)
- {
-	 return;
- }
-
- void
- TimeAxisView::add_ghost (RegionView* rv) {
-	 GhostRegion* gr = rv->add_ghost (*this);
-
-	 if(gr) {
-		 ghosts.push_back(gr);
-		 gr->GoingAway.connect (mem_fun(*this, &TimeAxisView::erase_ghost));
-	 }
- }
-
- void
- TimeAxisView::remove_ghost (RegionView* rv) {
+void
+TimeAxisView::add_ghost (RegionView* rv)
+{
+	GhostRegion* gr = rv->add_ghost (*this);
+
+	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 (*this);
 }
 
@@ -954,8 +955,8 @@ bool
 TimeAxisView::touched (double top, double bot)
 {
 	/* remember: this is X Window - coordinate space starts in upper left and moves down.
-	   y_position is the "origin" or "top" of the track.
-	 */
+	  y_position is the "origin" or "top" of the track.
+	*/
 
 	double mybot = _y_position + current_height();
 	
@@ -988,7 +989,7 @@ TimeAxisView::get_parent_with_state ()
 	} 
 
 	return parent->get_parent_with_state ();
-}		
+}
 
 
 XMLNode&
@@ -1215,7 +1216,7 @@ TimeAxisView::covers_y_position (double y)
 			/* 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 */
+			  returns a too-high value */
 			if (l >= view()->layers ()) {
 				l = view()->layers() - 1;
 			}
@@ -1329,11 +1330,11 @@ TimeAxisView::resizer_expose (GdkEventExpose* event)
 	Glib::RefPtr<Gdk::GC> 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);
+			true,
+			event->area.x,
+			event->area.y,
+			event->area.width,
+			event->area.height);
 
 	win->get_geometry (x, y, w, h, d);