X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner2d.cc;h=3a8ee3d95ab6ecd55748962861509aea2eb2b143;hb=9f9e948d845382c8f74e67034fd8beb1704bba78;hp=29806cae673becfefbf3627447389627902bd1af;hpb=30d95bbb8c007bf4db96dff86eea9eff6c5eeab1;p=ardour.git diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index 29806cae67..3a8ee3d95a 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -33,16 +33,17 @@ #include "ardour/pannable.h" #include "ardour/speakers.h" -#include "canvas/colors.h" +#include "gtkmm2ext/colors.h" -#include "ardour_ui.h" #include "panner2d.h" #include "keyboard.h" #include "gui_thread.h" +#include "rgb_macros.h" #include "utils.h" #include "public_editor.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; @@ -51,6 +52,9 @@ using namespace ARDOUR_UI_UTILS; using namespace PBD; using Gtkmm2ext::Keyboard; +Panner2d::ColorScheme Panner2d::colors; +bool Panner2d::have_colors = false; + static const int large_size_threshold = 100; static const int large_border_width = 25; static const int small_border_width = 8; @@ -81,6 +85,13 @@ Panner2d::Panner2d (boost::shared_ptr p, int32_t h) , have_elevation (false) , _send_mode (false) { + if (!have_colors) { + set_colors (); + have_colors = true; + } + + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &Panner2d::color_handler)); + panner_shell->Changed.connect (panshell_connections, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context()); panner_shell->panner()->SignalPositionChanged.connect (panner_connections, invalidator(*this), boost::bind (&Panner2d::handle_position_change, this), gui_context()); @@ -97,6 +108,34 @@ Panner2d::~Panner2d() for (Targets::iterator i = speakers.begin(); i != speakers.end(); ++i) { delete *i; } + for (Targets::iterator i = signals.begin(); i != signals.end(); ++i) { + delete *i; + } +} + +void +Panner2d::set_colors () +{ + // TODO get all colors from theme, resolve dups + colors.background = UIConfiguration::instance().color ("mono panner bg"); + colors.crosshairs = 0x4884a9ff; // 0.282, 0.517, 0.662, 1.0 + colors.signalcircle_border = 0x84c5e1ff; // 0.517, 0.772, 0.882, 1.0 + colors.signalcircle = 0x4884a9ff; // 0.282, 0.517, 0.662, 1.0 // also used with a = 0.9 + colors.diffusion = 0x4884a973; // 0.282, 0.517, 0.662, 0.45 + colors.diffusion_inv = 0xff6b6b73; // 1.0, 0.419, 0.419, 0.45 + colors.pos_outline = 0xffe7e7d9; // 1.0, 0.905, 0.905, 0.85 + colors.pos_fill = 0xff6b6bd9; // 1.0, 0.419, 0.419, 0.85 + colors.signal_outline = 0x84c5e1cc; // 0.517, 0.772, 0.882, 0.8 + colors.signal_fill = 0x4884a9bf; // 0.282, 0.517, 0.662, 0.75 + colors.speaker_fill = 0x4884a9ff; // 0.282, 0.517, 0.662, 1.0 + colors.text = 0x84c5e1e6; // 0.517, 0.772, 0.882, 0.9 +} + +void +Panner2d::color_handler () +{ + set_colors (); + queue_draw (); } void @@ -257,8 +296,8 @@ Panner2d::handle_position_change () uint32_t n; double w = panner_shell->pannable()->pan_width_control->get_value(); - position.position = AngularVector (panner_shell->pannable()->pan_azimuth_control->get_value() * 360.0, - panner_shell->pannable()->pan_elevation_control->get_value() * 90.0); + position.position = AngularVector (panner_shell->pannable()->pan_azimuth_control->get_value() * 360.0, + panner_shell->pannable()->pan_elevation_control->get_value() * 90.0); for (uint32_t i = 0; i < signals.size(); ++i) { signals[i]->position = panner_shell->panner()->signal_position (i); @@ -302,10 +341,10 @@ Panner2d::find_closest_object (gdouble x, gdouble y, bool& is_signal) /* start with the position itself */ - PBD::AngularVector dp = position.position; - if (!have_elevation) dp.ele = 0; - dp.azi = 270 - dp.azi; - dp.cartesian (c); + PBD::AngularVector dp = position.position; + if (!have_elevation) dp.ele = 0; + dp.azi = 270 - dp.azi; + dp.cartesian (c); cart_to_gtk (c); best_distance = sqrt ((c.x - x) * (c.x - x) + @@ -348,11 +387,11 @@ Panner2d::find_closest_object (gdouble x, gdouble y, bool& is_signal) if (!closest) { for (Targets::const_iterator i = speakers.begin(); i != speakers.end(); ++i) { candidate = *i; - PBD::AngularVector sp = candidate->position; - sp.azi = 270 -sp.azi; - CartesianVector c; - sp.cartesian (c); - cart_to_gtk (c); + PBD::AngularVector sp = candidate->position; + sp.azi = 270 -sp.azi; + CartesianVector c; + sp.cartesian (c); + cart_to_gtk (c); distance = sqrt ((c.x - x) * (c.x - x) + (c.y - y) * (c.y - y)); @@ -413,6 +452,11 @@ Panner2d::on_motion_notify_event (GdkEventMotion *ev) return handle_motion (x, y, state); } +#define CSSRGBA(CL) \ + cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(CL), UINT_RGBA_G_FLT(CL), UINT_RGBA_B_FLT(CL), UINT_RGBA_A_FLT(CL)); + +#define CSSRGB(CL, A) \ + cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(CL), UINT_RGBA_G_FLT(CL), UINT_RGBA_B_FLT(CL), A); bool Panner2d::on_expose_event (GdkEventExpose *event) { @@ -427,14 +471,15 @@ Panner2d::on_expose_event (GdkEventExpose *event) cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height); - double r, g, b, a; + uint32_t bg = colors.background; if (_send_mode) { - ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("send bg"), r, g, b, a); + bg = UIConfiguration::instance().color ("send bg"); } + if (!panner_shell->bypassed()) { - cairo_set_source_rgba (cr, r, g, b, 1.0); + CSSRGBA(bg); } else { - cairo_set_source_rgba (cr, r, g, b , 0.2); + CSSRGB(bg, 0.2); } cairo_fill_preserve (cr); cairo_clip (cr); @@ -447,7 +492,7 @@ Panner2d::on_expose_event (GdkEventExpose *event) /* horizontal line of "crosshairs" */ - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 1.0); + CSSRGBA(colors.crosshairs); cairo_move_to (cr, 0.0, radius); cairo_line_to (cr, diameter, radius); cairo_stroke (cr); @@ -461,16 +506,16 @@ Panner2d::on_expose_event (GdkEventExpose *event) /* the circle on which signals live */ cairo_set_line_width (cr, 1.5); - cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 1.0); + CSSRGBA(colors.signalcircle_border); cairo_arc (cr, radius, radius, radius, 0.0, 2.0 * M_PI); cairo_stroke (cr); for (uint32_t rad = 15; rad < 90; rad += 15) { cairo_set_line_width (cr, .5 + (float)rad / 150.0); if (rad == 45) { - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 1.0); + CSSRGBA(colors.signalcircle); } else { - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 0.8); + CSSRGB(colors.signalcircle, 0.9); } cairo_new_path (cr); cairo_arc (cr, radius, radius, radius * sin(M_PI * (float) rad / 180.0), 0, 2.0 * M_PI); @@ -478,7 +523,7 @@ Panner2d::on_expose_event (GdkEventExpose *event) } if (!panner_shell->bypassed()) { - /* convention top == front ^= azimuth == .5 (same as stereo/mono panners) */ + /* convention top == front ^= azimuth == .5 (same as stereo/mono panners) */ if (signals.size() > 1) { /* arc to show "diffusion" */ @@ -488,17 +533,17 @@ Panner2d::on_expose_event (GdkEventExpose *event) cairo_save (cr); cairo_translate (cr, radius, radius); - cairo_rotate (cr, M_PI / 2.0); + cairo_rotate (cr, M_PI / 2.0); cairo_rotate (cr, position_angle - (width_angle/2.0)); cairo_move_to (cr, 0, 0); cairo_arc_negative (cr, 0, 0, radius, width_angle, 0.0); cairo_close_path (cr); if (panner_shell->pannable()->pan_width_control->get_value() >= 0.0) { /* normal width */ - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 0.45); + CSSRGBA(colors.diffusion); } else { /* inverse width */ - cairo_set_source_rgba (cr, 1.0, 0.419, 0.419, 0.45); + CSSRGBA(colors.diffusion_inv); } cairo_fill (cr); cairo_restore (cr); @@ -517,17 +562,17 @@ Panner2d::on_expose_event (GdkEventExpose *event) /* draw position */ - PBD::AngularVector dp = position.position; - if (!have_elevation) dp.ele = 0; - dp.azi = 270 - dp.azi; + PBD::AngularVector dp = position.position; + if (!have_elevation) dp.ele = 0; + dp.azi = 270 - dp.azi; dp.cartesian (c); cart_to_gtk (c); cairo_new_path (cr); cairo_arc (cr, c.x, c.y, arc_radius + 1.0, 0, 2.0 * M_PI); - cairo_set_source_rgba (cr, 1.0, 0.419, 0.419, 0.85); + CSSRGBA(colors.pos_fill); cairo_fill_preserve (cr); - cairo_set_source_rgba (cr, 1.0, 0.905, 0.905, 0.85); + CSSRGBA(colors.pos_outline); cairo_stroke (cr); /* signals */ @@ -543,19 +588,19 @@ Panner2d::on_expose_event (GdkEventExpose *event) */ PBD::AngularVector sp = signal->position; if (!have_elevation) sp.ele = 0; - sp.azi += 270.0; + sp.azi += 270.0; sp.cartesian (c); cart_to_gtk (c); cairo_new_path (cr); cairo_arc (cr, c.x, c.y, arc_radius, 0, 2.0 * M_PI); - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 0.75); + CSSRGBA(colors.signal_fill); cairo_fill_preserve (cr); - cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 0.8); + CSSRGBA(colors.signal_outline); cairo_stroke (cr); if (!xsmall && !signal->text.empty()) { - cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, .9); + CSSRGBA(colors.text); /* the +/- adjustments are a hack to try to center the text in the circle * TODO use pango get_pixel_size() -- see mono_panner.cc */ @@ -581,8 +626,8 @@ Panner2d::on_expose_event (GdkEventExpose *event) if (speaker->visible) { - PBD::AngularVector sp = speaker->position; - sp.azi += 270.0; + PBD::AngularVector sp = speaker->position; + sp.azi += 270.0; CartesianVector c; sp.cartesian (c); cart_to_gtk (c); @@ -608,7 +653,7 @@ Panner2d::on_expose_event (GdkEventExpose *event) cairo_rel_line_to (cr, -5, +5); cairo_rel_line_to (cr, 0, -7); cairo_close_path (cr); - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 1.0); + CSSRGBA(colors.speaker_fill); cairo_fill (cr); cairo_restore (cr); @@ -638,29 +683,29 @@ bool Panner2d::on_button_press_event (GdkEventButton *ev) { GdkModifierType state; - int x; - int y; - bool is_signal; + int x; + int y; + bool is_signal; if (ev->type == GDK_2BUTTON_PRESS && ev->button == 1) { return false; } - did_move = false; + did_move = false; switch (ev->button) { case 1: case 2: - x = ev->x - hoffset; - y = ev->y - voffset; + x = ev->x - hoffset; + y = ev->y - voffset; if ((drag_target = find_closest_object (x, y, is_signal)) != 0) { - if (!is_signal) { - panner_shell->panner()->set_position (drag_target->position.azi/360.0); - drag_target = 0; - } else { - drag_target->set_selected (true); - } + if (!is_signal) { + panner_shell->panner()->set_position (drag_target->position.azi/360.0); + drag_target = 0; + } else { + drag_target->set_selected (true); + } } state = (GdkModifierType) ev->state; @@ -686,7 +731,7 @@ Panner2d::on_button_release_event (GdkEventButton *ev) x = (int) floor (ev->x); y = (int) floor (ev->y); state = (GdkModifierType) ev->state; - ret = handle_motion (x, y, state); + ret = handle_motion (x, y, state); drag_target = 0; break; @@ -746,7 +791,7 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) if (!have_elevation) { clamp_to_circle (cp.x, cp.y); cp.angular (av); - av.azi = fmod(270 - av.azi, 360); + av.azi = fmod(270 - av.azi, 360); if (drag_target == &position) { double degree_fract = av.azi / 360.0; panner_shell->panner()->set_position (degree_fract); @@ -758,7 +803,7 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) double r2d = 180.0 / M_PI; av.azi = r2d * atan2(cp.y, cp.x); av.ele = r2d * asin(cp.z); - av.azi = fmod(270 - av.azi, 360); + av.azi = fmod(270 - av.azi, 360); if (drag_target == &position) { double azi_fract = av.azi / 360.0; @@ -776,18 +821,18 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) bool Panner2d::on_scroll_event (GdkEventScroll* ev) { - switch (ev->direction) { - case GDK_SCROLL_UP: - case GDK_SCROLL_RIGHT: - panner_shell->panner()->set_position (panner_shell->pannable()->pan_azimuth_control->get_value() - 1.0/360.0); - break; + switch (ev->direction) { + case GDK_SCROLL_UP: + case GDK_SCROLL_RIGHT: + panner_shell->panner()->set_position (panner_shell->pannable()->pan_azimuth_control->get_value() - 1.0/360.0); + break; - case GDK_SCROLL_DOWN: - case GDK_SCROLL_LEFT: - panner_shell->panner()->set_position (panner_shell->pannable()->pan_azimuth_control->get_value() + 1.0/360.0); - break; - } - return true; + case GDK_SCROLL_DOWN: + case GDK_SCROLL_LEFT: + panner_shell->panner()->set_position (panner_shell->pannable()->pan_azimuth_control->get_value() + 1.0/360.0); + break; + } + return true; } void @@ -795,28 +840,28 @@ Panner2d::cart_to_gtk (CartesianVector& c) const { /* cartesian coordinate space: center = 0.0 - dimension = 2.0 * 2.0 - increasing y moves up - so max values along each axis are -1..+1 + dimension = 2.0 * 2.0 + increasing y moves up + so max values along each axis are -1..+1 GTK uses a coordinate space that is: top left = 0.0 - dimension = (radius*2.0) * (radius*2.0) - increasing y moves down + dimension = (radius*2.0) * (radius*2.0) + increasing y moves down */ - const double diameter = radius*2.0; + const double diameter = radius*2.0; - c.x = diameter * ((c.x + 1.0) / 2.0); - /* extra subtraction inverts the y-axis to match "increasing y moves down" */ - c.y = diameter - (diameter * ((c.y + 1.0) / 2.0)); + c.x = diameter * ((c.x + 1.0) / 2.0); + /* extra subtraction inverts the y-axis to match "increasing y moves down" */ + c.y = diameter - (diameter * ((c.y + 1.0) / 2.0)); } void Panner2d::gtk_to_cart (CartesianVector& c) const { - const double diameter = radius*2.0; + const double diameter = radius*2.0; c.x = ((c.x / diameter) * 2.0) - 1.0; - c.y = (((diameter - c.y) / diameter) * 2.0) - 1.0; + c.y = (((diameter - c.y) / diameter) * 2.0) - 1.0; } void @@ -971,7 +1016,7 @@ Panner2dWindow::set_width () bool Panner2dWindow::on_key_press_event (GdkEventKey* event) { - return relay_key_press (event, &PublicEditor::instance()); + return relay_key_press (event, this); } bool