X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=8d2276bfb9cd76ef3bdb264fdf4b8a9158489b09;hb=a366fba7d0933a8f2d97d95fefcbcdc9692d2117;hp=56dd2b746dc029ba4bb28e4123a4cf980b89dd41;hpb=3c3bceccf91ce622dffdfe7042e88bfa8a798d2e;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 56dd2b746d..8d2276bfb9 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -30,16 +30,12 @@
 #include "pbd/error.h"
 #include "pbd/convert.h"
 
+#include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.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"
@@ -54,6 +50,7 @@
 #include "utils.h"
 #include "streamview.h"
 #include "editor_drag.h"
+#include "editor.h"
 
 #include "i18n.h"
 
@@ -75,13 +72,26 @@ 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 ();
@@ -99,42 +109,20 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
 	_ghost_group->lower_to_bottom();
 	_ghost_group->show();
 
-	control_parent = 0;
-	display_menu = 0;
-	_hidden = false;
-	in_destructor = false;
-	height = 0;
-	_effective_height = 0;
-	parent = rent;
-	last_name_entry_key_press_event = 0;
-	name_packing = NamePackingBits (0);
-	_resize_drag_start = -1;
-
-	/*
-	  Create the standard LHS Controls
-	  We create the top-level container and name add the name label here,
-	  subclasses can add to the layout as required
-	*/
-
-	name_entry.set_name ("EditorTrackNameDisplay");
-	name_entry.signal_button_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_release));
-	name_entry.signal_button_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_button_press));
-	name_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_release));
-	name_entry.signal_activate().connect (sigc::mem_fun(*this, &TimeAxisView::name_entry_activated));
-	name_entry.signal_focus_in_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_in));
-	name_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out));
-	Gtkmm2ext::set_size_request_to_display_given_text (name_entry, N_("gTortnam"), 10, 10); // just represents a short name
-
 	name_label.set_name ("TrackLabel");
 	name_label.set_alignment (0.0, 0.5);
+	ARDOUR_UI::instance()->set_tip (name_label, _("Track/Bus name (double click to edit)"));
 
-	/* typically, either name_label OR name_entry are visible,
-	   but not both. its up to derived classes to show/hide them as they
-	   wish.
-	*/
+	Gtk::Entry* an_entry = new Gtk::Entry;
+	Gtk::Requisition req;
+	an_entry->size_request (req);
+	name_label.set_size_request (-1, req.height);
+	delete an_entry;
 
+	name_hbox.pack_start (name_label, true, true);
 	name_hbox.show ();
-
+	name_label.show ();
+	
 	controls_table.set_size_request (200);
 	controls_table.set_row_spacings (2);
 	controls_table.set_col_spacings (2);
@@ -177,7 +165,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
 
 	ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler));
 
-	GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&TimeAxisView::erase_ghost, this, _1), gui_context());
+	GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&TimeAxisView::erase_ghost, this, _1), gui_context());
 }
 
 TimeAxisView::~TimeAxisView()
@@ -323,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 (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 (false);
 			return true;
 		} else if (Keyboard::no_modifiers_active (ev->state)) {
 			_editor.scroll_tracks_up_line();
@@ -333,7 +326,12 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 
 	case GDK_SCROLL_DOWN:
 		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 (true);
 			return true;
 		} else if (Keyboard::no_modifiers_active (ev->state)) {
 			_editor.scroll_tracks_down_line();
@@ -352,6 +350,24 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 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;
 	}
@@ -380,7 +396,7 @@ TimeAxisView::controls_ebox_motion (GdkEventMotion* ev)
 		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);
+		_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);
@@ -445,6 +461,10 @@ TimeAxisView::controls_ebox_button_release (GdkEventButton* ev)
 		_resize_drag_start = -1;
 	}
 
+	if (!_ebox_release_can_act) {
+		return true;
+	}
+
 	switch (ev->button) {
 	case 1:
 		selection_click (ev);
@@ -495,16 +515,6 @@ TimeAxisView::step_height (bool coarser)
 	}
 }
 
-void
-TimeAxisView::set_heights (uint32_t h)
-{
-	TrackSelection& ts (_editor.get_selection().tracks);
-
-	for (TrackSelection::iterator i = ts.begin(); i != ts.end(); ++i) {
-		(*i)->set_height (h);
-	}
-}
-
 void
 TimeAxisView::set_height_enum (Height h, bool apply_to_selection)
 {
@@ -539,6 +549,20 @@ TimeAxisView::set_height (uint32_t h)
 	}
 }
 
+bool
+TimeAxisView::name_entry_key_press (GdkEventKey* ev)
+{
+	/* steal escape, tabs from GTK */
+
+	switch (ev->keyval) {
+	case GDK_Escape:
+	case GDK_ISO_Left_Tab:
+	case GDK_Tab:
+		return true;
+	}
+	return false;
+}
+
 bool
 TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 {
@@ -546,9 +570,7 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 
 	switch (ev->keyval) {
 	case GDK_Escape:
-		name_entry.select_region (0,0);
-		controls_ebox.grab_focus ();
-		name_entry_changed ();
+		end_name_edit (RESPONSE_CANCEL);
 		return true;
 
 	/* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually
@@ -556,130 +578,157 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev)
 	 * ev->state.
 	 */
 	case GDK_ISO_Left_Tab:
-	case GDK_Tab:
-	{
-		name_entry_changed ();
-		TrackViewList const & allviews = _editor.get_track_views ();
-		TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this);
-
-		if (ev->keyval == GDK_Tab) {
-			if (i != allviews.end()) {
-				do {
-					if (++i == allviews.end()) {
-						return true;
-					}
-
-					RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*>(*i);
-
-					if (rtav && rtav->route()->record_enabled()) {
-						continue;
-					}
-
-					if (!(*i)->hidden()) {
-						break;
-					}
-
-				} while (true);
-			}
-		} else {
-			if (i != allviews.begin()) {
-				do {
-					if (i == allviews.begin()) {
-						return true;
-					}
-
-					--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()) {
-			(*i)->name_entry.grab_focus();
-			_editor.ensure_time_axis_view_is_visible (**i);
-		}
-	}
-	return true;
-
-	case GDK_Up:
-	case GDK_Down:
-		name_entry_changed ();
+		end_name_edit (RESPONSE_APPLY);
 		return true;
 
+	case GDK_Tab:
+		end_name_edit (RESPONSE_ACCEPT);
+		return true;
 	default:
 		break;
 	}
 
-#ifdef TIMEOUT_NAME_EDIT
-	/* adapt the timeout to reflect the user's typing speed */
-
-	guint32 name_entry_timeout;
-
-	if (last_name_entry_key_press_event) {
-		/* timeout is 1/2 second or 5 times their current inter-char typing speed */
-		name_entry_timeout = std::max (500U, (5 * (ev->time - last_name_entry_key_press_event)));
-	} else {
-		/* start with a 1 second timeout */
-		name_entry_timeout = 1000;
-	}
-
-	last_name_entry_key_press_event = ev->time;
-
-	/* wait 1 seconds and if no more keys are pressed, act as if they pressed enter */
-
-	name_entry_key_timeout.disconnect();
-	name_entry_key_timeout = Glib::signal_timeout().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_timed_out), name_entry_timeout);
-#endif
-
 	return false;
 }
 
 bool
-TimeAxisView::name_entry_focus_in (GdkEventFocus*)
+TimeAxisView::name_entry_focus_out (GdkEventFocus*)
 {
-	name_entry.select_region (0, -1);
-	name_entry.set_state (STATE_SELECTED);
+	end_name_edit (RESPONSE_OK);
 	return false;
 }
 
-bool
-TimeAxisView::name_entry_focus_out (GdkEventFocus*)
+void
+TimeAxisView::begin_name_edit ()
 {
-	/* clean up */
-
-	last_name_entry_key_press_event = 0;
-	name_entry_key_timeout.disconnect ();
-	name_entry.select_region (0,0);
-	name_entry.set_state (STATE_NORMAL);
+	if (name_entry) {
+		return;
+	}
 
-	/* do the real stuff */
+	if (can_edit_name()) {
 
-	name_entry_changed ();
+		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));
 
-	return false;
-}
+		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
@@ -688,22 +737,9 @@ TimeAxisView::name_entry_changed ()
 }
 
 bool
-TimeAxisView::name_entry_button_press (GdkEventButton *ev)
-{
-	if (ev->button == 3) {
-		return true;
-	}
-	return false;
-}
-
-bool
-TimeAxisView::name_entry_button_release (GdkEventButton *ev)
+TimeAxisView::can_edit_name () const
 {
-	if (ev->button == 3) {
-		popup_display_menu (ev->time);
-		return true;
-	}
-	return false;
+	return true;
 }
 
 void
@@ -780,10 +816,10 @@ TimeAxisView::set_samples_per_unit (double spu)
 }
 
 void
-TimeAxisView::show_timestretch (framepos_t start, framepos_t end)
+TimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layers, int layer)
 {
 	for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-		(*i)->show_timestretch (start, end);
+		(*i)->show_timestretch (start, end, layers, layer);
 	}
 }
 
@@ -1119,46 +1155,6 @@ TimeAxisView::compute_heights ()
 	button_height = req.height;
 }
 
-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);
-	}
-}
-
 void
 TimeAxisView::color_handler ()
 {
@@ -1195,10 +1191,10 @@ TimeAxisView::color_handler ()
  * TimeAxisView is non-0 if this object covers y, or one of its children does.
  * If the covering object is a child axis, then the child is returned.
  * TimeAxisView is 0 otherwise.
- * Layer index is the layer number if the TimeAxisView is valid and is in stacked
- * region display mode, otherwise 0.
+ * Layer index is the layer number (possibly fractional) if the TimeAxisView is valid
+ * and is in stacked or expanded * region display mode, otherwise 0.
  */
-std::pair<TimeAxisView*, layer_t>
+std::pair<TimeAxisView*, double>
 TimeAxisView::covers_y_position (double y)
 {
 	if (hidden()) {
@@ -1208,15 +1204,30 @@ TimeAxisView::covers_y_position (double y)
 	if (_y_position <= y && y < (_y_position + height)) {
 
 		/* work out the layer index if appropriate */
-		layer_t l = 0;
-		if (layer_display () == Stacked && view ()) {
-			/* compute layer */
-			l = layer_t ((_y_position + height - y) / (view()->child_height ()));
-			/* clamp to max layers to be on the safe side; sometimes the above calculation
-			  returns a too-high value */
-			if (l >= view()->layers ()) {
-				l = view()->layers() - 1;
+		double l = 0;
+		switch (layer_display ()) {
+		case Overlaid:
+			break;
+		case Stacked:
+			if (view ()) {
+				/* compute layer */
+				l = layer_t ((_y_position + height - y) / (view()->child_height ()));
+				/* clamp to max layers to be on the safe side; sometimes the above calculation
+				   returns a too-high value */
+				if (l >= view()->layers ()) {
+					l = view()->layers() - 1;
+				}
+			}
+			break;
+		case Expanded:
+			if (view ()) {
+				int const n = floor ((_y_position + height - y) / (view()->child_height ()));
+				l = n * 0.5 - 0.5;
+				if (l >= (view()->layers() - 0.5)) {
+					l = view()->layers() - 0.5;
+				}
 			}
+			break;
 		}
 
 		return std::make_pair (this, l);
@@ -1239,13 +1250,13 @@ TimeAxisView::preset_height (Height h)
 {
 	switch (h) {
 	case HeightLargest:
-		return (button_height * 2) + extra_height + 250;
+		return (button_height * 2) + extra_height + 260;
 	case HeightLarger:
-		return (button_height * 2) + extra_height + 150;
+		return (button_height * 2) + extra_height + 160;
 	case HeightLarge:
-		return (button_height * 2) + extra_height + 50;
+		return (button_height * 2) + extra_height + 60;
 	case HeightNormal:
-		return (button_height * 2) + extra_height;
+		return (button_height * 2) + extra_height + 10;
 	case HeightSmall:
 		return button_height + extra_height;
 	}
@@ -1297,10 +1308,37 @@ TimeAxisView::reset_visual_state ()
 	/* this method is not required to trigger a global redraw */
 
 	string str = gui_property ("height");
-
+	
 	if (!str.empty()) {
 		set_height (atoi (str));
 	} else {
 		set_height (preset_height (HeightNormal));
 	}
 }
+
+TrackViewList
+TrackViewList::filter_to_unique_playlists ()
+{
+	std::set<boost::shared_ptr<ARDOUR::Playlist> > playlists;
+	TrackViewList ts;
+
+	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 ts;
+}