Various tweaks to the port matrix.
[ardour.git] / gtk2_ardour / port_matrix_row_labels.cc
index ded591278ec2b3f472d62a9cae7cb2d3f0422d2f..00806b36a52a095337f72ccbdd0c13caf3c2f3da 100644 (file)
@@ -27,6 +27,8 @@
 #include "i18n.h"
 #include "utils.h"
 
+using namespace std;
+
 PortMatrixRowLabels::PortMatrixRowLabels (PortMatrix* m, PortMatrixBody* b)
        : PortMatrixLabels (m, b)
 {
@@ -43,6 +45,7 @@ PortMatrixRowLabels::compute_dimensions ()
        _longest_port_name = 0;
        _longest_bundle_name = 0;
        _height = 0;
+
        PortGroup::BundleList const r = _matrix->rows()->bundles();
        for (PortGroup::BundleList::const_iterator i = r.begin(); i != r.end(); ++i) {
                for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) {
@@ -60,9 +63,9 @@ PortMatrixRowLabels::compute_dimensions ()
                }
 
                if (_matrix->show_only_bundles()) {
-                       _height += row_height ();
+                       _height += grid_spacing ();
                } else {
-                       _height += i->bundle->nchannels() * row_height();
+                       _height += i->bundle->nchannels() * grid_spacing();
                }
        }
 
@@ -74,6 +77,9 @@ PortMatrixRowLabels::compute_dimensions ()
                        if (ext.height > _highest_group_name) {
                                _highest_group_name = ext.height;
                        }
+               } else {
+                       /* add another grid_spacing for a tab for this hidden group */
+                       _height += grid_spacing ();
                }
        }
                        
@@ -113,28 +119,32 @@ PortMatrixRowLabels::render (cairo_t* cr)
        int g = 0;
        for (PortGroupList::List::const_iterator i = _matrix->rows()->begin(); i != _matrix->rows()->end(); ++i) {
 
-               if (!(*i)->visible() || (*i)->bundles().empty()) {
-                       continue;
-               }
-                       
                /* compute height of this group */
                double h = 0;
-               if (_matrix->show_only_bundles()) {
-                       h = (*i)->bundles().size() * row_height();
+               if (!(*i)->visible()) {
+                       h = grid_spacing ();
                } else {
-                       h = (*i)->total_channels () * row_height();
+                       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 */
-               std::string const upper = Glib::ustring ((*i)->name).uppercase ();
-               std::pair<std::string, double> display = fit_to_pixels (cr, upper, h);
-
+               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);
@@ -142,35 +152,41 @@ PortMatrixRowLabels::render (cairo_t* cr)
                cairo_rotate (cr, - M_PI / 2);
                cairo_show_text (cr, display.first.c_str());
                cairo_restore (cr);
-
+               
                y += h;
                ++g;
        }
 
-       /* BUNDLE NAMES */
+       /* BUNDLE AND PORT NAMES */
 
        y = 0;
        int N = 0;
-       PortGroup::BundleList const r = _matrix->rows()->bundles();
-       for (PortGroup::BundleList::const_iterator i = r.begin(); i != r.end(); ++i) {
-               render_bundle_name (cr, i->has_colour ? i->colour : get_a_bundle_colour (N), 0, y, i->bundle);
-               int const n = _matrix->show_only_bundles() ? 1 : i->bundle->nchannels();
-               y += row_height() * n;
-               ++N;
-       }
-       
-
-       /* PORT NAMES */
+       int M = 0;
+       for (PortGroupList::List::const_iterator i = _matrix->rows()->begin(); i != _matrix->rows()->end(); ++i) {
 
-        if (!_matrix->show_only_bundles()) {
-               y = 0;
-               N = 0;
-               for (PortGroup::BundleList::const_iterator i = r.begin(); i != r.end(); ++i) {
-                       for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) {
-                               render_channel_name (cr, i->has_colour ? i->colour : get_a_bundle_colour (N), 0, y, ARDOUR::BundleChannel (i->bundle, j));
-                               y += row_height();
+               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, 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, c, 0, y, ARDOUR::BundleChannel (j->bundle, k));
+                                               y += grid_spacing();
+                                               ++M;
+                                       }
+                               } else {
+                                       y += grid_spacing();
+                               }
+                               
+                               ++N;
                        }
-                       ++N;
+                       
+               } else {
+
+                       y += grid_spacing ();
                }
        }
 }
@@ -178,25 +194,35 @@ PortMatrixRowLabels::render (cairo_t* cr)
 void
 PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t)
 {
-       switch (b) {
-       case 1:
-               _body->highlight_associated_channels (_matrix->row_index(), y / row_height ());
-               break;
-       case 3:
-               maybe_popup_context_menu (x, y, t);
-               break;
-       }
-}
+       uint32_t const gw = (_highest_group_name + 2 * name_pad());
 
-void
-PortMatrixRowLabels::maybe_popup_context_menu (double x, double y, uint32_t t)
-{
-       if ( (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x > (_longest_bundle_name + name_pad() * 2)) ||
-            (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x < (_longest_port_name + name_pad() * 2))
+       pair<boost::shared_ptr<PortGroup>, ARDOUR::BundleChannel> w = position_to_group_and_channel (y / grid_spacing (), _matrix->rows());
+
+       if (
+               (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x < gw) ||
+               (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x > (_width - gw))
                ) {
 
-               _matrix->popup_channel_context_menu (_matrix->row_index(), y / row_height(), t);
-               
+               w.second.bundle.reset ();
+       }
+       
+       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) {
+
+               _matrix->popup_menu (
+                       make_pair (boost::shared_ptr<PortGroup> (), ARDOUR::BundleChannel ()),
+                       w,
+                       t
+                       );
        }
 }
 
@@ -264,19 +290,19 @@ PortMatrixRowLabels::render_bundle_name (
        
        int const n = _matrix->show_only_bundles() ? 1 : b->nchannels();
        set_source_rgb (cr, colour);
-       cairo_rectangle (cr, xoff + x, yoff, _longest_bundle_name + name_pad() * 2, row_height() * n);
+       cairo_rectangle (cr, xoff + x, yoff, _longest_bundle_name + name_pad() * 2, grid_spacing() * n);
        cairo_fill_preserve (cr);
        set_source_rgb (cr, background_colour());
        cairo_set_line_width (cr, label_border_width ());
        cairo_stroke (cr);
 
-       double const off = row_height() / 2;
+       double const off = grid_spacing() / 2;
 
 //     if ((*i)->nchannels () > 0 && !_matrix->show_only_bundles()) {
 //             /* use the extent of our first channel name so that the bundle name is vertically aligned with it */
 //             cairo_text_extents_t ext;
 //             cairo_text_extents (cr, (*i)->channel_name(0).c_str(), &ext);
-//             off = (row_height() - ext.height) / 2;
+//             off = (grid_spacing() - ext.height) / 2;
 //     }
 
        set_source_rgb (cr, text_colour());
@@ -290,7 +316,7 @@ PortMatrixRowLabels::render_channel_name (
        )
 {
        set_source_rgb (cr, colour);
-       cairo_rectangle (cr, port_name_x() + xoff, yoff, _longest_port_name + name_pad() * 2, row_height());
+       cairo_rectangle (cr, port_name_x() + xoff, yoff, _longest_port_name + name_pad() * 2, grid_spacing());
        cairo_fill_preserve (cr);
        set_source_rgb (cr, background_colour());
        cairo_set_line_width (cr, label_border_width ());
@@ -298,7 +324,7 @@ PortMatrixRowLabels::render_channel_name (
        
        cairo_text_extents_t ext;
        cairo_text_extents (cr, bc.bundle->channel_name(bc.channel).c_str(), &ext);
-       double const off = (row_height() - ext.height) / 2;
+       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);
@@ -314,23 +340,7 @@ PortMatrixRowLabels::channel_x (ARDOUR::BundleChannel const& bc) const
 double
 PortMatrixRowLabels::channel_y (ARDOUR::BundleChannel const& bc) const
 {
-       uint32_t n = 0;
-
-       PortGroup::BundleList::const_iterator i = _matrix->rows()->bundles().begin();
-       while (i != _matrix->rows()->bundles().end() && i->bundle != bc.bundle) {
-               if (_matrix->show_only_bundles()) {
-                       n += 1;
-               } else {
-                       n += i->bundle->nchannels ();
-               }
-               ++i;
-       }
-
-       if (!_matrix->show_only_bundles()) {
-               n += bc.channel;
-       }
-       
-       return n * row_height();
+       return channel_to_position (bc, _matrix->rows()) * grid_spacing ();
 }
 
 void
@@ -343,14 +353,14 @@ PortMatrixRowLabels::queue_draw_for (ARDOUR::BundleChannel const & bc)
                                component_to_parent_x (bundle_name_x()),
                                component_to_parent_y (channel_y (bc)),
                                _longest_bundle_name + name_pad() * 2,
-                               row_height()
+                               grid_spacing()
                                );
                } else {
                        _body->queue_draw_area (
                                component_to_parent_x (port_name_x()),
                                component_to_parent_y (channel_y (bc)),
                                _longest_port_name + name_pad() * 2,
-                               row_height()
+                               grid_spacing()
                                );
                }
        }