Fix dragging grid lines when you move the mouse outside of the grid during the drag.
[ardour.git] / gtk2_ardour / port_matrix_grid.cc
index 66bf09aaa72f56bc9f3e022936f1b9b2b3d0e6ea..c2af484e6c2f11501e081ef2779c01faca85020d 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2009 Paul Davis 
+    Copyright (C) 2002-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,22 +30,25 @@ using namespace std;
 PortMatrixGrid::PortMatrixGrid (PortMatrix* m, PortMatrixBody* b)
        : PortMatrixComponent (m, b),
          _dragging (false),
+         _drag_valid (false),
          _moved (false)
 {
-       
+
 }
 
 void
 PortMatrixGrid::compute_dimensions ()
 {
-       _width = 0;
-       for (PortGroupList::List::const_iterator i = _matrix->columns()->begin(); i != _matrix->columns()->end(); ++i) {
-               _width += group_size (*i) * grid_spacing ();
+       if (_matrix->visible_columns() == 0) {
+               _width = 0;
+       } else {
+               _width = group_size (_matrix->visible_columns()) * grid_spacing ();
        }
 
-       _height = 0;
-       for (PortGroupList::List::const_iterator i = _matrix->rows()->begin(); i != _matrix->rows()->end(); ++i) {
-               _height += group_size (*i) * grid_spacing ();
+       if (_matrix->visible_rows() == 0) {
+               _height = 0;
+       } else {
+               _height = group_size (_matrix->visible_rows()) * grid_spacing ();
        }
 }
 
@@ -57,113 +60,88 @@ PortMatrixGrid::render (cairo_t* cr)
        cairo_rectangle (cr, 0, 0, _width, _height);
        cairo_fill (cr);
 
-       uint32_t x = 0;
-       for (PortGroupList::List::const_iterator c = _matrix->columns()->begin(); c != _matrix->columns()->end(); ++c) {
-
-               uint32_t y = 0;
-               for (PortGroupList::List::const_iterator r = _matrix->rows()->begin(); r != _matrix->rows()->end(); ++r) {
-
-                       if ((*c)->visible() && (*r)->visible()) {
-                               render_group_pair (cr, *r, *c, x, y);
-                       }
-
-                       y += group_size (*r) * grid_spacing ();
-               }
+       PortGroup::BundleList const & row_bundles = _matrix->visible_rows()->bundles();
+       PortGroup::BundleList const & column_bundles = _matrix->visible_columns()->bundles();
 
-               x += group_size (*c) * grid_spacing ();
-       }
-}
-
-void
-PortMatrixGrid::render_group_pair (cairo_t* cr, boost::shared_ptr<const PortGroup> row, boost::shared_ptr<const PortGroup> column, uint32_t const x, uint32_t const y)
-{
-       PortGroup::BundleList const & row_bundles = row->bundles();
-       PortGroup::BundleList const & column_bundles = column->bundles();
-
-       /* unfortunately we need to compute the height of the row group here */
-       uint32_t height = group_size (row) * grid_spacing ();
-       
-       uint32_t tx = x;
+       uint32_t x = 0;
 
        /* VERTICAL GRID LINES */
-       
+
        set_source_rgb (cr, grid_colour());
        uint32_t N = 0;
-       
+
        for (PortGroup::BundleList::const_iterator i = column_bundles.begin(); i != column_bundles.end(); ++i) {
 
                cairo_set_line_width (cr, thick_grid_line_width());
-               cairo_move_to (cr, tx, y);
-               cairo_line_to (cr, tx, y + height);
+               cairo_move_to (cr, x, 0);
+               cairo_line_to (cr, x, _height);
                cairo_stroke (cr);
-               
+
                if (!_matrix->show_only_bundles()) {
                        cairo_set_line_width (cr, thin_grid_line_width());
                        for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) {
-                               tx += grid_spacing ();
-                               cairo_move_to (cr, tx, y);
-                               cairo_line_to (cr, tx, y + height);
+                               x += grid_spacing ();
+                               cairo_move_to (cr, x, 0);
+                               cairo_line_to (cr, x, _height);
                                cairo_stroke (cr);
                        }
-                       
+
                } else {
-                       
-                       tx += grid_spacing ();
-                       
+
+                       x += grid_spacing ();
+
                }
-               
+
                ++N;
        }
 
-       uint32_t const width = tx - x;
+       uint32_t y = 0;
 
-       uint32_t ty = y;
-       
        /* HORIZONTAL GRID LINES */
-       
+
        N = 0;
        for (PortGroup::BundleList::const_iterator i = row_bundles.begin(); i != row_bundles.end(); ++i) {
-               
+
                cairo_set_line_width (cr, thick_grid_line_width());
-               cairo_move_to (cr, x, ty);
-               cairo_line_to (cr, x + width, ty);
+               cairo_move_to (cr, 0, y);
+               cairo_line_to (cr, _width, y);
                cairo_stroke (cr);
-               
+
                if (!_matrix->show_only_bundles()) {
                        cairo_set_line_width (cr, thin_grid_line_width());
                        for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) {
-                               ty += grid_spacing ();
-                               cairo_move_to (cr, x, ty);
-                               cairo_line_to (cr, x + width, ty);
+                               y += grid_spacing ();
+                               cairo_move_to (cr, 0, y);
+                               cairo_line_to (cr, _width, y);
                                cairo_stroke (cr);
                        }
 
                } else {
 
-                       ty += grid_spacing ();
+                       y += grid_spacing ();
 
                }
-               
+
                ++N;
        }
-       
+
        /* ASSOCIATION INDICATORS */
 
-       uint32_t bx = x;
-       uint32_t by = y;
+       uint32_t bx = 0;
+       uint32_t by = 0;
 
        if (_matrix->show_only_bundles()) {
 
                for (PortGroup::BundleList::const_iterator i = column_bundles.begin(); i != column_bundles.end(); ++i) {
-                       by = y;
-                       
+                       by = 0;
+
                        for (PortGroup::BundleList::const_iterator j = row_bundles.begin(); j != row_bundles.end(); ++j) {
-                               
-                               PortMatrixNode::State s = bundle_to_bundle_state (i->bundle, j->bundle);
+
+                               PortMatrixNode::State s = get_association (PortMatrixNode (
+                                                                                  ARDOUR::BundleChannel (i->bundle, 0),
+                                                                                  ARDOUR::BundleChannel (j->bundle, 0)
+                                                                                  ));
                                switch (s) {
-                               case PortMatrixNode::UNKNOWN:
-                                       draw_unknown_indicator (cr, bx, by);
-                                       break;
                                case PortMatrixNode::ASSOCIATED:
                                        draw_association_indicator (cr, bx, by);
                                        break;
@@ -173,58 +151,54 @@ PortMatrixGrid::render_group_pair (cairo_t* cr, boost::shared_ptr<const PortGrou
                                default:
                                        break;
                                }
-                               
+
                                by += grid_spacing();
                        }
-                       
+
                        bx += grid_spacing();
-                       
+
                }
 
        } else {
 
                for (PortGroup::BundleList::const_iterator i = column_bundles.begin(); i != column_bundles.end(); ++i) {
-                       by = y;
-                       
+                       by = 0;
+
                        for (PortGroup::BundleList::const_iterator j = row_bundles.begin(); j != row_bundles.end(); ++j) {
-                               
-                               tx = bx;
+
+                               x = bx;
                                for (uint32_t k = 0; k < i->bundle->nchannels (); ++k) {
-                                       
-                                       ty = by;
+
+                                       y = by;
                                        for (uint32_t l = 0; l < j->bundle->nchannels (); ++l) {
-                                               
+
                                                ARDOUR::BundleChannel c[2];
                                                c[_matrix->column_index()] = ARDOUR::BundleChannel (i->bundle, k);
                                                c[_matrix->row_index()] = ARDOUR::BundleChannel (j->bundle, l);
-                                               
+
                                                PortMatrixNode::State const s = _matrix->get_state (c);
-                                               
+
                                                switch (s) {
                                                case PortMatrixNode::ASSOCIATED:
-                                                       draw_association_indicator (cr, tx, ty);
+                                                       draw_association_indicator (cr, x, y);
                                                        break;
-                                                       
-                                               case PortMatrixNode::UNKNOWN:
-                                                       draw_unknown_indicator (cr, tx, ty);
-                                                       break;
-                                                       
+
                                                case PortMatrixNode::NOT_ASSOCIATED:
                                                        break;
-                                                       
+
                                                default:
                                                        break;
                                                }
-                                               
-                                               ty += grid_spacing();
+
+                                               y += grid_spacing();
                                        }
-                                       
-                                       tx += grid_spacing();
+
+                                       x += grid_spacing();
                                }
-                               
+
                                by += j->bundle->nchannels () * grid_spacing();
                        }
-                       
+
                        bx += i->bundle->nchannels () * grid_spacing();
                }
        }
@@ -243,14 +217,14 @@ PortMatrixGrid::draw_association_indicator (cairo_t* cr, uint32_t x, uint32_t y,
                0,
                p * 2 * M_PI
                );
-       
+
        cairo_fill (cr);
 }
 
 void
-PortMatrixGrid::draw_unknown_indicator (cairo_t* cr, uint32_t x, uint32_t y)
+PortMatrixGrid::draw_empty_square (cairo_t* cr, uint32_t x, uint32_t y)
 {
-       set_source_rgba (cr, unknown_colour(), 0.5);
+       set_source_rgb (cr, background_colour());
        cairo_rectangle (
                cr,
                x + thick_grid_line_width(),
@@ -262,119 +236,156 @@ PortMatrixGrid::draw_unknown_indicator (cairo_t* cr, uint32_t x, uint32_t y)
 }
 
 PortMatrixNode
-PortMatrixGrid::position_to_node (uint32_t x, uint32_t y) const
+PortMatrixGrid::position_to_node (double x, double y) const
 {
        return PortMatrixNode (
-               position_to_group_and_channel (y, _matrix->rows()).second,
-               position_to_group_and_channel (x, _matrix->columns()).second
+               position_to_channel (y, x, _matrix->visible_rows()),
+               position_to_channel (x, y, _matrix->visible_columns())
                );
 }
 
 void
 PortMatrixGrid::button_press (double x, double y, int b, uint32_t t)
 {
+       ARDOUR::BundleChannel const px = position_to_channel (x, y, _matrix->visible_columns());
+       ARDOUR::BundleChannel const py = position_to_channel (y, x, _matrix->visible_rows());
+
        if (b == 1) {
 
                _dragging = true;
+               _drag_valid = (px.bundle && py.bundle);
+
                _moved = false;
                _drag_start_x = x / grid_spacing ();
                _drag_start_y = y / grid_spacing ();
 
        } else if (b == 3) {
 
-               _matrix->popup_menu (
-                       position_to_group_and_channel (x / grid_spacing(), _matrix->columns()),
-                       position_to_group_and_channel (y / grid_spacing(), _matrix->rows()), t);
-               
+               _matrix->popup_menu (px, py, t);
+
        }
 }
 
-void
-PortMatrixGrid::set_association (PortMatrixNode node)
+PortMatrixNode::State
+PortMatrixGrid::get_association (PortMatrixNode node) const
 {
        if (_matrix->show_only_bundles()) {
-                               
-               for (uint32_t i = 0; i < node.column.bundle->nchannels(); ++i) {
-                       for (uint32_t j = 0; j < node.row.bundle->nchannels(); ++j) {
-                               
+
+               bool have_off_diagonal_association = false;
+               bool have_diagonal_association = false;
+               bool have_diagonal_not_association = false;
+
+               for (uint32_t i = 0; i < node.row.bundle->nchannels (); ++i) {
+
+                       for (uint32_t j = 0; j < node.column.bundle->nchannels (); ++j) {
+
                                ARDOUR::BundleChannel c[2];
-                               c[_matrix->column_index()] = ARDOUR::BundleChannel (node.column.bundle, i);
-                               c[_matrix->row_index()] = ARDOUR::BundleChannel (node.row.bundle, j);
-                               _matrix->set_state (c, true);
+                               c[_matrix->column_index()] = ARDOUR::BundleChannel (node.row.bundle, i);
+                               c[_matrix->row_index()] = ARDOUR::BundleChannel (node.column.bundle, j);
+
+                               PortMatrixNode::State const s = _matrix->get_state (c);
+
+                               switch (s) {
+                               case PortMatrixNode::ASSOCIATED:
+                                       if (i == j) {
+                                               have_diagonal_association = true;
+                                       } else {
+                                               have_off_diagonal_association = true;
+                                       }
+                                       break;
+
+                               case PortMatrixNode::NOT_ASSOCIATED:
+                                       if (i == j) {
+                                               have_diagonal_not_association = true;
+                                       }
+                                       break;
+
+                               default:
+                                       break;
+                               }
                        }
                }
-               
-       } else {
-               
-               if (node.row.bundle && node.column.bundle) {
-                       
-                       ARDOUR::BundleChannel c[2];
-                       c[_matrix->row_index()] = node.row;
-                       c[_matrix->column_index()] = node.column;
-                       _matrix->set_state (c, true);
+
+               if (have_diagonal_association && !have_off_diagonal_association && !have_diagonal_not_association) {
+                       return PortMatrixNode::ASSOCIATED;
+               } else if (!have_diagonal_association && !have_off_diagonal_association) {
+                       return PortMatrixNode::NOT_ASSOCIATED;
                }
+
+               return PortMatrixNode::PARTIAL;
+
+       } else {
+
+               ARDOUR::BundleChannel c[2];
+               c[_matrix->column_index()] = node.column;
+               c[_matrix->row_index()] = node.row;
+               return _matrix->get_state (c);
+
        }
+
+       /* NOTREACHED */
+       return PortMatrixNode::NOT_ASSOCIATED;
 }
 
 void
-PortMatrixGrid::toggle_association (PortMatrixNode node)
+PortMatrixGrid::set_association (PortMatrixNode node, bool s)
 {
        if (_matrix->show_only_bundles()) {
-                               
-               PortMatrixNode::State const s = bundle_to_bundle_state (node.column.bundle, node.row.bundle);
-               
+
                for (uint32_t i = 0; i < node.column.bundle->nchannels(); ++i) {
                        for (uint32_t j = 0; j < node.row.bundle->nchannels(); ++j) {
-                               
+
                                ARDOUR::BundleChannel c[2];
                                c[_matrix->column_index()] = ARDOUR::BundleChannel (node.column.bundle, i);
                                c[_matrix->row_index()] = ARDOUR::BundleChannel (node.row.bundle, j);
-                               if (s == PortMatrixNode::NOT_ASSOCIATED || s == PortMatrixNode::PARTIAL) {
-                                       _matrix->set_state (c, i == j);
-                               } else {
-                                       _matrix->set_state (c, false);
-                               }
+                               _matrix->set_state (c, s && (i == j));
                        }
                }
-               
+
        } else {
-               
+
                if (node.row.bundle && node.column.bundle) {
-                       
+
                        ARDOUR::BundleChannel c[2];
                        c[_matrix->row_index()] = node.row;
                        c[_matrix->column_index()] = node.column;
-                       
-                       PortMatrixNode::State const s = _matrix->get_state (c);
-                       
-                       if (s == PortMatrixNode::ASSOCIATED || s == PortMatrixNode::NOT_ASSOCIATED) {
-                               bool const n = !(s == PortMatrixNode::ASSOCIATED);
-                               _matrix->set_state (c, n);
-                       }
-                       
+                       _matrix->set_state (c, s);
                }
        }
 }
 
 void
-PortMatrixGrid::button_release (double x, double y, int b, uint32_t t)
+PortMatrixGrid::button_release (double x, double y, int b, uint32_t /*t*/)
 {
        if (b == 1) {
 
-               if (_dragging && _moved) {
-
-                       list<PortMatrixNode> const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y);
-
-                       for (list<PortMatrixNode>::const_iterator i = p.begin(); i != p.end(); ++i) {
-                               set_association (*i);
+               if (x != -1) {
+                       
+                       if (_dragging && _moved) {
+                               
+                               if (_drag_valid) {
+                                       list<PortMatrixNode> const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y);
+                                       
+                                       if (!p.empty()) {
+                                               PortMatrixNode::State const s = get_association (p.front());
+                                               for (list<PortMatrixNode>::const_iterator i = p.begin(); i != p.end(); ++i) {
+                                                       set_association (*i, toggle_state (s));
+                                               }
+                                       }
+                               }
+                               
+                       } else {
+                               
+                               PortMatrixNode const n = position_to_node (x, y);
+                               if (n.row.bundle && n.column.bundle) {
+                                       PortMatrixNode::State const s = get_association (n);
+                                       set_association (n, toggle_state (s));
+                               }
                        }
 
-               } else {
-
-                       toggle_association (position_to_node (x / grid_spacing(), y / grid_spacing()));
+                       require_render ();
                }
-
-               require_render ();
+               
                _body->queue_draw ();
        }
 
@@ -388,33 +399,58 @@ PortMatrixGrid::draw_extra (cairo_t* cr)
        set_source_rgba (cr, mouseover_line_colour(), 0.3);
        cairo_set_line_width (cr, mouseover_line_width());
 
-       double const x = component_to_parent_x (channel_to_position (_body->mouseover().column, _matrix->columns()) * grid_spacing()) + grid_spacing() / 2;
-       double const y = component_to_parent_y (channel_to_position (_body->mouseover().row, _matrix->rows()) * grid_spacing()) + grid_spacing() / 2;
+       list<PortMatrixNode> const m = _body->mouseover ();
+
+       for (list<PortMatrixNode>::const_iterator i = m.begin(); i != m.end(); ++i) {
        
-       if (_body->mouseover().row.bundle) {
+               double const x = component_to_parent_x (channel_to_position (i->column, _matrix->visible_columns()) * grid_spacing()) + grid_spacing() / 2;
+               double const y = component_to_parent_y (channel_to_position (i->row, _matrix->visible_rows()) * grid_spacing()) + grid_spacing() / 2;
+
+               if (i->row.bundle && i->column.bundle) {
 
-               cairo_move_to (cr, x, y);
-               if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) {
-                       cairo_line_to (cr, component_to_parent_x (0), y);
-               } else if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) {
-                       cairo_line_to (cr, _parent_rectangle.get_x() + _parent_rectangle.get_width(), y);
+                       cairo_move_to (cr, x, y);
+                       if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) {
+                               cairo_line_to (cr, component_to_parent_x (0), y);
+                       } else if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) {
+                               cairo_line_to (cr, _parent_rectangle.get_x() + _parent_rectangle.get_width(), y);
+                       }
+                       cairo_stroke (cr);
+                       
+                       cairo_move_to (cr, x, y);
+                       if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) {
+                               cairo_line_to (cr, x, _parent_rectangle.get_y() + _parent_rectangle.get_height());
+                       } else if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) {
+                               cairo_line_to (cr, x, component_to_parent_y (0));
+                       }
+                       cairo_stroke (cr);
                }
-               cairo_stroke (cr);
        }
 
-       if (_body->mouseover().column.bundle) {
+       if (_dragging && _drag_valid && _moved) {
+
+               list<PortMatrixNode> const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y);
+
+               if (!p.empty()) {
 
-               cairo_move_to (cr, x, y);
-               if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) {
-                       cairo_line_to (cr, x, _parent_rectangle.get_y() + _parent_rectangle.get_height());
-               } else if (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT) {
-                       cairo_line_to (cr, x, component_to_parent_y (0));
+                       bool const s = toggle_state (get_association (p.front()));
+
+                       for (list<PortMatrixNode>::const_iterator i = p.begin(); i != p.end(); ++i) {
+                               if (s) {
+                                       draw_association_indicator (
+                                               cr,
+                                               component_to_parent_x (channel_to_position (i->column, _matrix->visible_columns()) * grid_spacing ()),
+                                               component_to_parent_y (channel_to_position (i->row, _matrix->visible_rows()) * grid_spacing ())
+                                               );
+                               } else {
+                                       draw_empty_square (
+                                               cr,
+                                               component_to_parent_x (channel_to_position (i->column, _matrix->visible_columns()) * grid_spacing ()),
+                                               component_to_parent_y (channel_to_position (i->row, _matrix->visible_rows()) * grid_spacing ())
+                                               );
+                               }
+                       }
                }
-               cairo_stroke (cr);
-       }
 
-       if (_dragging && _moved) {
-               
                set_source_rgba (cr, association_colour (), 0.3);
 
                cairo_move_to (
@@ -422,29 +458,20 @@ PortMatrixGrid::draw_extra (cairo_t* cr)
                        component_to_parent_x (_drag_start_x * grid_spacing() + grid_spacing() / 2),
                        component_to_parent_y (_drag_start_y * grid_spacing() + grid_spacing() / 2)
                        );
-               
+
                cairo_line_to (
                        cr,
                        component_to_parent_x (_drag_x * grid_spacing() + grid_spacing() / 2),
                        component_to_parent_y (_drag_y * grid_spacing() + grid_spacing() / 2)
                        );
-               
-               cairo_stroke (cr);
 
-               list<PortMatrixNode> const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y);
+               cairo_stroke (cr);
 
-               for (list<PortMatrixNode>::const_iterator i = p.begin(); i != p.end(); ++i) {
-                       draw_association_indicator (
-                               cr,
-                               component_to_parent_x (channel_to_position (i->column, _matrix->columns()) * grid_spacing ()),
-                               component_to_parent_y (channel_to_position (i->row, _matrix->rows()) * grid_spacing ())
-                               );
-               }
        }
 }
 
 void
-PortMatrixGrid::mouseover_changed (PortMatrixNode const& old)
+PortMatrixGrid::mouseover_changed (list<PortMatrixNode> const & old)
 {
        queue_draw_for (old);
        queue_draw_for (_body->mouseover());
@@ -453,7 +480,7 @@ PortMatrixGrid::mouseover_changed (PortMatrixNode const& old)
 void
 PortMatrixGrid::motion (double x, double y)
 {
-       _body->set_mouseover (position_to_node (x / grid_spacing(), y / grid_spacing()));
+       _body->set_mouseover (position_to_node (x, y));
 
        int const px = x / grid_spacing ();
        int const py = y / grid_spacing ();
@@ -462,7 +489,7 @@ PortMatrixGrid::motion (double x, double y)
                _moved = true;
        }
 
-       if (_dragging && _moved) {
+       if (_dragging && _drag_valid && _moved) {
                _drag_x = px;
                _drag_y = py;
                _body->queue_draw ();
@@ -470,29 +497,32 @@ PortMatrixGrid::motion (double x, double y)
 }
 
 void
-PortMatrixGrid::queue_draw_for (PortMatrixNode const &n)
+PortMatrixGrid::queue_draw_for (list<PortMatrixNode> const &n)
 {
-       if (n.row.bundle) {
-
-               double const y = channel_to_position (n.row, _matrix->rows()) * grid_spacing ();
-               _body->queue_draw_area (
-                       _parent_rectangle.get_x(),
-                       component_to_parent_y (y),
-                       _parent_rectangle.get_width(),
-                       grid_spacing()
-                       );
-       }
+       for (list<PortMatrixNode>::const_iterator i = n.begin(); i != n.end(); ++i) {
+               
+               if (i->row.bundle) {
+
+                       double const y = channel_to_position (i->row, _matrix->visible_rows()) * grid_spacing ();
+                       _body->queue_draw_area (
+                               _parent_rectangle.get_x(),
+                               component_to_parent_y (y),
+                               _parent_rectangle.get_width(),
+                               grid_spacing()
+                               );
+               }
 
-       if (n.column.bundle) {
+               if (i->column.bundle) {
 
-               double const x = channel_to_position (n.column, _matrix->columns()) * grid_spacing ();
-               
-               _body->queue_draw_area (
-                       component_to_parent_x (x),
-                       _parent_rectangle.get_y(),
-                       grid_spacing(),
-                       _parent_rectangle.get_height()
-                       );
+                       double const x = channel_to_position (i->column, _matrix->visible_columns()) * grid_spacing ();
+                       
+                       _body->queue_draw_area (
+                               component_to_parent_x (x),
+                               _parent_rectangle.get_y(),
+                               grid_spacing(),
+                               _parent_rectangle.get_height()
+                               );
+               }
        }
 }
 
@@ -520,60 +550,6 @@ PortMatrixGrid::parent_to_component_y (double y) const
        return y + _body->yoffset() - _parent_rectangle.get_y();
 }
 
-PortMatrixNode::State
-PortMatrixGrid::bundle_to_bundle_state (boost::shared_ptr<ARDOUR::Bundle> a, boost::shared_ptr<ARDOUR::Bundle> b) const
-{
-       bool have_unknown = false;
-       bool have_off_diagonal_association = false;
-       bool have_diagonal_association = false;
-       bool have_diagonal_not_association = false;
-                               
-       for (uint32_t i = 0; i < a->nchannels (); ++i) {
-                                       
-               for (uint32_t j = 0; j < b->nchannels (); ++j) {
-                                               
-                       ARDOUR::BundleChannel c[2];
-                       c[_matrix->column_index()] = ARDOUR::BundleChannel (a, i);
-                       c[_matrix->row_index()] = ARDOUR::BundleChannel (b, j);
-                       
-                       PortMatrixNode::State const s = _matrix->get_state (c);
-
-                       switch (s) {
-                       case PortMatrixNode::ASSOCIATED:
-                               if (i == j) {
-                                       have_diagonal_association = true;
-                               } else {
-                                       have_off_diagonal_association = true;
-                               }
-                               break;
-                               
-                       case PortMatrixNode::UNKNOWN:
-                               have_unknown = true;
-                               break;
-                               
-                       case PortMatrixNode::NOT_ASSOCIATED:
-                               if (i == j) {
-                                       have_diagonal_not_association = true;
-                               }
-                               break;
-
-                       default:
-                               break;
-                       }
-               }
-       }
-       
-       if (have_unknown) {
-               return PortMatrixNode::UNKNOWN;
-       } else if (have_diagonal_association && !have_off_diagonal_association && !have_diagonal_not_association) {
-               return PortMatrixNode::ASSOCIATED;
-       } else if (!have_diagonal_association && !have_off_diagonal_association) {
-               return PortMatrixNode::NOT_ASSOCIATED;
-       }
-
-       return PortMatrixNode::PARTIAL;
-}
-
 list<PortMatrixNode>
 PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const
 {
@@ -602,7 +578,7 @@ PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const
 
        int dx = x1 - x0;
        int dy = abs (y1 - y0);
-       
+
        double err = 0;
        double derr = double (dy) / dx;
 
@@ -611,9 +587,15 @@ PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const
 
        for (int x = x0; x <= x1; ++x) {
                if (steep) {
-                       p.push_back (position_to_node (y, x));
+                       PortMatrixNode n = position_to_node (y * grid_spacing (), x * grid_spacing ());
+                       if (n.row.bundle && n.column.bundle) {
+                               p.push_back (n);
+                       }
                } else {
-                       p.push_back (position_to_node (x, y));
+                       PortMatrixNode n = position_to_node (x * grid_spacing (), y * grid_spacing ());
+                       if (n.row.bundle && n.column.bundle) {
+                               p.push_back (n);
+                       }
                }
 
                err += derr;
@@ -626,3 +608,9 @@ PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const
 
        return p;
 }
+
+bool
+PortMatrixGrid::toggle_state (PortMatrixNode::State s) const
+{
+       return (s == PortMatrixNode::NOT_ASSOCIATED || s == PortMatrixNode::PARTIAL);
+}