X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstereo_panner.cc;h=3826dc1c7a1ac1b7a1d031f6731c92f76e65c10e;hb=5c4f7313ef3f5f56dbc5777a0f78061c5472b29e;hp=7ab526f8fa8e8deb3c0582ae5d9c43eb3e0e44bf;hpb=d6314e3253b88d0b53a59f4f593520b3e2ff963e;p=ardour.git diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 7ab526f8fa..3826dc1c7a 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -30,7 +30,9 @@ #include "gtkmm2ext/gui_thread.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/keyboard.h" +#include "gtkmm2ext/utils.h" +#include "ardour/pannable.h" #include "ardour/panner.h" #include "ardour_ui.h" @@ -45,18 +47,20 @@ using namespace std; using namespace Gtk; using namespace Gtkmm2ext; -static const int pos_box_size = 10; +static const int pos_box_size = 8; static const int lr_box_size = 15; static const int step_down = 10; static const int top_step = 2; StereoPanner::ColorScheme StereoPanner::colors[3]; bool StereoPanner::have_colors = false; -PBD::Signal0 StereoPanner::color_change; -StereoPanner::StereoPanner (boost::shared_ptr position, boost::shared_ptr width) - : position_control (position) - , width_control (width) +using namespace ARDOUR; + +StereoPanner::StereoPanner (boost::shared_ptr panner) + : _panner (panner) + , position_control (_panner->pannable()->pan_azimuth_control) + , width_control (_panner->pannable()->pan_width_control) , dragging (false) , dragging_position (false) , dragging_left (false) @@ -67,8 +71,8 @@ StereoPanner::StereoPanner (boost::shared_ptr position, boost , detented (false) , drag_data_window (0) , drag_data_label (0) - , position_binder (position) - , width_binder (width) + , position_binder (position_control) + , width_binder (width_control) { if (!have_colors) { set_colors (); @@ -78,7 +82,6 @@ StereoPanner::StereoPanner (boost::shared_ptr position, boost position_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); width_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); - set_tooltip (); set_flags (Gtk::CAN_FOCUS); add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK| @@ -87,7 +90,7 @@ StereoPanner::StereoPanner (boost::shared_ptr position, boost Gdk::SCROLL_MASK| Gdk::POINTER_MOTION_MASK); - color_change.connect (connections, invalidator (*this), boost::bind (&DrawingArea::queue_draw, this), gui_context()); + ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler)); } StereoPanner::~StereoPanner () @@ -95,21 +98,6 @@ StereoPanner::~StereoPanner () delete drag_data_window; } -void -StereoPanner::set_tooltip () -{ - Gtkmm2ext::UI::instance()->set_tip (this, - string_compose (_("0 -> set width to zero (mono)\n%1-uparrow -> set width to 100\n%1-downarrow -> set width to -100"), - - Keyboard::secondary_modifier_name()).c_str()); -} - -void -StereoPanner::unset_tooltip () -{ - Gtkmm2ext::UI::instance()->set_tip (this, ""); -} - void StereoPanner::set_drag_data () { @@ -127,10 +115,11 @@ StereoPanner::set_drag_data () the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense. */ - drag_data_label->set_markup (string_compose (_("L:%1 R:%2 Width: %3%%"), - (int) rint (100.0 * (1.0 - pos)), - (int) rint (100.0 * pos), - (int) floor (100.0 * width_control->get_value()))); + char buf[64]; + snprintf (buf, sizeof (buf), "L:%3d R:%3d Width:%d%%", (int) rint (100.0 * (1.0 - pos)), + (int) rint (100.0 * pos), + (int) floor (100.0 * width_control->get_value())); + drag_data_label->set_markup (buf); } void @@ -145,15 +134,15 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) { Glib::RefPtr win (get_window()); Glib::RefPtr gc (get_style()->get_base_gc (get_state())); - - cairo_t* cr = gdk_cairo_create (win->gobj()); + Cairo::RefPtr context = get_window()->create_cairo_context(); int width, height; double pos = position_control->get_value (); /* 0..1 */ double swidth = width_control->get_value (); /* -1..+1 */ double fswidth = fabs (swidth); - uint32_t o, f, t, b; + uint32_t o, f, t, b, r; State state; + const double corner_radius = 5.0; width = get_width(); height = get_height (); @@ -170,12 +159,13 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) f = colors[state].fill; t = colors[state].text; b = colors[state].background; + r = colors[state].rule; /* background */ - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b)); - cairo_rectangle (cr, 0, 0, width, height); - cairo_fill (cr); + context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b)); + rounded_rectangle (context, 0, 0, width, height, corner_radius); + context->fill (); /* the usable width is reduced from the real width, because we need space for the two halves of LR boxes that will extend past the actual left/right @@ -191,7 +181,7 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) So, offset cairo by 1, and reduce effective width by 1 */ usable_width -= 1.0; - cairo_translate (cr, 1.0, 0.0); + context->translate (1.0, 0.0); } double center = (lr_box_size/2.0) + (usable_width * pos); @@ -203,83 +193,89 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) left = center - pan_spread; // center of left box right = center + pan_spread; // center of right box + /* center line */ + + context->set_line_width (1.0); + context->move_to ((usable_width + lr_box_size)/2.0, 0); + context->rel_line_to (0, height); + context->set_source_rgba (UINT_RGBA_R_FLT(r), UINT_RGBA_G_FLT(r), UINT_RGBA_B_FLT(r), UINT_RGBA_A_FLT(r)); + context->stroke (); + /* compute & draw the line through the box */ - cairo_set_line_width (cr, 2); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); - cairo_move_to (cr, left, top_step+(pos_box_size/2)+step_down); - cairo_line_to (cr, left, top_step+(pos_box_size/2)); - cairo_line_to (cr, right, top_step+(pos_box_size/2)); - cairo_line_to (cr, right, top_step+(pos_box_size/2) + step_down); - cairo_stroke (cr); + context->set_line_width (2); + context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); + context->move_to (left, top_step+(pos_box_size/2.0)+step_down); + context->line_to (left, top_step+(pos_box_size/2.0)); + context->line_to (right, top_step+(pos_box_size/2.0)); + context->line_to (right, top_step+(pos_box_size/2.0) + step_down); + context->stroke (); /* left box */ - cairo_rectangle (cr, - left - half_lr_box, - half_lr_box+step_down, - lr_box_size, lr_box_size); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); - cairo_stroke_preserve (cr); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); - cairo_fill (cr); + rounded_rectangle (context, left - half_lr_box, + half_lr_box+step_down, + lr_box_size, lr_box_size, corner_radius); + context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); + context->stroke_preserve (); + context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); + context->fill (); /* add text */ - cairo_move_to (cr, - left - half_lr_box + 3, - (lr_box_size/2) + step_down + 13); - cairo_select_font_face (cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); + context->move_to (left - half_lr_box + 3, + (lr_box_size/2) + step_down + 13); + context->select_font_face ("sans-serif", Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD); if (state != Mono) { - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); + context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); if (swidth < 0.0) { - cairo_show_text (cr, _("R")); + context->show_text (_("R")); } else { - cairo_show_text (cr, _("L")); + context->show_text (_("L")); } } /* right box */ - cairo_rectangle (cr, - right - half_lr_box, - half_lr_box+step_down, - lr_box_size, lr_box_size); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); - cairo_stroke_preserve (cr); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); - cairo_fill (cr); + rounded_rectangle (context, right - half_lr_box, + half_lr_box+step_down, + lr_box_size, lr_box_size, corner_radius); + context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); + context->stroke_preserve (); + context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); + context->fill (); /* add text */ - cairo_move_to (cr, - right - half_lr_box + 3, - (lr_box_size/2)+step_down + 13); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); - + context->move_to (right - half_lr_box + 3, (lr_box_size/2)+step_down + 13); + context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); + if (state == Mono) { - cairo_show_text (cr, _("M")); + context->show_text (_("M")); } else { if (swidth < 0.0) { - cairo_show_text (cr, _("L")); + context->show_text (_("L")); } else { - cairo_show_text (cr, _("R")); + context->show_text (_("R")); } } - + /* draw the central box */ - cairo_set_line_width (cr, 1); - cairo_rectangle (cr, lrint (center - (pos_box_size/2.0)), top_step, pos_box_size, pos_box_size); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); - cairo_stroke_preserve (cr); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); - cairo_fill (cr); + context->set_line_width (2.0); + context->move_to (center + (pos_box_size/2.0), top_step); /* top right */ + context->rel_line_to (0.0, pos_box_size); /* lower right */ + context->rel_line_to (-pos_box_size/2.0, 4.0); /* bottom point */ + context->rel_line_to (-pos_box_size/2.0, -4.0); /* lower left */ + context->rel_line_to (0.0, -pos_box_size); /* upper left */ + context->close_path (); - /* done */ + context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); + context->stroke_preserve (); + context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); + context->fill (); - cairo_destroy (cr); return true; } @@ -325,7 +321,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) /* upper section: adjusts position, constrained by width */ - const double w = width_control->get_value (); + const double w = fabs (width_control->get_value ()); const double max_pos = 1.0 - (w/2.0); const double min_pos = w/2.0; @@ -343,8 +339,9 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) /* 2ndary-double click on right, collapse to hard right */ width_control->set_value (0); position_control->set_value (1.0); + } else { + position_control->set_value (max_pos); } - position_control->set_value (max_pos); } else { position_control->set_value (0.5); } @@ -380,6 +377,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) if (ev->y < 20) { /* top section of widget is for position drags */ dragging_position = true; + StartPositionGesture (); } else { /* lower section is for dragging width */ @@ -393,11 +391,19 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) const int half_box = lr_box_size/2; if (ev->x >= (left - half_box) && ev->x < (left + half_box)) { - dragging_left = true; + if (swidth < 0.0) { + dragging_right = true; + } else { + dragging_left = true; + } } else if (ev->x >= (right - half_box) && ev->x < (right + half_box)) { - dragging_right = true; + if (swidth < 0.0) { + dragging_left = true; + } else { + dragging_right = true; + } } - + StartWidthGesture (); } dragging = true; @@ -413,6 +419,8 @@ StereoPanner::on_button_release_event (GdkEventButton* ev) return false; } + bool dp = dragging_position; + dragging = false; dragging_position = false; dragging_left = false; @@ -428,10 +436,14 @@ StereoPanner::on_button_release_event (GdkEventButton* ev) /* reset to default */ position_control->set_value (0.5); width_control->set_value (1.0); + } else { + if (dp) { + StopPositionGesture (); + } else { + StopWidthGesture (); + } } - set_tooltip (); - return true; } @@ -480,6 +492,7 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) if (!drag_data_window) { drag_data_window = new Window (WINDOW_POPUP); + drag_data_window->set_name (X_("ContrastingPopup")); drag_data_window->set_position (WIN_POS_MOUSE); drag_data_window->set_decorated (false); @@ -497,14 +510,16 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) } if (!drag_data_window->is_visible ()) { - /* move the window a little away from the mouse */ - drag_data_window->move (ev->x_root+30, ev->y_root+30); + /* move the popup window vertically down from the panner display */ + int rx, ry; + get_window()->get_origin (rx, ry); + drag_data_window->move (rx, ry+get_height()); drag_data_window->present (); - unset_tooltip (); } int w = get_width(); double delta = (ev->x - last_drag_x) / (double) w; + double current_width = width_control->get_value (); if (dragging_left) { delta = -delta; @@ -514,7 +529,6 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) /* maintain position as invariant as we change the width */ - double current_width = width_control->get_value (); /* create a detent close to the center */ @@ -633,16 +647,24 @@ StereoPanner::set_colors () colors[Normal].outline = ARDOUR_UI::config()->canvasvar_StereoPannerOutline.get(); colors[Normal].text = ARDOUR_UI::config()->canvasvar_StereoPannerText.get(); colors[Normal].background = ARDOUR_UI::config()->canvasvar_StereoPannerBackground.get(); + colors[Normal].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get(); colors[Mono].fill = ARDOUR_UI::config()->canvasvar_StereoPannerMonoFill.get(); colors[Mono].outline = ARDOUR_UI::config()->canvasvar_StereoPannerMonoOutline.get(); colors[Mono].text = ARDOUR_UI::config()->canvasvar_StereoPannerMonoText.get(); colors[Mono].background = ARDOUR_UI::config()->canvasvar_StereoPannerMonoBackground.get(); + colors[Mono].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get(); colors[Inverted].fill = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedFill.get(); colors[Inverted].outline = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedOutline.get(); colors[Inverted].text = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedText.get(); colors[Inverted].background = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedBackground.get(); + colors[Inverted].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get(); +} - color_change (); /* EMIT SIGNAL */ +void +StereoPanner::color_handler () +{ + set_colors (); + queue_draw (); }