X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_row_labels.cc;h=de921a6cb71336c3cbc165ebd1cc18c5ceab7a9a;hb=a5de2c10679cc920a7409d02e32e6dd67778ea75;hp=80a0bb0c4f956a17dea74fd6a601d19281d6034d;hpb=da762129f19c28aff64f833b6ec09fba946faef6;p=ardour.git diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc index 80a0bb0c4f..de921a6cb7 100644 --- a/gtk2_ardour/port_matrix_row_labels.cc +++ b/gtk2_ardour/port_matrix_row_labels.cc @@ -19,7 +19,8 @@ #include #include -#include +#include +#include "gtkmm2ext/keyboard.h" #include "ardour/bundle.h" #include "port_matrix_row_labels.h" #include "port_matrix.h" @@ -38,9 +39,8 @@ PortMatrixRowLabels::PortMatrixRowLabels (PortMatrix* m, PortMatrixBody* b) void PortMatrixRowLabels::compute_dimensions () { - GdkPixmap* pm = gdk_pixmap_new (NULL, 1, 1, 24); - gdk_drawable_set_colormap (pm, gdk_colormap_get_system()); - cairo_t* cr = gdk_cairo_create (pm); + cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 200, 200); + cairo_t* cr = cairo_create (surface); _longest_port_name = 0; _longest_bundle_name = 0; @@ -54,16 +54,21 @@ PortMatrixRowLabels::compute_dimensions () PortGroup::BundleList const r = (*i)->bundles (); for (PortGroup::BundleList::const_iterator j = r.begin(); j != r.end(); ++j) { - for (uint32_t k = 0; k < j->bundle->nchannels(); ++k) { + for (uint32_t k = 0; k < (*j)->bundle->nchannels().n_total(); ++k) { + + if (!_matrix->should_show ((*j)->bundle->channel_type(k))) { + continue; + } + cairo_text_extents_t ext; - cairo_text_extents (cr, j->bundle->channel_name(k).c_str(), &ext); + cairo_text_extents (cr, (*j)->bundle->channel_name(k).c_str(), &ext); if (ext.width > _longest_port_name) { _longest_port_name = ext.width; } } cairo_text_extents_t ext; - cairo_text_extents (cr, j->bundle->name().c_str(), &ext); + cairo_text_extents (cr, (*j)->bundle->name().c_str(), &ext); if (ext.width > _longest_bundle_name) { _longest_bundle_name = ext.width; } @@ -78,7 +83,7 @@ PortMatrixRowLabels::compute_dimensions () } cairo_destroy (cr); - gdk_pixmap_unref (pm); + cairo_surface_destroy (surface); _width = _longest_bundle_name + name_pad() * 2; @@ -104,45 +109,57 @@ PortMatrixRowLabels::render (cairo_t* cr) double y = 0; int N = 0; int M = 0; - + PortGroup::BundleList const & bundles = _matrix->visible_rows()->bundles (); for (PortGroup::BundleList::const_iterator i = bundles.begin(); i != bundles.end(); ++i) { - render_bundle_name (cr, background_colour (), i->has_colour ? i->colour : get_a_bundle_colour (N), 0, y, i->bundle); + render_bundle_name (cr, background_colour (), (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N), 0, y, (*i)->bundle); if (!_matrix->show_only_bundles()) { - for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) { - Gdk::Color c = i->has_colour ? i->colour : get_a_bundle_colour (M); - render_channel_name (cr, background_colour (), c, 0, y, ARDOUR::BundleChannel (i->bundle, j)); + uint32_t const N = _matrix->count_of_our_type ((*i)->bundle->nchannels()); + for (uint32_t j = 0; j < N; ++j) { + Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (M); + ARDOUR::BundleChannel bc ( + (*i)->bundle, + (*i)->bundle->type_channel_to_overall (_matrix->type (), j) + ); + + render_channel_name (cr, background_colour (), c, 0, y, bc); y += grid_spacing(); ++M; } + + if (N == 0) { + y += grid_spacing (); + } + } else { y += grid_spacing(); } - + ++N; } } void -PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint) +PortMatrixRowLabels::button_press (double x, double y, GdkEventButton* ev) { ARDOUR::BundleChannel w = position_to_channel (y, x, _matrix->visible_rows()); if ( (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x > (_longest_port_name + name_pad() * 2)) || (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x < (_longest_bundle_name + name_pad() * 2)) - + ) { w.channel = -1; } - if (b == 3) { - + if (Gtkmm2ext::Keyboard::is_delete_event (ev) && w.channel != -1) { + _matrix->remove_channel (w); + } else if (ev->button == 3) { _matrix->popup_menu ( ARDOUR::BundleChannel (), w, - t + ev->time ); } } @@ -205,7 +222,7 @@ PortMatrixRowLabels::render_bundle_name ( { double const x = bundle_name_x (); - int const n = _matrix->show_only_bundles() ? 1 : b->nchannels(); + int const n = _matrix->show_only_bundles() ? 1 : _matrix->count_of_our_type_min_1 (b->nchannels()); set_source_rgb (cr, bg_colour); cairo_rectangle (cr, xoff + x, yoff, _longest_bundle_name + name_pad() * 2, grid_spacing() * n); cairo_fill_preserve (cr); @@ -234,15 +251,15 @@ PortMatrixRowLabels::render_channel_name ( cairo_set_line_width (cr, label_border_width ()); cairo_stroke (cr); - cairo_text_extents_t ext; - cairo_text_extents (cr, bc.bundle->channel_name(bc.channel).c_str(), &ext); - double const off = (grid_spacing() - ext.height) / 2; - - if (bc.bundle->nchannels() > 1) { + if (_matrix->count_of_our_type (bc.bundle->nchannels()) > 1) { /* only plot the name if the bundle has more than one channel; the name of a single channel is assumed to be redundant */ - + + cairo_text_extents_t ext; + cairo_text_extents (cr, bc.bundle->channel_name(bc.channel).c_str(), &ext); + double const off = (grid_spacing() - ext.height) / 2; + set_source_rgb (cr, text_colour()); cairo_move_to (cr, port_name_x() + xoff + name_pad(), yoff + name_pad() + off); cairo_show_text (cr, bc.bundle->channel_name(bc.channel).c_str()); @@ -290,11 +307,11 @@ PortMatrixRowLabels::mouseover_changed (list const &) { list const m = _body->mouseover (); for (list::const_iterator i = m.begin(); i != m.end(); ++i) { - + ARDOUR::BundleChannel c = i->column; ARDOUR::BundleChannel r = i->row; - - if (c.bundle && r.bundle) { + + if (PortMatrix::bundle_with_channels (c.bundle) && PortMatrix::bundle_with_channels (r.bundle)) { add_channel_highlight (r); } else if (r.bundle) { _body->highlight_associated_channels (_matrix->row_index(), r); @@ -312,30 +329,34 @@ PortMatrixRowLabels::motion (double x, double y) bool done = false; if (w.bundle) { - + if ( (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM && x < bw) || (_matrix->arrangement() == PortMatrix::TOP_TO_RIGHT && x > (_width - bw) && x < _width) - + ) { /* if the mouse is over a bundle name, highlight all channels in the bundle */ - + list n; - - for (uint32_t i = 0; i < w.bundle->nchannels(); ++i) { + + for (uint32_t i = 0; i < w.bundle->nchannels().n_total(); ++i) { + if (!_matrix->should_show (w.bundle->channel_type (i))) { + continue; + } + ARDOUR::BundleChannel const bc (w.bundle, i); n.push_back (PortMatrixNode (bc, ARDOUR::BundleChannel ())); } - + _body->set_mouseover (n); done = true; - + } else if (x < _width) { - + _body->set_mouseover (PortMatrixNode (w, ARDOUR::BundleChannel ())); done = true; - + } }