X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_row_labels.cc;h=de921a6cb71336c3cbc165ebd1cc18c5ceab7a9a;hb=04bf9d1e9594688db4a69c3660feef2efe23945b;hp=bc6e2a2fa19005f50259b81b5c23270402dbb065;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc
index bc6e2a2fa1..de921a6cb7 100644
--- a/gtk2_ardour/port_matrix_row_labels.cc
+++ b/gtk2_ardour/port_matrix_row_labels.cc
@@ -19,7 +19,8 @@
 
 #include <iostream>
 #include <boost/weak_ptr.hpp>
-#include <cairo/cairo.h>
+#include <cairo.h>
+#include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
 #include "port_matrix_row_labels.h"
 #include "port_matrix.h"
@@ -38,9 +39,8 @@ 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;
@@ -83,7 +83,7 @@ PortMatrixRowLabels::compute_dimensions ()
 	}
 
 	cairo_destroy (cr);
-	g_object_unref (pm);
+	cairo_surface_destroy (surface);
 
 	_width = _longest_bundle_name +
 		name_pad() * 2;
@@ -115,17 +115,23 @@ PortMatrixRowLabels::render (cairo_t* cr)
 		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()) {
-			for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) {
-
-				if (!_matrix->should_show ((*i)->bundle->channel_type(j))) {
-					continue;
-				}
-
+			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);
-				render_channel_name (cr, background_colour (), c, 0, y, ARDOUR::BundleChannel ((*i)->bundle, j));
+				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;
 			}
+
+			if (N == 0) {
+				y += grid_spacing ();
+			}
+			
 		} else {
 			y += grid_spacing();
 		}
@@ -135,7 +141,7 @@ PortMatrixRowLabels::render (cairo_t* cr)
 }
 
 void
-PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint)
+PortMatrixRowLabels::button_press (double x, double y, GdkEventButton* ev)
 {
 	ARDOUR::BundleChannel w = position_to_channel (y, x, _matrix->visible_rows());
 
@@ -147,12 +153,13 @@ PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint)
 			w.channel = -1;
 	}
 
-	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 (
 			ARDOUR::BundleChannel (),
 			w,
-			t
+			ev->time
 			);
 	}
 }
@@ -215,7 +222,7 @@ PortMatrixRowLabels::render_bundle_name (
 {
 	double const x = bundle_name_x ();
 
-	int const n = _matrix->show_only_bundles() ? 1 : _matrix->count_of_our_type (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);
@@ -244,15 +251,15 @@ 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 (_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 */
 
+		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;
+
 		set_source_rgb (cr, text_colour());
 		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());
@@ -304,7 +311,7 @@ PortMatrixRowLabels::mouseover_changed (list<PortMatrixNode> const &)
 		ARDOUR::BundleChannel c = i->column;
 		ARDOUR::BundleChannel r = i->row;
 
-		if (c.bundle && r.bundle) {
+		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);
@@ -334,8 +341,7 @@ PortMatrixRowLabels::motion (double x, double y)
 			list<PortMatrixNode> n;
 
 			for (uint32_t i = 0; i < w.bundle->nchannels().n_total(); ++i) {
-
-				if (!_matrix->should_show (w.bundle->channel_type(i))) {
+				if (!_matrix->should_show (w.bundle->channel_type (i))) {
 					continue;
 				}