update drobilla's fascistic dir-locals.el to force emacs users into whitespace submis...

[ardour.git] / gtk2_ardour / port_matrix_row_labels.cc

diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc
index 6528f31d76f075afb81cd56f527b540a5f61622f..94687448376b1b56bcf790cd480bf84cb18821c3 100644 (file)
--- a/gtk2_ardour/port_matrix_row_labels.cc
+++ b/gtk2_ardour/port_matrix_row_labels.cc
@@ -44,7 +44,6 @@ PortMatrixRowLabels::compute_dimensions ()
 
        _longest_port_name = 0;
        _longest_bundle_name = 0;
-       _height = 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.
@@ -55,27 +54,36 @@ PortMatrixRowLabels::compute_dimensions ()
                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 (_matrix->visible_rows()) * grid_spacing ();
+
+       if (_matrix->visible_rows()) {
+               _height = group_size (_matrix->visible_rows()) * grid_spacing ();
+       } else {
+               _height = 0;
+       }
 
        cairo_destroy (cr);
-       gdk_pixmap_unref (pm);
+       g_object_unref (pm);
 
        _width = _longest_bundle_name +
                name_pad() * 2;
@@ -104,12 +112,17 @@ PortMatrixRowLabels::render (cairo_t* cr)
        
        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);
+               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(); ++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));
+                       for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) {
+
+                               if (!_matrix->should_show ((*i)->bundle->channel_type(j))) {
+                                       continue;
+                               }
+                               
+                               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));
                                y += grid_spacing();
                                ++M;
                        }
@@ -124,7 +137,15 @@ PortMatrixRowLabels::render (cairo_t* cr)
 void
 PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint)
 {
-       ARDOUR::BundleChannel const w = position_to_channel (y, x, _matrix->visible_rows());
+       ARDOUR::BundleChannel w = position_to_channel (y, x, _matrix->visible_rows());
+
+       if (
+               (_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.channel = -1;
+       }
 
        if (b == 3) {
 
@@ -194,7 +215,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 (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);
@@ -227,7 +248,7 @@ PortMatrixRowLabels::render_channel_name (
        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 */
@@ -312,7 +333,12 @@ PortMatrixRowLabels::motion (double x, double y)
                        
                        list<PortMatrixNode> n;
                        
-                       for (uint32_t i = 0; i < w.bundle->nchannels(); ++i) {
+                       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 ()));
                        }