X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fport_matrix.cc;h=1b588511fdc47c7555555b634b9d70befc4544cc;hb=70728fd739ae180c11f24b0ba42972f5465e8c87;hp=6ac770700212017ecc26ba4342310fad43de2901;hpb=e394f6ab175204e5fea76bc342989f004d459226;p=ardour.git

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index 6ac7707002..1b588511fd 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2007 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
@@ -17,870 +17,1222 @@
 
 */
 
+#include <iostream>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/adjustment.h>
 #include <gtkmm/label.h>
-#include <gtkmm/enums.h>
-#include <gtkmm/image.h>
-#include <gtkmm/stock.h>
-#include <gtkmm/messagedialog.h>
 #include <gtkmm/menu.h>
-#include <gtkmm/menu_elems.h>
-#include <gtkmm/menuitem.h>
 #include <gtkmm/menushell.h>
-#include <glibmm/objectbase.h>
-#include <gtkmm2ext/doi.h>
-#include <ardour/port_insert.h>
+#include <gtkmm/menu_elems.h>
+#include <gtkmm/window.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/messagedialog.h>
+#include "ardour/bundle.h"
+#include "ardour/types.h"
 #include "ardour/session.h"
-#include "ardour/io.h"
+#include "ardour/route.h"
 #include "ardour/audioengine.h"
-#include "ardour/track.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
-#include "ardour/data_type.h"
-#include "io_selector.h"
-#include "keyboard.h"
-#include "utils.h"
+#include "gtkmm2ext/utils.h"
+#include "port_matrix.h"
+#include "port_matrix_body.h"
+#include "port_matrix_component.h"
+#include "ardour_dialog.h"
+#include "pbd/i18n.h"
 #include "gui_thread.h"
-#include "i18n.h"
+#include "utils.h"
 
+using namespace std;
 using namespace Gtk;
+using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
-/** Add a port to a group.
- *  @param p Port name, with or without prefix.
+/** PortMatrix constructor.
+ *  @param session Our session.
+ *  @param type Port type that we are handling.
  */
+PortMatrix::PortMatrix (Window* parent, Session* session, DataType type)
+	: Table (4, 4)
+	, _parent (parent)
+	, _type (type)
+	, _menu (0)
+	, _arrangement (TOP_TO_RIGHT)
+	, _row_index (0)
+	, _column_index (1)
+	, _min_height_divisor (1)
+	, _show_only_bundles (false)
+	, _inhibit_toggle_show_only_bundles (false)
+	, _ignore_notebook_page_selected (false)
+{
+	set_session (session);
+
+	_body = new PortMatrixBody (this);
+	_body->DimensionsChanged.connect (sigc::mem_fun (*this, &PortMatrix::body_dimensions_changed));
+
+	_hbox.pack_end (_hspacer, true, true);
+	_hbox.pack_end (_hnotebook, false, false);
+	_hbox.pack_end (_hlabel, false, false);
+
+	_vnotebook.signal_switch_page().connect (sigc::mem_fun (*this, &PortMatrix::notebook_page_selected));
+	_vnotebook.property_tab_border() = 4;
+	_vnotebook.set_name (X_("PortMatrixLabel"));
+	_hnotebook.signal_switch_page().connect (sigc::mem_fun (*this, &PortMatrix::notebook_page_selected));
+	_hnotebook.property_tab_border() = 4;
+	_hnotebook.set_name (X_("PortMatrixLabel"));
+
+	_vlabel.set_use_markup ();
+	_vlabel.set_alignment (1, 1);
+	_vlabel.set_padding (4, 16);
+	_vlabel.set_name (X_("PortMatrixLabel"));
+	_hlabel.set_use_markup ();
+	_hlabel.set_alignment (1, 0.5);
+	_hlabel.set_padding (16, 4);
+	_hlabel.set_name (X_("PortMatrixLabel"));
+
+	set_row_spacing (0, 8);
+	set_col_spacing (0, 8);
+	set_row_spacing (2, 8);
+	set_col_spacing (2, 8);
+
+	_body->show ();
+	_vbox.show ();
+	_hbox.show ();
+	_vscroll.show ();
+	_hscroll.show ();
+	_vlabel.show ();
+	_hlabel.show ();
+	_hspacer.show ();
+	_vspacer.show ();
+	_vnotebook.show ();
+	_hnotebook.show ();
+}
 
-void
-PortGroup::add (std::string const & p)
+PortMatrix::~PortMatrix ()
 {
-	if (prefix.empty() == false && p.substr (0, prefix.length()) == prefix) {
-		ports.push_back (p.substr (prefix.length()));
-	} else {
-		ports.push_back (p);
-	}
+	delete _body;
+	delete _menu;
 }
 
-/** PortGroupUI constructor.
- *  @param m PortMatrix to work for.
- *  @Param g PortGroup to represent.
+/** Perform initial and once-only setup.  This must be called by
+ *  subclasses after they have set up _ports[] to at least some
+ *  reasonable extent.  Two-part initialisation is necessary because
+ *  setting up _ports is largely done by virtual functions in
+ *  subclasses.
  */
 
-PortGroupUI::PortGroupUI (PortMatrix& m, PortGroup& g)
-	: _port_matrix (m)
-	, _port_group (g)
-	, _ignore_check_button_toggle (false)
-	, _visibility_checkbutton (g.name)
+void
+PortMatrix::init ()
 {
-	int const ports = _port_group.ports.size();
-	int const rows = _port_matrix.n_rows ();
+	select_arrangement ();
+
+	/* Signal handling is kind of split into three parts:
+	 *
+	 * 1.  When _ports[] changes, we call setup().  This essentially sorts out our visual
+	 *     representation of the information in _ports[].
+	 *
+	 * 2.  When certain other things change, we need to get our subclass to clear and
+	 *     re-fill _ports[], which in turn causes appropriate signals to be raised to
+	 *     hook into part (1).
+	 *
+	 * 3.  Assorted other signals.
+	 */
 
-	if (rows == 0 || ports == 0) {
-		return;
-	}
 
-	/* Sort out the table and the checkbuttons inside it */
-	
-	_table.resize (rows, ports);
-	_port_checkbuttons.resize (rows);
-	for (int i = 0; i < rows; ++i) {
-		_port_checkbuttons[i].resize (ports);
+	/* Part 1: the basic _ports[] change -> reset visuals */
+
+	for (int i = 0; i < 2; ++i) {
+		/* watch for the content of _ports[] changing */
+		_ports[i].Changed.connect (_changed_connections, invalidator (*this), boost::bind (&PortMatrix::setup, this), gui_context());
+
+		/* and for bundles in _ports[] changing */
+		_ports[i].BundleChanged.connect (_bundle_changed_connections, invalidator (*this), boost::bind (&PortMatrix::setup, this), gui_context());
 	}
 
+	/* Part 2: notice when things have changed that require our subclass to clear and refill _ports[] */
 
-	for (int i = 0; i < rows; ++i) {
-		for (uint32_t j = 0; j < _port_group.ports.size(); ++j) {
-			CheckButton* b = new CheckButton;
-			
-			b->signal_toggled().connect (
-				sigc::bind (sigc::mem_fun (*this, &PortGroupUI::port_checkbutton_toggled), b, i, j));
-			
-			b->signal_button_release_event().connect (
-				sigc::bind (sigc::mem_fun (*this, &PortGroupUI::port_checkbutton_release), b, i, j), false);
+	/* watch for routes being added or removed */
+	_session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::routes_changed, this), gui_context());
 
-			_port_checkbuttons[i][j] = b;
+	/* and also bundles */
+	_session->BundleAddedOrRemoved.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports, this), gui_context());
 
-			cerr << this << " bind to " << &_port_checkbuttons << " via " << b 
-			     << endl;
+	/* and also ports */
+	_session->engine().PortRegisteredOrUnregistered.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports, this), gui_context());
 
-			_table.attach (*b, j, j + 1, i, i + 1);
-		}
-	}
-	
-	_table_box.add (_table);
+	/* watch for route order keys changing, which changes the order of things in our global ports list(s) */
+	PresentationInfo::Change.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports_proxy, this), gui_context());
 
- 	_ignore_check_button_toggle = true;
+	/* Part 3: other stuff */
 
- 	/* Set the state of the check boxes according to current connections */
- 	for (int i = 0; i < rows; ++i) {
- 		for (uint32_t j = 0; j < _port_group.ports.size(); ++j) {
- 			std::string const t = _port_group.prefix + _port_group.ports[j];
-			bool const s = _port_matrix.get_state (i, t);
- 			_port_checkbuttons[i][j]->set_active (s);
-			if (s) {
-				_port_group.visible = true;
-			}
- 		}
- 	}
+	_session->engine().PortConnectedOrDisconnected.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::port_connected_or_disconnected, this), gui_context ());
+
+	_hscroll.signal_value_changed().connect (sigc::mem_fun (*this, &PortMatrix::hscroll_changed));
+	_vscroll.signal_value_changed().connect (sigc::mem_fun (*this, &PortMatrix::vscroll_changed));
 
- 	_ignore_check_button_toggle = false;
+	reconnect_to_routes ();
 
-	_visibility_checkbutton.signal_toggled().connect (sigc::mem_fun (*this, &PortGroupUI::visibility_checkbutton_toggled));
+	setup ();
 }
 
-/** The visibility of a PortGroupUI has been toggled */
+/** Disconnect from and reconnect to routes' signals that we need to watch for things that affect the matrix */
 void
-PortGroupUI::visibility_checkbutton_toggled ()
+PortMatrix::reconnect_to_routes ()
 {
-	_port_group.visible = _visibility_checkbutton.get_active ();
-}
+	_route_connections.drop_connections ();
 
-/** @return Width and height of a single checkbutton in a port group table */
-std::pair<int, int>
-PortGroupUI::unit_size () const
-{
-	if (_port_checkbuttons.empty() || _port_checkbuttons[0].empty())
-	{
-		return std::pair<int, int> (0, 0);
+	boost::shared_ptr<RouteList> routes = _session->get_routes ();
+	for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+		(*i)->processors_changed.connect (_route_connections, invalidator (*this), boost::bind (&PortMatrix::route_processors_changed, this, _1), gui_context());
+		(*i)->DropReferences.connect (_route_connections, invalidator (*this), boost::bind (&PortMatrix::routes_changed, this), gui_context());
 	}
+}
 
-	int r = 0;
-	/* We can't ask for row spacing unless there >1 rows, otherwise we get a warning */
-	if (_table.property_n_rows() > 1) {
-		r = _table.get_row_spacing (0);
+void
+PortMatrix::route_processors_changed (RouteProcessorChange c)
+{
+	if (c.type == RouteProcessorChange::MeterPointChange) {
+		/* this change has no impact on the port matrix */
+		return;
 	}
 
-	return std::make_pair (
-		_port_checkbuttons[0][0]->get_width() + _table.get_col_spacing (0),
-		_port_checkbuttons[0][0]->get_height() + r
-		);
+	setup_global_ports ();
 }
 
-/** @return Table widget containing the port checkbuttons */
-Widget&
-PortGroupUI::get_table ()
+/** A route has been added to or removed from the session */
+void
+PortMatrix::routes_changed ()
 {
-	return _table_box;
+	if (!_session) return;
+	reconnect_to_routes ();
+	setup_global_ports ();
 }
 
-/** @return Checkbutton used to toggle visibility */
-Widget&
-PortGroupUI::get_visibility_checkbutton ()
+/** Set up everything that depends on the content of _ports[] */
+void
+PortMatrix::setup ()
 {
-	return _visibility_checkbutton;
+	if (!_session) {
+		_route_connections.drop_connections ();
+		return; // session went away
+	}
+
+	/* this needs to be done first, as the visible_ports() method uses the
+	   notebook state to decide which ports are being shown */
+
+	setup_notebooks ();
+
+	_body->setup ();
+	setup_scrollbars ();
+	update_tab_highlighting ();
+	queue_draw ();
 }
 
+void
+PortMatrix::set_type (DataType t)
+{
+	_type = t;
+}
 
-/** Handle a toggle of a port check button */
 void
-PortGroupUI::port_checkbutton_toggled (CheckButton* b, int r, int c)
+PortMatrix::hscroll_changed ()
 {
- 	if (_ignore_check_button_toggle == false) {
-		_port_matrix.set_state (r, _port_group.prefix + _port_group.ports[c], b->get_active(), 0);
-	}
+	_body->set_xoffset (_hscroll.get_adjustment()->get_value());
 }
 
-bool
-PortGroupUI::port_checkbutton_release (GdkEventButton* ev, CheckButton* b, int r, int c)
+void
+PortMatrix::vscroll_changed ()
 {
-	cerr << this << " RELEASE on " << b << " state = " << ev->state << endl;
+	_body->set_yoffset (_vscroll.get_adjustment()->get_value());
+}
 
-	if (ev->state == 0) {
-		/* let usual toggle handler take care of it */
-		return false;
+void
+PortMatrix::setup_scrollbars ()
+{
+	Adjustment* a = _hscroll.get_adjustment ();
+	a->set_lower (0);
+	a->set_page_size (_body->alloc_scroll_width());
+	a->set_step_increment (32);
+	a->set_page_increment (128);
+
+	/* Set the adjustment to zero if the size has changed.*/
+	if (a->get_upper() != _body->full_scroll_width()) {
+		a->set_upper (_body->full_scroll_width());
+		a->set_value (0);
 	}
 
-	/* The fun starts here 
-	 */
+	a = _vscroll.get_adjustment ();
+	a->set_lower (0);
+	a->set_page_size (_body->alloc_scroll_height());
+	a->set_step_increment (32);
+	a->set_page_increment (128);
 
-	const size_t ports = _port_group.ports.size();
-	const size_t rows = _port_matrix.n_rows ();
-
-	if (rows == 0 || ports == 0) {
-		return true;
+	if (a->get_upper() != _body->full_scroll_height()) {
+		a->set_upper (_body->full_scroll_height());
+		a->set_value (0);
 	}
+}
 
-	/* For each port in the group, change the state of
-	   the connection for the corresponding "connector" port.
-	*/
-	
-	for (size_t j = c; j < ports; ++j) {
-
-		/* we've got a port to connect, now lets find the thing to 
-		   connect it too ... (search "down" the rows)
-		*/
-
-		cerr << "we're going to connect port " << j << " of " << ports << endl;
-
-		for (size_t i = r; i < rows; ++i) {
-
-			cerr << this << " going to connect to row " << i << " of " << rows << endl;
-			cerr << "access [" << i << "][" << j << "]\n";
-			cerr << " @ " << &_port_checkbuttons << endl;
+/** Disassociate all of our ports from each other */
+void
+PortMatrix::disassociate_all ()
+{
+	PortGroup::BundleList a = _ports[0].bundles ();
+	PortGroup::BundleList b = _ports[1].bundles ();
 
-			_port_checkbuttons[i][j]->set_active (!_port_checkbuttons[i][j]->get_active());
+	for (PortGroup::BundleList::iterator i = a.begin(); i != a.end(); ++i) {
+		for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) {
+			for (PortGroup::BundleList::iterator k = b.begin(); k != b.end(); ++k) {
+				for (uint32_t l = 0; l < (*k)->bundle->nchannels().n_total(); ++l) {
 
-			/* next time, get at least as far as this port before looking
-			   for more.
-			*/
+					if (!should_show ((*i)->bundle->channel_type(j)) || !should_show ((*k)->bundle->channel_type(l))) {
+						continue;
+					}
 
-			r = i + 1;
+					BundleChannel c[2] = {
+						BundleChannel ((*i)->bundle, j),
+						BundleChannel ((*k)->bundle, l)
+							};
 
-			/* changed connection state, stop looking for more */
+					if (get_state (c) == PortMatrixNode::ASSOCIATED) {
+						set_state (c, false);
+					}
 
-			break;
+				}
+			}
 		}
 	}
 
-	return true;
+	_body->rebuild_and_draw_grid ();
 }
 
-/** Set up visibility of the port group according to PortGroup::visible */
+/* Decide how to arrange the components of the matrix */
 void
-PortGroupUI::setup_visibility ()
+PortMatrix::select_arrangement ()
 {
-	if (!_port_group.ports.empty() && _port_group.visible) {
-		_table_box.show ();
-	} else {
-		_table_box.hide ();
+	uint32_t const N[2] = {
+		count_of_our_type_min_1 (_ports[0].total_channels()),
+		count_of_our_type_min_1 (_ports[1].total_channels())
+	};
+
+	/* XXX: shirley there's an easier way than this */
+
+	if (_vspacer.get_parent()) {
+		_vbox.remove (_vspacer);
 	}
 
-	if (_visibility_checkbutton.get_active () != _port_group.visible) {
+	if (_vnotebook.get_parent()) {
+		_vbox.remove (_vnotebook);
+	}
+
+	if (_vlabel.get_parent()) {
+		_vbox.remove (_vlabel);
+	}
+
+	/* The list with the most channels goes on left or right, so that the most channel
+	   names are printed horizontally and hence more readable.  However we also
+	   maintain notional `signal flow' vaguely from left to right.  Subclasses
+	   should choose where to put ports based on signal flowing from _ports[0]
+	   to _ports[1] */
+
+	if (N[0] > N[1]) {
+
+		_row_index = 0;
+		_column_index = 1;
+		_arrangement = LEFT_TO_BOTTOM;
+		_vlabel.set_label (_("<b>Sources</b>"));
+		_hlabel.set_label (_("<b>Destinations</b>"));
+		_vlabel.set_angle (90);
+
+		_vbox.pack_end (_vlabel, false, false);
+		_vbox.pack_end (_vnotebook, false, false);
+		_vbox.pack_end (_vspacer, true, true);
+
+#define REMOVE_FROM_GTK_PARENT(WGT) if ((WGT).get_parent()) { (WGT).get_parent()->remove(WGT);}
+		REMOVE_FROM_GTK_PARENT(*_body)
+		REMOVE_FROM_GTK_PARENT(_vscroll)
+		REMOVE_FROM_GTK_PARENT(_hscroll)
+		REMOVE_FROM_GTK_PARENT(_vbox)
+		REMOVE_FROM_GTK_PARENT(_hbox)
+
+		attach (*_body, 2, 3, 1, 2, FILL | EXPAND, FILL | EXPAND);
+		attach (_vscroll, 3, 4, 1, 2, SHRINK);
+		attach (_hscroll, 2, 3, 3, 4, FILL | EXPAND, SHRINK);
+		attach (_vbox, 1, 2, 1, 2, SHRINK);
+		attach (_hbox, 2, 3, 2, 3, FILL | EXPAND, SHRINK);
+
+	} else {
 
-		_visibility_checkbutton.set_active (_port_group.visible);
+		_row_index = 1;
+		_column_index = 0;
+		_arrangement = TOP_TO_RIGHT;
+		_hlabel.set_label (_("<b>Sources</b>"));
+		_vlabel.set_label (_("<b>Destinations</b>"));
+		_vlabel.set_angle (-90);
+
+		_vbox.pack_end (_vspacer, true, true);
+		_vbox.pack_end (_vnotebook, false, false);
+		_vbox.pack_end (_vlabel, false, false);
+
+		REMOVE_FROM_GTK_PARENT(*_body)
+		REMOVE_FROM_GTK_PARENT(_vscroll)
+		REMOVE_FROM_GTK_PARENT(_hscroll)
+		REMOVE_FROM_GTK_PARENT(_vbox)
+		REMOVE_FROM_GTK_PARENT(_hbox)
+
+		attach (*_body, 1, 2, 2, 3, FILL | EXPAND, FILL | EXPAND);
+		attach (_vscroll, 3, 4, 2, 3, SHRINK);
+		attach (_hscroll, 1, 2, 3, 4, FILL | EXPAND, SHRINK);
+		attach (_vbox, 2, 3, 2, 3, SHRINK);
+		attach (_hbox, 1, 2, 1, 2, FILL | EXPAND, SHRINK);
 	}
 }
 
-RotatedLabelSet::RotatedLabelSet (PortGroupList& g)
-	: Glib::ObjectBase ("RotatedLabelSet"), Widget (), _port_group_list (g), _base_width (128)
+/** @return columns list */
+PortGroupList const *
+PortMatrix::columns () const
 {
-	set_flags (NO_WINDOW);
-	set_angle (atoi (getenv ("AD_ANGLE")));
+	return &_ports[_column_index];
 }
 
-RotatedLabelSet::~RotatedLabelSet ()
+boost::shared_ptr<const PortGroup>
+PortMatrix::visible_columns () const
 {
-	
+	return visible_ports (_column_index);
 }
 
-
-/** Set the angle that the labels are drawn at.
- * @param degrees New angle in degrees.
- */
-
-void
-RotatedLabelSet::set_angle (int degrees)
+/* @return rows list */
+PortGroupList const *
+PortMatrix::rows () const
 {
-	_angle_degrees = degrees;
-	_angle_radians = M_PI * _angle_degrees / 180;
+	return &_ports[_row_index];
+}
 
-	queue_resize ();
+boost::shared_ptr<const PortGroup>
+PortMatrix::visible_rows () const
+{
+	return visible_ports (_row_index);
 }
 
+/** @param column Column; its bundle may be 0 if we are over a row heading.
+ *  @param row Row; its bundle may be 0 if we are over a column heading.
+ */
 void
-RotatedLabelSet::on_size_request (Requisition* requisition)
+PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t)
 {
-	*requisition = Requisition ();
+	using namespace Menu_Helpers;
 
-	if (_pango_layout == 0) {
-		return;
-	}
+	delete _menu;
 
-	/* Our height is the highest label */
-	requisition->height = 0;
-	for (PortGroupList::const_iterator i = _port_group_list.begin(); i != _port_group_list.end(); ++i) {
-		for (std::vector<std::string>::const_iterator j = (*i)->ports.begin(); j != (*i)->ports.end(); ++j) {
-			std::pair<int, int> const d = setup_layout (*j);
-			if (d.second > requisition->height) {
-				requisition->height = d.second;
+	_menu = new Menu;
+	_menu->set_name ("ArdourContextMenu");
+
+	MenuList& items = _menu->items ();
+
+	BundleChannel bc[2];
+	bc[_column_index] = column;
+	bc[_row_index] = row;
+
+	char buf [64];
+	bool need_separator = false;
+
+	for (int dim = 0; dim < 2; ++dim) {
+
+		if (bc[dim].bundle) {
+
+			Menu* m = manage (new Menu);
+			MenuList& sub = m->items ();
+
+			boost::weak_ptr<Bundle> w (bc[dim].bundle);
+
+			if (can_add_channels (bc[dim].bundle)) {
+				/* Start off with options for the `natural' port type */
+				for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+					if (should_show (*i)) {
+						snprintf (buf, sizeof (buf), _("Add %s %s"), (*i).to_i18n_string(), channel_noun().c_str());
+						sub.push_back (MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::add_channel_proxy), w, *i)));
+					}
+				}
+
+				/* Now add other ones */
+				for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+					if (!should_show (*i)) {
+						snprintf (buf, sizeof (buf), _("Add %s %s"), (*i).to_i18n_string(), channel_noun().c_str());
+						sub.push_back (MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::add_channel_proxy), w, *i)));
+					}
+				}
 			}
+
+			if (can_rename_channels (bc[dim].bundle) && bc[dim].channel != -1) {
+				snprintf (
+					buf, sizeof (buf), _("Rename '%s'..."),
+					escape_underscores (bc[dim].bundle->channel_name (bc[dim].channel)).c_str()
+					);
+				sub.push_back (
+					MenuElem (
+						buf,
+						sigc::bind (sigc::mem_fun (*this, &PortMatrix::rename_channel_proxy), w, bc[dim].channel)
+						)
+					);
+			}
+
+			if (can_remove_channels (bc[dim].bundle) && bc[dim].bundle->nchannels() != ARDOUR::ChanCount::ZERO) {
+				if (bc[dim].channel != -1) {
+					add_remove_option (sub, w, bc[dim].channel);
+				} else {
+					sub.push_back (
+						MenuElem (_("Remove all"), sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_all_channels), w))
+						);
+
+					if (bc[dim].bundle->nchannels().n_total() > 1) {
+                                                for (uint32_t i = 0; i < bc[dim].bundle->nchannels().n_total(); ++i) {
+                                                        if (should_show (bc[dim].bundle->channel_type(i))) {
+                                                                add_remove_option (sub, w, i);
+                                                        }
+                                                }
+                                        }
+				}
+			}
+
+			uint32_t c = count_of_our_type (bc[dim].bundle->nchannels ());
+			if ((_show_only_bundles && c > 0) || c == 1) {
+
+				/* we're looking just at bundles, or our bundle has only one channel, so just offer
+				   to disassociate all on the bundle.
+				*/
+
+				snprintf (buf, sizeof (buf), _("%s all"), disassociation_verb().c_str());
+				sub.push_back (
+					MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::disassociate_all_on_bundle), w, dim))
+					);
+
+			} else if (c != 0) {
+
+				if (bc[dim].channel != -1) {
+					/* specific channel under the menu, so just offer to disassociate that */
+					add_disassociate_option (sub, w, dim, bc[dim].channel);
+				} else {
+					/* no specific channel; offer to disassociate all, or any one in particular */
+					snprintf (buf, sizeof (buf), _("%s all"), disassociation_verb().c_str());
+					sub.push_back (
+						MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::disassociate_all_on_bundle), w, dim))
+						);
+
+					for (uint32_t i = 0; i < bc[dim].bundle->nchannels().n_total(); ++i) {
+						if (should_show (bc[dim].bundle->channel_type(i))) {
+							add_disassociate_option (sub, w, dim, i);
+						}
+					}
+				}
+			}
+
+			items.push_back (MenuElem (escape_underscores (bc[dim].bundle->name()).c_str(), *m));
+			need_separator = true;
 		}
+
 	}
 
-	/* And our width is the base plus the width of the last label */
-	requisition->width = _base_width;
-	int const n = _port_group_list.n_visible_ports ();
-	if (n > 0) {
-		std::pair<int, int> const d = setup_layout (_port_group_list.get_port_by_index (n - 1, false));
-		requisition->width += d.first;
+	if (need_separator) {
+		items.push_back (SeparatorElem ());
 	}
 
-	cerr << "Labels will be " << requisition->width << " x " << requisition->height << endl;
+	items.push_back (MenuElem (_("Rescan"), sigc::mem_fun (*this, &PortMatrix::setup_all_ports)));
+
+	items.push_back (CheckMenuElem (_("Show individual ports"), sigc::mem_fun (*this, &PortMatrix::toggle_show_only_bundles)));
+	Gtk::CheckMenuItem* i = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
+	_inhibit_toggle_show_only_bundles = true;
+	i->set_active (!_show_only_bundles);
+	_inhibit_toggle_show_only_bundles = false;
+
+	items.push_back (MenuElem (_("Flip"), sigc::mem_fun (*this, &PortMatrix::flip)));
+	items.back().set_sensitive (can_flip ());
+
+	_menu->popup (1, t);
 }
 
 void
-RotatedLabelSet::on_size_allocate (Allocation& allocation)
+PortMatrix::remove_channel_proxy (boost::weak_ptr<Bundle> b, uint32_t c)
 {
-	set_allocation (allocation);
+	boost::shared_ptr<Bundle> sb = b.lock ();
+	if (!sb) {
+		return;
+	}
+
+	remove_channel (BundleChannel (sb, c));
 
-	if (_gdk_window) {
-		_gdk_window->move_resize (allocation.get_x(), allocation.get_y(), allocation.get_width(), allocation.get_height());
+}
+
+void
+PortMatrix::rename_channel_proxy (boost::weak_ptr<Bundle> b, uint32_t c)
+{
+	boost::shared_ptr<Bundle> sb = b.lock ();
+	if (!sb) {
+		return;
 	}
+
+	rename_channel (BundleChannel (sb, c));
 }
 
 void
-RotatedLabelSet::on_realize ()
+PortMatrix::disassociate_all_on_bundle (boost::weak_ptr<Bundle> bundle, int dim)
 {
-	Widget::on_realize ();
+	boost::shared_ptr<Bundle> sb = bundle.lock ();
+	if (!sb) {
+		return;
+	}
 
-	Glib::RefPtr<Style> style = get_style ();
+	for (uint32_t i = 0; i < sb->nchannels().n_total(); ++i) {
+		if (should_show (sb->channel_type(i))) {
+			disassociate_all_on_channel (bundle, i, dim);
+		}
+	}
+}
 
-	if (!_gdk_window) {
-		GdkWindowAttr attributes;
-		memset (&attributes, 0, sizeof (attributes));
+void
+PortMatrix::disassociate_all_on_channel (boost::weak_ptr<Bundle> bundle, uint32_t channel, int dim)
+{
+	boost::shared_ptr<Bundle> sb = bundle.lock ();
+	if (!sb) {
+		return;
+	}
 
-		Allocation allocation = get_allocation ();
-		attributes.x = allocation.get_x ();
-		attributes.y = allocation.get_y ();
-		attributes.width = allocation.get_width ();
-		attributes.height = allocation.get_height ();
+	PortGroup::BundleList a = _ports[1-dim].bundles ();
 
-		attributes.event_mask = get_events () | Gdk::EXPOSURE_MASK; 
-		attributes.window_type = GDK_WINDOW_CHILD;
-		attributes.wclass = GDK_INPUT_OUTPUT;
+	for (PortGroup::BundleList::iterator i = a.begin(); i != a.end(); ++i) {
+		for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) {
 
-		_gdk_window = Gdk::Window::create (get_window (), &attributes, GDK_WA_X | GDK_WA_Y);
-		unset_flags (NO_WINDOW);
-		set_window (_gdk_window);
+			if (!should_show ((*i)->bundle->channel_type(j))) {
+				continue;
+			}
 
-		_bg_colour = style->get_bg (STATE_NORMAL );
-		modify_bg (STATE_NORMAL, _bg_colour);
-		_fg_colour = style->get_fg (STATE_NORMAL);
+			BundleChannel c[2];
+			c[dim] = BundleChannel (sb, channel);
+			c[1-dim] = BundleChannel ((*i)->bundle, j);
 
-		_gdk_window->set_user_data (gobj ());
+			if (get_state (c) == PortMatrixNode::ASSOCIATED) {
+				set_state (c, false);
+			}
+		}
+	}
 
-		/* Set up Pango stuff */
-		_pango_context = create_pango_context ();
+	_body->rebuild_and_draw_grid ();
+}
 
-		Pango::Matrix matrix = PANGO_MATRIX_INIT;
-		pango_matrix_rotate (&matrix, _angle_degrees);
-		_pango_context->set_matrix (matrix);
+void
+PortMatrix::setup_global_ports ()
+{
+	if (!_session || _session->deletion_in_progress()) return;
+	ENSURE_GUI_THREAD (*this, &PortMatrix::setup_global_ports)
 
-		_pango_layout = Pango::Layout::create (_pango_context);
-		_gc = Gdk::GC::create (get_window ());
+	for (int i = 0; i < 2; ++i) {
+		if (list_is_global (i)) {
+			setup_ports (i);
+		}
 	}
 }
 
 void
-RotatedLabelSet::on_unrealize()
+PortMatrix::setup_global_ports_proxy ()
 {
-	_gdk_window.clear ();
+	/* Avoid a deadlock by calling this in an idle handler: see IOSelector::io_changed_proxy
+	   for a discussion.
+	*/
 
-	Widget::on_unrealize ();
+	Glib::signal_idle().connect_once (sigc::mem_fun (*this, &PortMatrix::setup_global_ports));
 }
 
+void
+PortMatrix::setup_all_ports ()
+{
+	if (_session->deletion_in_progress()) {
+		return;
+	}
+
+	ENSURE_GUI_THREAD (*this, &PortMatrix::setup_all_ports)
 
-/** Set up our Pango layout to plot a given string, and compute its dimensions once
- *  it has been rotated.
- *  @param s String to use.
- *  @return width and height of the rotated string, in pixels.
- */
+	setup_ports (0);
+	setup_ports (1);
+}
 
-std::pair<int, int>
-RotatedLabelSet::setup_layout (std::string const & s)
+void
+PortMatrix::toggle_show_only_bundles ()
 {
-	_pango_layout->set_text (s);
-
-	/* Here's the unrotated size */
-	int w;
-	int h;
-	_pango_layout->get_pixel_size (w, h);
+	if (_inhibit_toggle_show_only_bundles) {
+		return;
+	}
 
-	/* Rotate the width and height as appropriate.  I thought Pango might be able
-	   to do this for us, but I can't find out how... 
-	*/
+	_show_only_bundles = !_show_only_bundles;
 
-	std::pair<int, int> d;
+	setup ();
 
-	// cerr << "\"" << s << "\" was " << w << " x " << h << endl;
+	/* The way in which hardware ports are grouped changes depending on the _show_only_bundles
+	   setting, so we need to set things up again now.
+	*/
+	setup_all_ports ();
+}
 
-	d.first = int (fabs (w * cos (_angle_radians) + h * sin (_angle_radians)));
-	d.second = int (fabs (w * sin (_angle_radians) + h * cos (_angle_radians)));
+pair<uint32_t, uint32_t>
+PortMatrix::max_size () const
+{
+	pair<uint32_t, uint32_t> m = _body->max_size ();
 
-	// cerr << "\trotated by " << _angle_degrees << " = " << d.first << " x " << d.second << endl;
+	m.first += _vscroll.get_width () + _vbox.get_width () + 4;
+	m.second += _hscroll.get_height () + _hbox.get_height () + 4;
 
-	return d;
+	return m;
 }
 
 bool
-RotatedLabelSet::on_expose_event (GdkEventExpose* event)
+PortMatrix::on_scroll_event (GdkEventScroll* ev)
 {
-	if (!_gdk_window) {
-		return true;
+	double const h = _hscroll.get_value ();
+	double const v = _vscroll.get_value ();
+
+	switch (ev->direction) {
+	case GDK_SCROLL_UP:
+		_vscroll.set_value (v - PortMatrixComponent::grid_spacing ());
+		break;
+	case GDK_SCROLL_DOWN:
+		_vscroll.set_value (v + PortMatrixComponent::grid_spacing ());
+		break;
+	case GDK_SCROLL_LEFT:
+		_hscroll.set_value (h - PortMatrixComponent::grid_spacing ());
+		break;
+	case GDK_SCROLL_RIGHT:
+		_hscroll.set_value (h + PortMatrixComponent::grid_spacing ());
+		break;
 	}
 
-	int const height = get_allocation().get_height ();
-	double const spacing = double (_base_width) / _port_group_list.n_visible_ports();
+	return true;
+}
 
-	/* Plot all the visible labels; really we should clip for efficiency */
-	int n = 0;
-	for (PortGroupList::const_iterator i = _port_group_list.begin(); i != _port_group_list.end(); ++i) {
-		if ((*i)->visible) {
-			for (uint32_t j = 0; j < (*i)->ports.size(); ++j) {
-				std::pair<int, int> const d = setup_layout ((*i)->ports[j]);
-				int x = atoi (getenv ("AD_X_SHIFT"));
-				int y = atoi (getenv ("AD_Y_SHIFT"));
-				get_window()->draw_layout (_gc, int ((n + 0.25) * spacing) + x, height - d.second + y, _pango_layout, _fg_colour, _bg_colour);
-				++n;
-			}
-		}
+boost::shared_ptr<IO>
+PortMatrix::io_from_bundle (boost::shared_ptr<Bundle> b) const
+{
+	boost::shared_ptr<IO> io = _ports[0].io_from_bundle (b);
+	if (!io) {
+		io = _ports[1].io_from_bundle (b);
 	}
 
-	return true;
+	return io;
 }
 
-/** Set the `base width'.  This is the width of the base of the label set, ie:
- *
- *     L L L L
- *    E E E E
- *   B B B B
- *  A A A A
- * L L L L
- * <--w-->
- */
-    
-void
-RotatedLabelSet::set_base_width (int w)
+bool
+PortMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const
 {
-	_base_width = w;
-	queue_resize ();
+	return io_from_bundle (b) != 0;
 }
 
-
-PortMatrix::PortMatrix (ARDOUR::Session& session, ARDOUR::DataType type, bool offer_inputs, PortGroupList::Mask mask)
-	: _offer_inputs (offer_inputs), _port_group_list (session, type, offer_inputs, mask), _type (type),
-	  _column_labels (_port_group_list)
+void
+PortMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
 {
-	_row_labels_vbox = 0;
-	_side_vbox_pad = 0;
+	boost::shared_ptr<IO> io = io_from_bundle (b);
+
+	if (io) {
+		int const r = io->add_port ("", this, t);
+		if (r == -1) {
+			Gtk::MessageDialog msg (_("It is not possible to add a port here."));
+			msg.set_title (_("Cannot add port"));
+			msg.run ();
+		}
+	}
+}
 
-	_visibility_checkbutton_box.pack_start (*(manage (new Label (_("Connections displayed: ")))), false, false, 10);
- 	pack_start (_visibility_checkbutton_box, false, false);
-	
-	_scrolled_window.set_policy (POLICY_ALWAYS, POLICY_AUTOMATIC);
-	_scrolled_window.set_shadow_type (SHADOW_NONE);
+bool
+PortMatrix::can_remove_channels (boost::shared_ptr<Bundle> b) const
+{
+	return io_from_bundle (b) != 0;
+}
 
-	VBox* b = manage (new VBox);
+void
+PortMatrix::remove_channel (ARDOUR::BundleChannel b)
+{
+	std::string errmsg;
+	boost::shared_ptr<IO> io = io_from_bundle (b.bundle);
+	boost::shared_ptr<Port> p = io->nth (b.channel);
 
-	if (offer_inputs) {
-		b->pack_start (_port_group_hbox, false, false);
-		b->pack_start (_column_labels, false, false);
-	} else {
-		b->pack_start (_column_labels, false, false);
-		b->pack_start (_port_group_hbox, false, false);
+	if (!io || !p) {
+		return;
 	}
 
-	Alignment* a; 
-
-	if (offer_inputs) {
-		a = manage (new Alignment (1, 0, 0, 0));
+	if (io->n_ports ().n_total () == 1) {
+		errmsg = _("The last port cannot be removed");
 	} else {
-		a = manage (new Alignment (0, 1, 0, 0));
+		if (-1 == io->remove_port (p, this)) {
+			errmsg = _("This port cannot be removed.");
+		}
 	}
 
-	a->add (*b);
-
-	_scrolled_window.add (*a);
-
-	if (offer_inputs) {
-		_overall_hbox.pack_start (_side_vbox, false, false, 6);
-		_overall_hbox.pack_start (_scrolled_window, true, true);
-	} else {
-		_overall_hbox.pack_start (_scrolled_window, true, true, 6);
-		_overall_hbox.pack_start (_side_vbox, false, false);
+	if (!errmsg.empty ()) {
+		ArdourDialog d (_("Port removal not allowed"));
+		Label l (errmsg);
+		d.get_vbox()->pack_start (l);
+		d.add_button (Stock::OK, RESPONSE_ACCEPT);
+		d.set_modal (true);
+		d.show_all ();
+		d.run ();
 	}
+}
 
-	pack_start (_overall_hbox);
+void
+PortMatrix::remove_all_channels (boost::weak_ptr<Bundle> w)
+{
+	boost::shared_ptr<Bundle> b = w.lock ();
+	if (!b) {
+		return;
+	}
 
-	_port_group_hbox.signal_size_allocate().connect (sigc::hide (sigc::mem_fun (*this, &IOSelector::setup_dimensions)));
+	/* Remove channels backwards so that we don't renumber channels
+	   that we are about to remove.
+	*/
+	for (int i = (b->nchannels().n_total() - 1); i >= 0; --i) {
+		if (should_show (b->channel_type(i))) {
+			remove_channel (ARDOUR::BundleChannel (b, i));
+		}
+	}
 }
 
-PortMatrix::~PortMatrix ()
+void
+PortMatrix::add_channel_proxy (boost::weak_ptr<Bundle> w, DataType t)
 {
-	clear ();
+	boost::shared_ptr<Bundle> b = w.lock ();
+	if (!b) {
+		return;
+	}
+
+	add_channel (b, t);
 }
 
-/** Clear out the things that change when the number of source or destination ports changes */
 void
-PortMatrix::clear ()
+PortMatrix::setup_notebooks ()
 {
-	for (std::vector<EventBox*>::iterator j = _row_labels.begin(); j != _row_labels.end(); ++j) {
-		delete *j;
+	int const h_current_page = _hnotebook.get_current_page ();
+	int const v_current_page = _vnotebook.get_current_page ();
+
+	/* for some reason best known to GTK, erroneous switch_page signals seem to be generated
+	   when adding or removing pages to or from notebooks, so ignore them */
+
+	_ignore_notebook_page_selected = true;
+
+	remove_notebook_pages (_hnotebook);
+	remove_notebook_pages (_vnotebook);
+
+	for (PortGroupList::List::const_iterator i = _ports[_row_index].begin(); i != _ports[_row_index].end(); ++i) {
+		HBox* dummy = manage (new HBox);
+		dummy->show ();
+		Label* label = manage (new Label ((*i)->name));
+		label->set_angle (_arrangement == LEFT_TO_BOTTOM ? 90 : -90);
+		label->set_use_markup ();
+		label->show ();
+		if (_arrangement == LEFT_TO_BOTTOM) {
+			_vnotebook.prepend_page (*dummy, *label);
+		} else {
+			/* Reverse the order of vertical tabs when they are on the right hand side
+			   so that from top to bottom it is the same order as that from left to right
+			   for the top tabs.
+			*/
+			_vnotebook.append_page (*dummy, *label);
+		}
 	}
-	_row_labels.clear ();
-		
-	if (_row_labels_vbox) {
-		_side_vbox.remove (*_row_labels_vbox);
-		delete _row_labels_vbox;
-		_row_labels_vbox = 0;
+
+	for (PortGroupList::List::const_iterator i = _ports[_column_index].begin(); i != _ports[_column_index].end(); ++i) {
+		HBox* dummy = manage (new HBox);
+		dummy->show ();
+		Label* label = manage (new Label ((*i)->name));
+		label->set_use_markup ();
+		label->show ();
+		_hnotebook.append_page (*dummy, *label);
 	}
-	
-	/* remove lurking, invisible label and padding */
-	
-	_side_vbox.children().clear ();
 
-	if (_side_vbox_pad) {
-		delete _side_vbox_pad;
-		_side_vbox_pad = 0;
+	_ignore_notebook_page_selected = false;
+
+	if (_arrangement == TOP_TO_RIGHT) {
+		_vnotebook.set_tab_pos (POS_RIGHT);
+		_hnotebook.set_tab_pos (POS_TOP);
+	} else {
+		_vnotebook.set_tab_pos (POS_LEFT);
+		_hnotebook.set_tab_pos (POS_BOTTOM);
 	}
 
-	for (std::vector<PortGroupUI*>::iterator i = _port_group_ui.begin(); i != _port_group_ui.end(); ++i) {
-		_port_group_hbox.remove ((*i)->get_table());
-		_visibility_checkbutton_box.remove ((*i)->get_visibility_checkbutton());
-		delete *i;
+	if (h_current_page != -1 && _hnotebook.get_n_pages() > h_current_page) {
+		_hnotebook.set_current_page (h_current_page);
+	} else {
+		_hnotebook.set_current_page (0);
 	}
 
-	_port_group_ui.clear ();
-}
+	if (v_current_page != -1 && _vnotebook.get_n_pages() > v_current_page) {
+		_vnotebook.set_current_page (v_current_page);
+	} else {
+		_vnotebook.set_current_page (0);
+	}
 
+	if (_hnotebook.get_n_pages() <= 1) {
+		_hbox.hide ();
+	} else {
+		_hbox.show ();
+	}
+
+	if (_vnotebook.get_n_pages() <= 1) {
+		_vbox.hide ();
+	} else {
+		_vbox.show ();
+	}
+}
 
-/** Set up dimensions of some of our widgets which depend on other dimensions
- *  within the dialogue.
- */
 void
-PortMatrix::setup_dimensions ()
+PortMatrix::remove_notebook_pages (Notebook& n)
 {
-	/* Get some dimensions from various places */
-	int const scrollbar_height = _scrolled_window.get_hscrollbar()->get_height();
+	int const N = n.get_n_pages ();
 
-	std::pair<int, int> unit_size (0, 0);
-	int port_group_tables_height = 0;
-	for (std::vector<PortGroupUI*>::iterator i = _port_group_ui.begin(); i != _port_group_ui.end(); ++i) {
-		std::pair<int, int> const u = (*i)->unit_size ();
-		unit_size.first = std::max (unit_size.first, u.first);
-		unit_size.second = std::max (unit_size.second, u.second);
-		port_group_tables_height = std::max (
-			port_group_tables_height, (*i)->get_table().get_height()
-			);
+	for (int i = 0; i < N; ++i) {
+		n.remove_page ();
 	}
+}
 
-	/* Column labels */
-	_column_labels.set_base_width (_port_group_list.n_visible_ports () * unit_size.first);
-
-	/* Scrolled window */
-	/* XXX: really shouldn't set a minimum horizontal size here, but if we don't
-	   the window starts up very small.
-	   The constant value in the set_size_request() computation will control
-	   how big the scrolled window will be if we fill the port matrix will a gajillion
-	   ports.
-	*/
+void
+PortMatrix::notebook_page_selected (GtkNotebookPage *, guint)
+{
+	if (_ignore_notebook_page_selected) {
+		return;
+	}
 
-	_scrolled_window.set_size_request (
-		std::min (_column_labels.get_width(), 400),
-		_column_labels.get_height() + port_group_tables_height + scrollbar_height + 16
-		);
-	
-	/* Row labels */
-	for (std::vector<EventBox*>::iterator j = _row_labels.begin(); j != _row_labels.end(); ++j) {
-		(*j)->get_child()->set_size_request (-1, unit_size.second);
-	}
-	
-	if (_side_vbox_pad) {
-		if (_offer_inputs) {
-			_side_vbox_pad->set_size_request (-1, unit_size.second / 4);
-		} else {
-			_side_vbox_pad->set_size_request (-1, scrollbar_height + unit_size.second / 4);
-		}
-	} 
+	_body->setup ();
+	setup_scrollbars ();
+	queue_draw ();
 }
 
+void
+PortMatrix::session_going_away ()
+{
+	_session = 0;
+}
 
-/** Set up the dialogue */
 void
-PortMatrix::setup ()
+PortMatrix::body_dimensions_changed ()
 {
-	clear ();
-
- 	int const rows = n_rows ();
-	
- 	/* Row labels */
-
-	_row_labels_vbox = new VBox;
-	int const run_rows = std::max (1, rows);
-
-	for (int j = 0; j < run_rows; ++j) {
-		
-		/* embolden the port/channel name */
-		
-		string s = "<b>";
-		s += row_name (j);
-		s += "</b>";
-		
-		Label* label = manage (new Label (s));
-		EventBox* b = manage (new EventBox);
-		
-		label->set_use_markup (true);
-		
-		b->set_events (Gdk::BUTTON_PRESS_MASK);
-		b->signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &IOSelector::row_label_button_pressed), j));
-		b->add (*label);
-		
-		_row_labels.push_back (b);
-		_row_labels_vbox->pack_start (*b, false, false);
-	}
-
-	_side_vbox_pad = new Label (""); /* unmanaged, explicitly deleted */
-
-	if (_offer_inputs) {
-		_side_vbox.pack_start (*_side_vbox_pad, false, false);
-		_side_vbox.pack_start (*_row_labels_vbox, false, false);
-		_side_vbox.pack_start (*manage (new Label ("")));
+	_hspacer.set_size_request (_body->column_labels_border_x (), -1);
+	if (_arrangement == TOP_TO_RIGHT) {
+		_vspacer.set_size_request (-1, _body->column_labels_height ());
+		_vspacer.show ();
 	} else {
-		_side_vbox.pack_start (*manage (new Label ("")));
-		_side_vbox.pack_start (*_row_labels_vbox, false, false);
-		_side_vbox.pack_start (*_side_vbox_pad, false, false);
+		_vspacer.hide ();
 	}
 
- 	/* Checkbutton tables and visibility checkbuttons */
- 	for (PortGroupList::iterator i = _port_group_list.begin(); i != _port_group_list.end(); ++i) {
+	int curr_width;
+	int curr_height;
+	_parent->get_size (curr_width, curr_height);
+
+	pair<uint32_t, uint32_t> m = max_size ();
+
+	/* Don't shrink the window */
+	m.first = max (int (m.first), curr_width);
+	m.second = max (int (m.second), curr_height);
+
+	resize_window_to_proportion_of_monitor (_parent, m.first, m.second);
+}
 
-		PortGroupUI* t = new PortGroupUI (*this, **i);
-		
-		_port_group_ui.push_back (t);
-		_port_group_hbox.pack_start (t->get_table(), false, false);
-		
-		_visibility_checkbutton_box.pack_start (t->get_visibility_checkbutton(), false, false);
+/** @return The PortGroup that is currently visible (ie selected by
+ *  the notebook) along a given axis.
+ */
+boost::shared_ptr<const PortGroup>
+PortMatrix::visible_ports (int d) const
+{
+	PortGroupList const & p = _ports[d];
+	PortGroupList::List::const_iterator j = p.begin ();
 
-		CheckButton* chk = dynamic_cast<CheckButton*>(&t->get_visibility_checkbutton());
+	/* The logic to compute the index here is a bit twisty because for
+	   the TOP_TO_RIGHT arrangement we reverse the order of the vertical
+	   tabs in setup_notebooks ().
+	*/
 
-		if (chk) { 
-			chk->signal_toggled().connect (sigc::mem_fun (*this, &PortMatrix::reset_visibility));
+	int n = 0;
+	if (d == _row_index) {
+		if (_arrangement == LEFT_TO_BOTTOM) {
+			n = p.size() - _vnotebook.get_current_page () - 1;
+		} else {
+			n = _vnotebook.get_current_page ();
 		}
+	} else {
+		n = _hnotebook.get_current_page ();
 	}
 
-	show_all ();
+	int i = 0;
+	while (i != int (n) && j != p.end ()) {
+		++i;
+		++j;
+	}
+
+	if (j == p.end()) {
+		return boost::shared_ptr<const PortGroup> ();
+	}
 
-	reset_visibility ();
+	return *j;
 }
 
 void
-PortMatrix::reset_visibility ()
+PortMatrix::add_remove_option (Menu_Helpers::MenuList& m, boost::weak_ptr<Bundle> w, int c)
 {
-	/* now adjust visibility and coloring */
+	using namespace Menu_Helpers;
 
-	bool even = true;
-	Gdk::Color odd_bg (color_from_style ("OddPortGroups", STATE_NORMAL, "fg"));
-	Gdk::Color even_bg (color_from_style ("EvenPortGroups", STATE_NORMAL, "fg"));
+	boost::shared_ptr<Bundle> b = w.lock ();
+	if (!b) {
+		return;
+	}
 
-	for (std::vector<PortGroupUI*>::iterator i = _port_group_ui.begin(); i != _port_group_ui.end(); ++i) {
+	char buf [64];
+	snprintf (buf, sizeof (buf), _("Remove '%s'"), escape_underscores (b->channel_name (c)).c_str());
+	m.push_back (MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_channel_proxy), w, c)));
+}
 
-		(*i)->setup_visibility ();
-		
-		if ((*i)->port_group().visible) {
-			if (even) {
-				(*i)->get_table().modify_bg (STATE_NORMAL, even_bg);
-			} else {
-				(*i)->get_table().modify_bg (STATE_NORMAL, odd_bg);
-			}
-			even = !even;
-		}
+void
+PortMatrix::add_disassociate_option (Menu_Helpers::MenuList& m, boost::weak_ptr<Bundle> w, int d, int c)
+{
+	using namespace Menu_Helpers;
+
+	boost::shared_ptr<Bundle> b = w.lock ();
+	if (!b) {
+		return;
 	}
+
+	char buf [64];
+	snprintf (buf, sizeof (buf), _("%s all from '%s'"), disassociation_verb().c_str(), escape_underscores (b->channel_name (c)).c_str());
+	m.push_back (MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::disassociate_all_on_channel), w, c, d)));
 }
 
 void
-PortMatrix::redisplay ()
+PortMatrix::port_connected_or_disconnected ()
 {
-	_port_group_list.refresh ();
-	setup ();
+	_body->rebuild_and_draw_grid ();
+	update_tab_highlighting ();
 }
 
-
-/** Handle a button press on a row label */
-bool
-PortMatrix::row_label_button_pressed (GdkEventButton* e, int r)
+/** Update the highlighting of tab names to reflect which ones
+ *  have connections.  This is pretty inefficient, unfortunately,
+ *  but maybe that doesn't matter too much.
+ */
+void
+PortMatrix::update_tab_highlighting ()
 {
-	if (e->type != GDK_BUTTON_PRESS || e->button != 3) {
-		return false;
+	if (!_session) {
+		return;
 	}
 
-	Menu* menu = manage (new Menu);
-	Menu_Helpers::MenuList& items = menu->items ();
-	menu->set_name ("ArdourContextMenu");
+	for (int i = 0; i < 2; ++i) {
 
-	bool const can_add = maximum_rows () > n_rows ();
-	bool const can_remove = minimum_rows () < n_rows ();
-	std::string const name = row_name (r);
-	
-	items.push_back (
-		Menu_Helpers::MenuElem (string_compose(_("Add %1"), row_descriptor()), sigc::mem_fun (*this, &PortMatrix::add_row))
-		);
+		Gtk::Notebook* notebook = row_index() == i ? &_vnotebook : &_hnotebook;
 
-	items.back().set_sensitive (can_add);
+		PortGroupList const * gl = ports (i);
+		int p = 0;
+		for (PortGroupList::List::const_iterator j = gl->begin(); j != gl->end(); ++j) {
+			bool has_connection = false;
+			PortGroup::BundleList const & bl = (*j)->bundles ();
+			PortGroup::BundleList::const_iterator k = bl.begin ();
+			while (k != bl.end()) {
+				if ((*k)->bundle->connected_to_anything (_session->engine())) {
+					has_connection = true;
+					break;
+				}
+				++k;
+			}
 
-	items.push_back (
-		Menu_Helpers::MenuElem (string_compose(_("Remove %1 \"%2\""), row_descriptor(), name), sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_row), r))
-		);
+			/* Find the page index that we should update; this is backwards
+			   for the vertical tabs in the LEFT_TO_BOTTOM arrangement.
+			*/
+			int page = p;
+			if (i == row_index() && _arrangement == LEFT_TO_BOTTOM) {
+				page = notebook->get_n_pages() - p - 1;
+			}
 
-	items.back().set_sensitive (can_remove);
+			Gtk::Label* label = dynamic_cast<Gtk::Label*> (notebook->get_tab_label(*notebook->get_nth_page (page)));
+			string c = label->get_label ();
+			if (c.length() && c[0] == '<' && !has_connection) {
+				/* this label is marked up with <b> but shouldn't be */
+				label->set_text ((*j)->name);
+			} else if (c.length() && c[0] != '<' && has_connection) {
+				/* this label is not marked up with <b> but should be */
+				label->set_markup (string_compose ("<b>%1</b>", Gtkmm2ext::markup_escape_text ((*j)->name)));
+			}
 
-	menu->popup (e->button, e->time);
-	
-	return true;
+			++p;
+		}
+	}
 }
 
-void
-PortMatrix::set_type (ARDOUR::DataType t)
+string
+PortMatrix::channel_noun () const
 {
-	_type = t;
-	_port_group_list.set_type (t);
-	redisplay ();
+	return _("channel");
 }
 
-void
-PortMatrix::set_offer_inputs (bool i)
+/** @return true if this matrix should show bundles / ports of type \t */
+bool
+PortMatrix::should_show (DataType t) const
 {
-	_offer_inputs = i;
-	_port_group_list.set_offer_inputs (i);
-	redisplay ();
+	return (_type == DataType::NIL || t == _type);
 }
 
-/** PortGroupList constructor.
- *  @param session Session to get ports from.
- *  @param type Type of ports to offer (audio or MIDI)
- *  @param offer_inputs true to offer output ports, otherwise false.
- *  @param mask Mask of groups to make visible by default.
- */
-
-PortGroupList::PortGroupList (ARDOUR::Session & session, ARDOUR::DataType type, bool offer_inputs, Mask mask)
-	: _session (session), _type (type), _offer_inputs (offer_inputs),
-	  buss (_("Bus"), "ardour:", mask & BUSS),
-	  track (_("Track"), "ardour:", mask & TRACK),
-	  system (_("System"), "system:", mask & SYSTEM),
-	  other (_("Other"), "", mask & OTHER)
+uint32_t
+PortMatrix::count_of_our_type (ChanCount c) const
 {
-	refresh ();
+	if (_type == DataType::NIL) {
+		return c.n_total ();
+	}
+
+	return c.get (_type);
 }
 
-void
-PortGroupList::refresh ()
+/** @return The number of ports of our type in the given channel count,
+ *  but returning 1 if there are no ports.
+ */
+uint32_t
+PortMatrix::count_of_our_type_min_1 (ChanCount c) const
 {
-	clear ();
-	
-	buss.ports.clear ();
-	track.ports.clear ();
-	system.ports.clear ();
-	other.ports.clear ();
-
-	/* Find the ports provided by ardour; we can't derive their type just from their
-	   names, so we'll have to be more devious. 
-	*/
-
-	boost::shared_ptr<ARDOUR::Session::RouteList> routes = _session.get_routes ();
-
-	for (ARDOUR::Session::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+	uint32_t n = count_of_our_type (c);
+	if (n == 0) {
+		n = 1;
+	}
 
-		PortGroup* g = 0;
+	return n;
+}
 
-		if (_type == ARDOUR::DataType::AUDIO) {
+PortMatrixNode::State
+PortMatrix::get_association (PortMatrixNode node) const
+{
+	if (show_only_bundles ()) {
 
-			if (boost::dynamic_pointer_cast<ARDOUR::AudioTrack> (*i)) {
-				g = &track;
-			} else if (!boost::dynamic_pointer_cast<ARDOUR::MidiTrack>(*i)) {
-				g = &buss;
-			} 
+		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().n_total(); ++i) {
 
-		} else if (_type == ARDOUR::DataType::MIDI) {
+			for (uint32_t j = 0; j < node.column.bundle->nchannels().n_total(); ++j) {
 
-			if (boost::dynamic_pointer_cast<ARDOUR::MidiTrack> (*i)) {
-				g = &track;
-			}
+				if (!should_show (node.row.bundle->channel_type(i)) || !should_show (node.column.bundle->channel_type(j))) {
+					continue;
+				}
 
-			/* No MIDI busses yet */
-		} 
-			
-		if (g) {
-			ARDOUR::PortSet const & p = _offer_inputs ? ((*i)->inputs()) : ((*i)->outputs());
-			for (uint32_t j = 0; j < p.num_ports(); ++j) {
-				g->add (p.port(j)->name ());
+				ARDOUR::BundleChannel c[2];
+				c[row_index()] = ARDOUR::BundleChannel (node.row.bundle, i);
+				c[column_index()] = ARDOUR::BundleChannel (node.column.bundle, j);
+
+				PortMatrixNode::State const s = 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;
+				}
 			}
-
-			std::sort (g->ports.begin(), g->ports.end());
 		}
-	}
-	
-	/* XXX: inserts, sends, plugin inserts? */
-	
-	/* Now we need to find the non-ardour ports; we do this by first
-	   finding all the ports that we can connect to. 
-	*/
-
-	const char **ports = _session.engine().get_ports ("", _type.to_jack_type(), _offer_inputs ? 
-							  JackPortIsInput : JackPortIsOutput);
-	if (ports) {
 
-		int n = 0;
-		string client_matching_string;
-
-		client_matching_string = _session.engine().client_name();
-		client_matching_string += ':';
+		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;
+		}
 
-		while (ports[n]) {
-			std::string const p = ports[n];
+		return PortMatrixNode::PARTIAL;
 
-			if (p.substr(0, strlen ("system:")) == "system:") {
-				/* system: prefix */
-				system.add (p);
-			} else {
-				if (p.substr(0, client_matching_string.length()) != client_matching_string) {
-					/* other (non-ardour) prefix */
-					other.add (p);
-				}
-			}
+	} else {
 
-			++n;
-		}
+		ARDOUR::BundleChannel c[2];
+		c[column_index()] = node.column;
+		c[row_index()] = node.row;
+		return get_state (c);
 
-		free (ports);
 	}
 
-	push_back (&system);
-	push_back (&buss);
-	push_back (&track);
-	push_back (&other);
+	abort(); /* NOTREACHED */
+	return PortMatrixNode::NOT_ASSOCIATED;
 }
 
-int
-PortGroupList::n_visible_ports () const
+/** @return true if b is a non-zero pointer and the bundle it points to has some channels */
+bool
+PortMatrix::bundle_with_channels (boost::shared_ptr<ARDOUR::Bundle> b)
 {
-	int n = 0;
-	
-	for (const_iterator i = begin(); i != end(); ++i) {
-		if ((*i)->visible) {
-			n += (*i)->ports.size();
-		}
-	}
-
-	return n;
+	return b && b->nchannels() != ARDOUR::ChanCount::ZERO;
 }
 
-std::string
-PortGroupList::get_port_by_index (int n, bool with_prefix) const
+/** See if a `flip' is possible.
+ *  @return If flip is possible, the new (row, column) notebook indices that
+ *  should be selected; otherwise, (-1, -1)
+ */
+pair<int, int>
+PortMatrix::check_flip () const
 {
-	/* XXX: slightly inefficient algorithm */
+	/* Look for the row's port group name in the columns */
+
+	int new_column = 0;
+	boost::shared_ptr<const PortGroup> r = visible_ports (_row_index);
+	PortGroupList::List::const_iterator i = _ports[_column_index].begin();
+	while (i != _ports[_column_index].end() && (*i)->name != r->name) {
+		++i;
+		++new_column;
+	}
 
-	for (const_iterator i = begin(); i != end(); ++i) {
-		for (std::vector<std::string>::const_iterator j = (*i)->ports.begin(); j != (*i)->ports.end(); ++j) {
-			if (n == 0) {
-				if (with_prefix) {
-					return (*i)->prefix + *j;
-				} else {
-					return *j;
-				}
-			}
-			--n;
-		}
+	if (i == _ports[_column_index].end ()) {
+		return make_pair (-1, -1);
+	}
+
+	/* Look for the column's port group name in the rows */
+
+	int new_row = 0;
+	boost::shared_ptr<const PortGroup> c = visible_ports (_column_index);
+	i = _ports[_row_index].begin();
+	while (i != _ports[_row_index].end() && (*i)->name != c->name) {
+		++i;
+		++new_row;
+	}
+
+	if (i == _ports[_row_index].end ()) {
+		return make_pair (-1, -1);
+	}
+
+	if (_arrangement == LEFT_TO_BOTTOM) {
+		new_row = _ports[_row_index].size() - new_row - 1;
 	}
 
-	return "";
+	return make_pair (new_row, new_column);
 }
 
-void
-PortGroupList::set_type (ARDOUR::DataType t)
+bool
+PortMatrix::can_flip () const
 {
-	_type = t;
+	return check_flip().first != -1;
 }
 
+/** Flip the column and row pages around, if possible */
 void
-PortGroupList::set_offer_inputs (bool i)
+PortMatrix::flip ()
 {
-	_offer_inputs = i;
+	pair<int, int> n = check_flip ();
+	if (n.first == -1) {
+		return;
+	}
+
+	_vnotebook.set_current_page (n.first);
+	_hnotebook.set_current_page (n.second);
 }
 
+bool
+PortMatrix::key_press (GdkEventKey* k)
+{
+	if (k->keyval == GDK_f) {
+		flip ();
+		return true;
+	}
+
+	return false;
+}