Optimize automation-event process splitting
[ardour.git] / gtk2_ardour / port_matrix_grid.cc
index b6be4165a9a03e7ea8066fbdb1b65c658573b717..77995489a313a407aea439a1112337d551877705 100644 (file)
 */
 
 #include <iostream>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include "ardour/bundle.h"
-#include "ardour/types.h"
 #include "port_matrix_grid.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"
+#include "keyboard.h"
 
 using namespace std;
+using Gtkmm2ext::Keyboard;
 
 PortMatrixGrid::PortMatrixGrid (PortMatrix* m, PortMatrixBody* b)
        : PortMatrixComponent (m, b),
@@ -39,15 +40,16 @@ PortMatrixGrid::PortMatrixGrid (PortMatrix* m, PortMatrixBody* b)
 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()) {
+               _width = group_size (_matrix->visible_columns()) * grid_spacing ();
+       } else {
+               _width = 0;
        }
 
-       _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()) {
+               _height = group_size (_matrix->visible_rows()) * grid_spacing ();
+       } else {
+               _height = 0;
        }
 }
 
@@ -59,33 +61,10 @@ 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 */
 
@@ -95,31 +74,35 @@ PortMatrixGrid::render_group_pair (cairo_t* cr, boost::shared_ptr<const PortGrou
        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);
+                       for (uint32_t j = 0; j < _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()); ++j) {
+                               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;
+       if (_matrix->show_only_bundles ()) {
+               cairo_move_to (cr, x, 0);
+               cairo_line_to (cr, x, _height);
+               cairo_stroke (cr);
+       }
 
-       uint32_t ty = y;
+       uint32_t y = 0;
 
        /* HORIZONTAL GRID LINES */
 
@@ -127,43 +110,53 @@ PortMatrixGrid::render_group_pair (cairo_t* cr, boost::shared_ptr<const PortGrou
        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);
+                       for (uint32_t j = 0; j < _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()); ++j) {
+                               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 */
+       if (_matrix->show_only_bundles ()) {
+               cairo_move_to (cr, 0, y);
+               cairo_line_to (cr, _width, y);
+               cairo_stroke (cr);
+       }
 
-       uint32_t bx = x;
-       uint32_t by = y;
+       /* ASSOCIATION INDICATORS and NON-CONNECTABLE INDICATORS */
+
+       /* we draw a grey square in a matrix box if the two ports that intersect at that box
+          cannot be connected because they are of different types (MIDI vs. audio)
+       */
+
+       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 = get_association (PortMatrixNode (
-                                                                                  ARDOUR::BundleChannel (i->bundle, 0),
-                                                                                  ARDOUR::BundleChannel (j->bundle, 0)
+                               PortMatrixNode::State s = _matrix->get_association (PortMatrixNode (
+                                                                                  ARDOUR::BundleChannel ((*j)->bundle, 0),
+                                                                                  ARDOUR::BundleChannel ((*i)->bundle, 0)
                                                                                   ));
                                switch (s) {
                                case PortMatrixNode::ASSOCIATED:
@@ -186,44 +179,76 @@ PortMatrixGrid::render_group_pair (cairo_t* cr, boost::shared_ptr<const PortGrou
        } 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;
-                               for (uint32_t k = 0; k < i->bundle->nchannels (); ++k) {
+                               x = bx;
+                               for (uint32_t k = 0; k < _matrix->count_of_our_type ((*i)->bundle->nchannels()); ++k) {
 
-                                       ty = by;
-                                       for (uint32_t l = 0; l < j->bundle->nchannels (); ++l) {
+                                       y = by;
+                                       for (uint32_t l = 0; l < _matrix->count_of_our_type ((*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);
+                                               c[_matrix->column_index()] = ARDOUR::BundleChannel (
+                                                       (*i)->bundle,
+                                                       (*i)->bundle->type_channel_to_overall (_matrix->type (), k)
+                                                       );
+
+                                               c[_matrix->row_index()] = ARDOUR::BundleChannel (
+                                                       (*j)->bundle,
+                                                       (*j)->bundle->type_channel_to_overall (_matrix->type (), l)
+                                                       );
+
+                                               if (c[0].bundle->channel_type (c[0].channel) != c[1].bundle->channel_type (c[1].channel)) {
+                                                       /* these two channels are of different types */
+                                                       draw_non_connectable_indicator (cr, x, y);
+                                               } else {
+                                                       /* these two channels might be associated */
+                                                       PortMatrixNode::State const s = _matrix->get_state (c);
+
+                                                       switch (s) {
+                                                       case PortMatrixNode::ASSOCIATED:
+                                                               draw_association_indicator (cr, x, y);
+                                                               break;
+
+                                                       case PortMatrixNode::NOT_ASSOCIATED:
+                                                               break;
+
+                                                       default:
+                                                               break;
+                                                       }
+                                               }
 
-                                               switch (s) {
-                                               case PortMatrixNode::ASSOCIATED:
-                                                       draw_association_indicator (cr, tx, ty);
-                                                       break;
+                                               y += grid_spacing();
+                                       }
 
-                                               case PortMatrixNode::NOT_ASSOCIATED:
-                                                       break;
+                                       if (_matrix->count_of_our_type ((*j)->bundle->nchannels()) == 0) {
+                                               /* the *j bundle has no channels of our type, so it will have a dummy
+                                                  one which needs to be marked non-connectable.
+                                               */
+                                               draw_non_connectable_indicator (cr, x, y);
+                                       }
 
-                                               default:
-                                                       break;
-                                               }
+                                       x += grid_spacing();
+                               }
 
-                                               ty += grid_spacing();
+                               if (_matrix->count_of_our_type ((*i)->bundle->nchannels()) == 0) {
+                                       /* draw non-connectable indicators for the case where the *i bundle
+                                          has no channels of our type (and hence has 1 dummy channel)
+                                       */
+                                       y = by;
+                                       for (uint32_t l = 0; l < _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()); ++l) {
+                                               draw_non_connectable_indicator (cr, x, y);
+                                               y += grid_spacing ();
                                        }
-
-                                       tx += grid_spacing();
                                }
 
-                               by += j->bundle->nchannels () * grid_spacing();
+                               by += _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()) * grid_spacing();
                        }
 
-                       bx += i->bundle->nchannels () * grid_spacing();
+                       bx += _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()) * grid_spacing();
                }
        }
 }
@@ -259,106 +284,65 @@ PortMatrixGrid::draw_empty_square (cairo_t* cr, uint32_t x, uint32_t y)
        cairo_fill (cr);
 }
 
+/** Draw a square to indicate that two channels in a matrix cannot be associated
+ *  with each other.
+ */
+void
+PortMatrixGrid::draw_non_connectable_indicator (cairo_t* cr, uint32_t x, uint32_t y)
+{
+       set_source_rgb (cr, non_connectable_colour ());
+       cairo_rectangle (
+               cr,
+               x + thick_grid_line_width(),
+               y + thick_grid_line_width(),
+               grid_spacing() - 2 * thick_grid_line_width(),
+               grid_spacing() - 2 * thick_grid_line_width()
+               );
+       cairo_fill (cr);
+}
+
 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)
+PortMatrixGrid::button_press (double x, double y, GdkEventButton* ev)
 {
-       pair<boost::shared_ptr<PortGroup>, ARDOUR::BundleChannel> px = position_to_group_and_channel (x / grid_spacing(), _matrix->columns());
-       pair<boost::shared_ptr<PortGroup>, ARDOUR::BundleChannel> py = position_to_group_and_channel (y / grid_spacing(), _matrix->rows());
+       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) {
+       if (ev->button == 1) {
 
                _dragging = true;
-               _drag_valid = (px.second.bundle && py.second.bundle);
+               _drag_valid = (px.bundle && py.bundle);
 
                _moved = false;
                _drag_start_x = x / grid_spacing ();
                _drag_start_y = y / grid_spacing ();
 
-       } else if (b == 3) {
+       } else if (ev->button == 3) {
 
-               _matrix->popup_menu (px, py, t);
+               _matrix->popup_menu (px, py, ev->time);
 
        }
 }
 
-PortMatrixNode::State
-PortMatrixGrid::get_association (PortMatrixNode node) const
-{
-       if (_matrix->show_only_bundles()) {
-
-               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 < 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.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;
-                               }
-                       }
-               }
-
-               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::set_association (PortMatrixNode node, bool s)
 {
        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) {
+               for (uint32_t i = 0; i < node.column.bundle->nchannels().n_total(); ++i) {
+                       for (uint32_t j = 0; j < node.row.bundle->nchannels().n_total(); ++j) {
+
+                               if (!_matrix->should_show (node.column.bundle->channel_type(i)) || !_matrix->should_show (node.row.bundle->channel_type(j))) {
+                                       continue;
+                               }
 
                                ARDOUR::BundleChannel c[2];
                                c[_matrix->column_index()] = ARDOUR::BundleChannel (node.column.bundle, i);
@@ -374,39 +358,64 @@ PortMatrixGrid::set_association (PortMatrixNode node, bool s)
                        ARDOUR::BundleChannel c[2];
                        c[_matrix->row_index()] = node.row;
                        c[_matrix->column_index()] = node.column;
+
                        _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, GdkEventButton* ev)
 {
-       if (b == 1) {
+       if (ev->button == 1) {
+
+               if (x != -1) {
 
-               if (_dragging && _moved) {
+                       if (_dragging && _moved) {
 
-                       if (_drag_valid) {
-                               list<PortMatrixNode> const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y);
+                               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));
+                                       if (!p.empty()) {
+                                               PortMatrixNode::State const s = _matrix->get_association (p.front());
+                                               for (list<PortMatrixNode>::const_iterator i = p.begin(); i != p.end(); ++i) {
+                                                       set_association (*i, toggle_state (s));
+                                               }
                                        }
                                }
-                       }
 
-               } else {
+                       } else {
+
+                               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                                       /* associate/disassociate things diagonally down and right until we run out */
+                                       PortMatrixNode::State s = (PortMatrixNode::State) 0;
+                                       while (1) {
+                                               PortMatrixNode const n = position_to_node (x, y);
+                                               if (n.row.bundle && n.column.bundle) {
+                                                       if (s == (PortMatrixNode::State) 0) {
+                                                               s = _matrix->get_association (n);
+                                                       }
+                                                       set_association (n, toggle_state (s));
+                                               } else {
+                                                       break;
+                                               }
+                                               x += grid_spacing ();
+                                               y += grid_spacing ();
+                                       }
 
-                       PortMatrixNode const n = position_to_node (x / grid_spacing(), y / grid_spacing());
-                       if (n.row.bundle && n.column.bundle) {
-                               PortMatrixNode::State const s = get_association (n);
-                               set_association (n, toggle_state (s));
+                               } else {
+
+                                       PortMatrixNode const n = position_to_node (x, y);
+                                       if (n.row.bundle && n.column.bundle) {
+                                               PortMatrixNode::State const s = _matrix->get_association (n);
+                                               set_association (n, toggle_state (s));
+                                       }
+                               }
                        }
+
+                       require_render ();
                }
 
-               require_render ();
                _body->queue_draw ();
        }
 
@@ -420,26 +429,31 @@ 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 ();
 
-       if (_body->mouseover().row.bundle && _body->mouseover().column.bundle) {
+       for (list<PortMatrixNode>::const_iterator i = m.begin(); i != m.end(); ++i) {
 
-               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);
+               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 (PortMatrix::bundle_with_channels (i->row.bundle) && PortMatrix::bundle_with_channels (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_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_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 (_dragging && _drag_valid && _moved) {
@@ -448,20 +462,20 @@ PortMatrixGrid::draw_extra (cairo_t* cr)
 
                if (!p.empty()) {
 
-                       bool const s = toggle_state (get_association (p.front()));
+                       bool const s = toggle_state (_matrix->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->columns()) * grid_spacing ()),
-                                               component_to_parent_y (channel_to_position (i->row, _matrix->rows()) * grid_spacing ())
+                                               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->columns()) * grid_spacing ()),
-                                               component_to_parent_y (channel_to_position (i->row, _matrix->rows()) * grid_spacing ())
+                                               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 ())
                                                );
                                }
                        }
@@ -487,7 +501,7 @@ PortMatrixGrid::draw_extra (cairo_t* cr)
 }
 
 void
-PortMatrixGrid::mouseover_changed (PortMatrixNode const& old)
+PortMatrixGrid::mouseover_changed (list<PortMatrixNode> const & old)
 {
        queue_draw_for (old);
        queue_draw_for (_body->mouseover());
@@ -496,7 +510,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 ();
@@ -513,29 +527,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 (n.column.bundle) {
+               if (i->row.bundle) {
 
-               double const x = channel_to_position (n.column, _matrix->columns()) * grid_spacing ();
+                       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()
+                               );
+               }
 
-               _body->queue_draw_area (
-                       component_to_parent_x (x),
-                       _parent_rectangle.get_y(),
-                       grid_spacing(),
-                       _parent_rectangle.get_height()
-                       );
+               if (i->column.bundle) {
+
+                       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()
+                               );
+               }
        }
 }
 
@@ -600,12 +617,12 @@ PortMatrixGrid::nodes_on_line (int x0, int y0, int x1, int y1) const
 
        for (int x = x0; x <= x1; ++x) {
                if (steep) {
-                       PortMatrixNode n = 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 {
-                       PortMatrixNode n = 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);
                        }