X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_row_labels.cc;h=c6b02eb488cc3ca85e298dc7baf070034172d61b;hb=bd80b2f144c012669b56c83821e137be655acfe4;hp=21efda897e34f7bbd20938ed0554cd47c652426b;hpb=dbb0b9ca4f82ea8e3829cfeb009b9746c3d6f0dc;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc
index 21efda897e..c6b02eb488 100644
--- a/gtk2_ardour/port_matrix_row_labels.cc
+++ b/gtk2_ardour/port_matrix_row_labels.cc
@@ -19,13 +19,15 @@
 
 #include <iostream>
 #include <boost/weak_ptr.hpp>
-#include <cairo/cairo.h>
+#include <cairo.h>
+#include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
+#include "canvas/colors.h"
+#include "utils.h"
 #include "port_matrix_row_labels.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"
-#include "i18n.h"
-#include "utils.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
@@ -38,50 +40,54 @@ PortMatrixRowLabels::PortMatrixRowLabels (PortMatrix* m, PortMatrixBody* b)
 void
 PortMatrixRowLabels::compute_dimensions ()
 {
-	GdkPixmap* pm = gdk_pixmap_new (NULL, 1, 1, 24);
-	gdk_drawable_set_colormap (pm, gdk_colormap_get_system());
-	cairo_t* cr = gdk_cairo_create (pm);
+	cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 200, 200);
+	cairo_t* cr = cairo_create (surface);
 
 	_longest_port_name = 0;
 	_longest_bundle_name = 0;
-	_height = 0;
-	_highest_group_name = 0;
+
+	/* Compute maximum dimensions using all port groups, so that we allow for the largest and hence
+	   we can change between visible groups without the size of the labels jumping around.
+	*/
 
 	for (PortGroupList::List::const_iterator i = _matrix->rows()->begin(); i != _matrix->rows()->end(); ++i) {
 
 		PortGroup::BundleList const r = (*i)->bundles ();
 		for (PortGroup::BundleList::const_iterator j = r.begin(); j != r.end(); ++j) {
 
-			for (uint32_t k = 0; k < j->bundle->nchannels(); ++k) {
+			for (uint32_t k = 0; k < (*j)->bundle->nchannels().n_total(); ++k) {
+
+				if (!_matrix->should_show ((*j)->bundle->channel_type(k))) {
+					continue;
+				}
+
 				cairo_text_extents_t ext;
-				cairo_text_extents (cr, j->bundle->channel_name(k).c_str(), &ext);
+				cairo_text_extents (cr, (*j)->bundle->channel_name(k).c_str(), &ext);
 				if (ext.width > _longest_port_name) {
 					_longest_port_name = ext.width;
 				}
 			}
 
 			cairo_text_extents_t ext;
-			cairo_text_extents (cr, j->bundle->name().c_str(), &ext);
+			cairo_text_extents (cr, (*j)->bundle->name().c_str(), &ext);
 			if (ext.width > _longest_bundle_name) {
 				_longest_bundle_name = ext.width;
 			}
 		}
+	}
 
-		_height += group_size (*i) * grid_spacing ();
 
-		cairo_text_extents_t ext;
-		cairo_text_extents (cr, (*i)->name.c_str(), &ext);
-		if (ext.height > _highest_group_name) {
-			_highest_group_name = ext.height;
-		}
+	if (_matrix->visible_rows()) {
+		_height = group_size (_matrix->visible_rows()) * grid_spacing ();
+	} else {
+		_height = 0;
 	}
 
 	cairo_destroy (cr);
-	gdk_pixmap_unref (pm);
+	cairo_surface_destroy (surface);
 
-	_width = _highest_group_name +
-		_longest_bundle_name +
-		name_pad() * 4;
+	_width = _longest_bundle_name +
+		name_pad() * 2;
 
 	if (!_matrix->show_only_bundles()) {
 		_width += _longest_port_name;
@@ -99,122 +105,62 @@ PortMatrixRowLabels::render (cairo_t* cr)
 	cairo_rectangle (cr, 0, 0, _width, _height);
 	cairo_fill (cr);
 
-	/* PORT GROUP NAMES */
-
-	double x = 0;
-	if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) {
-		x = 0;
-	} else {
-		x = _width - _highest_group_name - 2 * name_pad();
-	}
-
-	double y = 0;
-	int g = 0;
-	for (PortGroupList::List::const_iterator i = _matrix->rows()->begin(); i != _matrix->rows()->end(); ++i) {
-
-		/* compute height of this group */
-		double h = 0;
-		if (!(*i)->visible()) {
-			h = grid_spacing ();
-		} else {
-			if (_matrix->show_only_bundles()) {
-				h = (*i)->bundles().size() * grid_spacing();
-			} else {
-				h = (*i)->total_channels () * grid_spacing();
-			}
-		}
-
-		if (h == 0) {
-			continue;
-		}
-
-		/* rectangle */
-		set_source_rgb (cr, get_a_group_colour (g));
-		double const rw = _highest_group_name + 2 * name_pad();
-		cairo_rectangle (cr, x, y, rw, h);
-		cairo_fill (cr);
-
-		/* hence what abbreviation (or not) we need for the group name */
-		string const upper = Glib::ustring ((*i)->name).uppercase ();
-		pair<string, double> display = fit_to_pixels (cr, upper, h);
-
-		/* plot it */
-		set_source_rgb (cr, text_colour());
-		cairo_move_to (cr, x + rw - name_pad(), y + (h + display.second) / 2);
-		cairo_save (cr);
-		cairo_rotate (cr, - M_PI / 2);
-		cairo_show_text (cr, display.first.c_str());
-		cairo_restore (cr);
-
-		y += h;
-		++g;
-	}
-
 	/* BUNDLE AND PORT NAMES */
 
-	y = 0;
+	double y = 0;
 	int N = 0;
 	int M = 0;
-	for (PortGroupList::List::const_iterator i = _matrix->rows()->begin(); i != _matrix->rows()->end(); ++i) {
 
-		if ((*i)->visible ()) {
-
-			PortGroup::BundleList const & bundles = (*i)->bundles ();
-			for (PortGroup::BundleList::const_iterator j = bundles.begin(); j != bundles.end(); ++j) {
-				render_bundle_name (cr, background_colour (), j->has_colour ? j->colour : get_a_bundle_colour (N), 0, y, j->bundle);
-
-				if (!_matrix->show_only_bundles()) {
-					for (uint32_t k = 0; k < j->bundle->nchannels(); ++k) {
-						Gdk::Color c = j->has_colour ? j->colour : get_a_bundle_colour (M);
-						render_channel_name (cr, background_colour (), c, 0, y, ARDOUR::BundleChannel (j->bundle, k));
-						y += grid_spacing();
-						++M;
-					}
-				} else {
-					y += grid_spacing();
-				}
+	PortGroup::BundleList const & bundles = _matrix->visible_rows()->bundles ();
+	for (PortGroup::BundleList::const_iterator i = bundles.begin(); i != bundles.end(); ++i) {
+		render_bundle_name (cr, background_colour (), (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N), 0, y, (*i)->bundle);
+
+		if (!_matrix->show_only_bundles()) {
+			uint32_t const N = _matrix->count_of_our_type ((*i)->bundle->nchannels());
+			for (uint32_t j = 0; j < N; ++j) {
+				Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (M);
+				ARDOUR::BundleChannel bc (
+					(*i)->bundle,
+					(*i)->bundle->type_channel_to_overall (_matrix->type (), j)
+					);
+
+				render_channel_name (cr, background_colour (), c, 0, y, bc);
+				y += grid_spacing();
+				++M;
+			}
 
-				++N;
+			if (N == 0) {
+				y += grid_spacing ();
 			}
 
 		} else {
-
-			y += grid_spacing ();
+			y += grid_spacing();
 		}
+
+		++N;
 	}
 }
 
 void
-PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t)
+PortMatrixRowLabels::button_press (double x, double y, GdkEventButton* ev)
 {
-	uint32_t const gw = (_highest_group_name + 2 * name_pad());
-
-	pair<boost::shared_ptr<PortGroup>, ARDOUR::BundleChannel> w = position_to_group_and_channel (y / grid_spacing (), _matrix->rows());
+	ARDOUR::BundleChannel w = position_to_channel (y, x, _matrix->visible_rows());
 
 	if (
-		(_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x < gw) ||
-		(_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x > (_width - gw))
-		) {
+		(_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x > (_longest_port_name + name_pad() * 2)) ||
+		(_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x < (_longest_bundle_name + name_pad() * 2))
 
-		w.second.bundle.reset ();
+		) {
+			w.channel = -1;
 	}
 
-	if (b == 1) {
-
-		if (w.second.bundle) {
-			_body->highlight_associated_channels (_matrix->row_index(), w.second);
-		} else {
-			if (w.first) {
-				w.first->set_visible (!w.first->visible());
-			}
-		}
-
-	} else if (b == 3) {
-
+	if (Gtkmm2ext::Keyboard::is_delete_event (ev) && w.channel != -1) {
+		_matrix->remove_channel (w);
+	} else if (ev->button == 3) {
 		_matrix->popup_menu (
-			make_pair (boost::shared_ptr<PortGroup> (), ARDOUR::BundleChannel ()),
+			ARDOUR::BundleChannel (),
 			w,
-			t
+			ev->time
 			);
 	}
 }
@@ -222,12 +168,14 @@ PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t)
 double
 PortMatrixRowLabels::component_to_parent_x (double x) const
 {
+	/* Row labels don't scroll horizontally, so x conversion does not depend on xoffset */
 	return x + _parent_rectangle.get_x();
 }
 
 double
 PortMatrixRowLabels::parent_to_component_x (double x) const
 {
+	/* Row labels don't scroll horizontally, so x conversion does not depend on xoffset */
 	return x - _parent_rectangle.get_x();
 }
 
@@ -249,14 +197,8 @@ PortMatrixRowLabels::bundle_name_x () const
 {
 	double x = 0;
 
-	if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) {
-		x = _highest_group_name + 2 * name_pad();
-	} else {
-		if (_matrix->show_only_bundles()) {
-			x = 0;
-		} else {
-			x = _longest_port_name + name_pad() * 2;
-		}
+	if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && !_matrix->show_only_bundles ()) {
+		x = _longest_port_name + name_pad() * 2;
 	}
 
 	return x;
@@ -266,7 +208,7 @@ double
 PortMatrixRowLabels::port_name_x () const
 {
 	if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) {
-		return _longest_bundle_name + _highest_group_name + name_pad() * 4;
+		return _longest_bundle_name + name_pad() * 2;
 	} else {
 		return 0;
 	}
@@ -281,7 +223,7 @@ PortMatrixRowLabels::render_bundle_name (
 {
 	double const x = bundle_name_x ();
 
-	int const n = _matrix->show_only_bundles() ? 1 : b->nchannels();
+	int const n = _matrix->show_only_bundles() ? 1 : _matrix->count_of_our_type_min_1 (b->nchannels());
 	set_source_rgb (cr, bg_colour);
 	cairo_rectangle (cr, xoff + x, yoff, _longest_bundle_name + name_pad() * 2, grid_spacing() * n);
 	cairo_fill_preserve (cr);
@@ -289,9 +231,13 @@ PortMatrixRowLabels::render_bundle_name (
 	cairo_set_line_width (cr, label_border_width ());
 	cairo_stroke (cr);
 
-	double const off = grid_spacing() / 2;
+	cairo_text_extents_t ext;
+	cairo_text_extents (cr, b->name().c_str(), &ext);
+	double const off = (grid_spacing() - ext.height) / 2;
 
- 	set_source_rgb (cr, text_colour());
+	Gdk::Color textcolor;
+	ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
+	set_source_rgb (cr, textcolor);
  	cairo_move_to (cr, xoff + x + name_pad(), yoff + name_pad() + off);
  	cairo_show_text (cr, b->name().c_str());
 }
@@ -308,16 +254,18 @@ PortMatrixRowLabels::render_channel_name (
 	cairo_set_line_width (cr, label_border_width ());
 	cairo_stroke (cr);
 
-	cairo_text_extents_t ext;
-	cairo_text_extents (cr, bc.bundle->channel_name(bc.channel).c_str(), &ext);
-	double const off = (grid_spacing() - ext.height) / 2;
-
-	if (bc.bundle->nchannels() > 1) {
+	if (_matrix->count_of_our_type (bc.bundle->nchannels()) > 1) {
 
 		/* only plot the name if the bundle has more than one channel;
 		   the name of a single channel is assumed to be redundant */
-		
-		set_source_rgb (cr, text_colour());
+
+		cairo_text_extents_t ext;
+		cairo_text_extents (cr, bc.bundle->channel_name(bc.channel).c_str(), &ext);
+		double const off = (grid_spacing() - ext.height) / 2;
+
+		Gdk::Color textcolor;
+		ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, ArdourCanvas::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour)));
+		set_source_rgb (cr, textcolor);
 		cairo_move_to (cr, port_name_x() + xoff + name_pad(), yoff + name_pad() + off);
 		cairo_show_text (cr, bc.bundle->channel_name(bc.channel).c_str());
 	}
@@ -332,7 +280,7 @@ PortMatrixRowLabels::channel_x (ARDOUR::BundleChannel const &) const
 double
 PortMatrixRowLabels::channel_y (ARDOUR::BundleChannel const& bc) const
 {
-	return channel_to_position (bc, _matrix->rows()) * grid_spacing ();
+	return channel_to_position (bc, _matrix->visible_rows()) * grid_spacing ();
 }
 
 void
@@ -360,10 +308,67 @@ PortMatrixRowLabels::queue_draw_for (ARDOUR::BundleChannel const & bc)
 }
 
 void
-PortMatrixRowLabels::mouseover_changed (PortMatrixNode const &)
+PortMatrixRowLabels::mouseover_changed (list<PortMatrixNode> const &)
 {
-	clear_channel_highlights ();
-	if (_body->mouseover().column.bundle && _body->mouseover().row.bundle) {
-		add_channel_highlight (_body->mouseover().row);
+	list<PortMatrixNode> const m = _body->mouseover ();
+	for (list<PortMatrixNode>::const_iterator i = m.begin(); i != m.end(); ++i) {
+
+		ARDOUR::BundleChannel c = i->column;
+		ARDOUR::BundleChannel r = i->row;
+
+		if (PortMatrix::bundle_with_channels (c.bundle) && PortMatrix::bundle_with_channels (r.bundle)) {
+			add_channel_highlight (r);
+		} else if (r.bundle) {
+			_body->highlight_associated_channels (_matrix->row_index(), r);
+		}
+	}
+}
+
+void
+PortMatrixRowLabels::motion (double x, double y)
+{
+	ARDOUR::BundleChannel const w = position_to_channel (y, x, _matrix->visible_rows());
+
+	uint32_t const bw = _longest_bundle_name + 2 * name_pad();
+
+	bool done = false;
+
+	if (w.bundle) {
+
+		if (
+			(_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x < bw) ||
+			(_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x > (_width - bw) && x < _width)
+
+			) {
+
+			/* if the mouse is over a bundle name, highlight all channels in the bundle */
+
+			list<PortMatrixNode> n;
+
+			for (uint32_t i = 0; i < w.bundle->nchannels().n_total(); ++i) {
+				if (!_matrix->should_show (w.bundle->channel_type (i))) {
+					continue;
+				}
+
+				ARDOUR::BundleChannel const bc (w.bundle, i);
+				n.push_back (PortMatrixNode (bc, ARDOUR::BundleChannel ()));
+			}
+
+			_body->set_mouseover (n);
+			done = true;
+
+		} else if (x < _width) {
+
+			_body->set_mouseover (PortMatrixNode (w, ARDOUR::BundleChannel ()));
+			done = true;
+
+		}
+
+	}
+
+	if (!done) {
+		/* not over any bundle */
+		_body->set_mouseover (PortMatrixNode ());
+		return;
 	}
 }