X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_row_labels.cc;h=ff7ac6a48ad29b607a28a816ab6d307836a65939;hb=11e50fe0c5f441f8d017529a62ac4c8eeb6403c2;hp=30317f5619ea53f0583cdb9f34c76ff28ebda6d3;hpb=5f67a72c341a96872d9cd3d1de357662295d14b0;p=ardour.git diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc index 30317f5619..ff7ac6a48a 100644 --- a/gtk2_ardour/port_matrix_row_labels.cc +++ b/gtk2_ardour/port_matrix_row_labels.cc @@ -19,13 +19,15 @@ #include #include -#include +#include +#include "gtkmm2ext/keyboard.h" #include "ardour/bundle.h" +#include "gtkmm2ext/colors.h" +#include "utils.h" #include "port_matrix_row_labels.h" #include "port_matrix.h" #include "port_matrix_body.h" -#include "i18n.h" -#include "utils.h" +#include "pbd/i18n.h" using namespace std; @@ -38,9 +40,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; @@ -56,10 +57,10 @@ PortMatrixRowLabels::compute_dimensions () for (uint32_t k = 0; k < (*j)->bundle->nchannels().n_total(); ++k) { - if ((*j)->bundle->channel_type(k) != _matrix->type()) { + 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); if (ext.width > _longest_port_name) { @@ -83,7 +84,7 @@ PortMatrixRowLabels::compute_dimensions () } cairo_destroy (cr); - g_object_unref (pm); + cairo_surface_destroy (surface); _width = _longest_bundle_name + name_pad() * 2; @@ -109,50 +110,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); if (!_matrix->show_only_bundles()) { - for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) { - - if ((*i)->bundle->channel_type(j) != _matrix->type()) { - continue; - } - + 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); - render_channel_name (cr, background_colour (), c, 0, y, ARDOUR::BundleChannel ((*i)->bundle, j)); + 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 ); } } @@ -215,7 +223,7 @@ PortMatrixRowLabels::render_bundle_name ( { double const x = bundle_name_x (); - int const n = _matrix->show_only_bundles() ? 1 : b->nchannels().get(_matrix->type()); + 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); @@ -227,7 +235,9 @@ PortMatrixRowLabels::render_bundle_name ( cairo_text_extents (cr, b->name().c_str(), &ext); double const off = (grid_spacing() - ext.height) / 2; - set_source_rgb (cr, text_colour()); + Gdk::Color textcolor; + ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); + set_source_rgb (cr, textcolor); cairo_move_to (cr, xoff + x + name_pad(), yoff + name_pad() + off); cairo_show_text (cr, b->name().c_str()); } @@ -244,16 +254,18 @@ 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().get(_matrix->type()) > 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 */ - - set_source_rgb (cr, text_colour()); + + 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; + + Gdk::Color textcolor; + ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); + set_source_rgb (cr, textcolor); 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()); } @@ -300,11 +312,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); @@ -322,35 +334,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().n_total(); ++i) { - if (w.bundle->channel_type(i) != _matrix->type()) { + 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; - + } }