X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstereo_panner.cc;h=cff4ebd898a4b536bf85dc5616e6edd811852253;hb=b15e1cba3b11f73f3155c5dbd8a162c2512f5641;hp=6684667a745c78c0539565870cf54c3e5624124a;hpb=9eca7915e2ea5003c92d9d741b44af207933f688;p=ardour.git diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 6684667a74..cff4ebd898 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,22 +47,32 @@ 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) + , dragging_right (false) , drag_start_x (0) , last_drag_x (0) + , accumulated_delta (0) + , detented (false) + , drag_data_window (0) + , drag_data_label (0) + , position_binder (position_control) + , width_binder (width_control) { if (!have_colors) { set_colors (); @@ -69,7 +81,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); @@ -79,31 +90,42 @@ 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 () { + delete drag_data_window; } void -StereoPanner::set_tooltip () +StereoPanner::set_drag_data () { + if (!drag_data_label) { + return; + } + double pos = position_control->get_value(); // 0..1 - double w = width_control->get_value (); // -1..+1 - int lpos = (int) lrint ((pos - (w/2.0)) * 100.0); - int rpos = (int) lrint ((pos + (w/2.0)) * 100.0); - - Gtkmm2ext::UI::instance()->set_tip (this, string_compose (_("L:%1 R:%2 Width: %3%%"), - lpos, rpos, - (int) floor (w * 100.0)).c_str()); + + /* We show the position of the center of the image relative to the left & right. + This is expressed as a pair of percentage values that ranges from (100,0) + (hard left) through (50,50) (hard center) to (0,100) (hard right). + + This is pretty wierd, but its the way audio engineers expect it. Just remember that + the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense. + */ + + 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 StereoPanner::value_change () { - cerr << this << " Value change, pos = " << position_control->get_value() << " w = " << width_control->get_value() << endl; - set_tooltip (); + set_drag_data (); queue_draw (); } @@ -112,8 +134,7 @@ 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 */ @@ -121,6 +142,7 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) double fswidth = fabs (swidth); uint32_t o, f, t, b; State state; + const double corner_radius = 5.0; width = get_width(); height = get_height (); @@ -140,94 +162,119 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) /* 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 + positions (indicated by the vertical line segment above them). + */ + + double usable_width = width - lr_box_size; /* compute the centers of the L/R boxes based on the current stereo width */ - - int usable_width = width - lr_box_size; + + if (fmod (usable_width,2.0) == 0) { + /* even width, but we need odd, so that there is an exact center. + So, offset cairo by 1, and reduce effective width by 1 + */ + usable_width -= 1.0; + context->translate (1.0, 0.0); + } + double center = (lr_box_size/2.0) + (usable_width * pos); - int left = lrint (center - (fswidth * usable_width / 2.0)); // center of leftmost box - int right = lrint (center + (fswidth * usable_width / 2.0)); // center of rightmost box + const double pan_spread = (fswidth * usable_width)/2.0; + const double half_lr_box = lr_box_size/2.0; + int left; + int right; - cerr << this << " pos " << pos << " width = " << width << " swidth = " << swidth << " center @ " << center << " L = " << left << " R = " << right << endl; + 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(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); + 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); - - if (swidth < 0.0) { - /* flip where the L/R boxes are drawn */ - swap (left, right); - } + 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 */ - left -= lr_box_size/2; - right -= lr_box_size/2; - - cairo_rectangle (cr, - left, - (lr_box_size/2)+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 + 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)); - cairo_show_text (cr, _("L")); + 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) { + context->show_text (_("R")); + } else { + context->show_text (_("L")); + } } /* right box */ - cairo_rectangle (cr, - right, - (lr_box_size/2)+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 + 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 { - cairo_show_text (cr, _("R")); + if (swidth < 0.0) { + context->show_text (_("L")); + } else { + 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; } @@ -236,24 +283,128 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) { drag_start_x = ev->x; last_drag_x = ev->x; + + dragging_position = false; + dragging_left = false; + dragging_right = false; + dragging = false; + accumulated_delta = 0; + detented = false; + + /* Let the binding proxies get first crack at the press event + */ if (ev->y < 20) { - /* top section of widget is for position drags */ - dragging_position = true; + if (position_binder.button_press_handler (ev)) { + return true; + } } else { - dragging_position = false; + if (width_binder.button_press_handler (ev)) { + return true; + } + } + + if (ev->button != 1) { + return false; } if (ev->type == GDK_2BUTTON_PRESS) { - if (dragging_position) { - cerr << "Reset pos\n"; - position_control->set_value (0.5); // reset position to center + int width = get_width(); + + if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) { + /* handled by button release */ + return true; + } + + if (ev->y < 20) { + + /* upper section: adjusts position, constrained by width */ + + const double w = fabs (width_control->get_value ()); + const double max_pos = 1.0 - (w/2.0); + const double min_pos = w/2.0; + + if (ev->x <= width/3) { + /* left side dbl click */ + if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) { + /* 2ndary-double click on left, collapse to hard left */ + width_control->set_value (0); + position_control->set_value (0); + } else { + position_control->set_value (min_pos); + } + } else if (ev->x > 2*width/3) { + if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) { + /* 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); + } + } else { + position_control->set_value (0.5); + } + } else { - cerr << "Reset width\n"; - width_control->set_value (1.0); // reset position to full, LR + + /* lower section: adjusts width, constrained by position */ + + const double p = position_control->get_value (); + const double max_width = 2.0 * min ((1.0 - p), p); + + if (ev->x <= width/3) { + /* left side dbl click */ + width_control->set_value (max_width); // reset width to 100% + } else if (ev->x > 2*width/3) { + /* right side dbl click */ + width_control->set_value (-max_width); // reset width to inverted 100% + } else { + /* center dbl click */ + width_control->set_value (0); // collapse width to 0% + } } + dragging = false; - } else { + + } else if (ev->type == GDK_BUTTON_PRESS) { + + if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) { + /* handled by button release */ + return true; + } + + if (ev->y < 20) { + /* top section of widget is for position drags */ + dragging_position = true; + StartPositionGesture (); + } else { + /* lower section is for dragging width */ + + double pos = position_control->get_value (); /* 0..1 */ + double swidth = width_control->get_value (); /* -1..+1 */ + double fswidth = fabs (swidth); + int usable_width = get_width() - lr_box_size; + double center = (lr_box_size/2.0) + (usable_width * pos); + int left = lrint (center - (fswidth * usable_width / 2.0)); // center of leftmost box + int right = lrint (center + (fswidth * usable_width / 2.0)); // center of rightmost box + const int half_box = lr_box_size/2; + + if (ev->x >= (left - half_box) && ev->x < (left + half_box)) { + if (swidth < 0.0) { + dragging_right = true; + } else { + dragging_left = true; + } + } else if (ev->x >= (right - half_box) && ev->x < (right + half_box)) { + if (swidth < 0.0) { + dragging_left = true; + } else { + dragging_right = true; + } + } + StartWidthGesture (); + } + dragging = true; } @@ -263,15 +414,42 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) bool StereoPanner::on_button_release_event (GdkEventButton* ev) { + if (ev->button != 1) { + return false; + } + + bool dp = dragging_position; + dragging = false; dragging_position = false; + dragging_left = false; + dragging_right = false; + accumulated_delta = 0; + detented = false; + + if (drag_data_window) { + drag_data_window->hide (); + } + + if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) { + /* reset to default */ + position_control->set_value (0.5); + width_control->set_value (1.0); + } else { + if (dp) { + StopPositionGesture (); + } else { + StopWidthGesture (); + } + } + return true; } bool StereoPanner::on_scroll_event (GdkEventScroll* ev) { - double one_degree = 1.0/180.0; + double one_degree = 1.0/180.0; // one degree as a number from 0..1, since 180 degrees is the full L/R axis double pv = position_control->get_value(); // 0..1.0 ; 0 = left double wv = width_control->get_value(); // 0..1.0 ; 0 = left double step; @@ -311,97 +489,74 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) return false; } - int w = get_width(); - double delta = (abs (ev->x - last_drag_x)) / (w/2.0); - int drag_dir = 0; - - if (!dragging_position) { - double wv = width_control->get_value(); - int inc; - double old_wv; - double opx; // compute the operational x-coordinate given the current pos+width + 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); - if (wv > 0) { - /* positive value: increasing width means adding */ - inc = 1; - } else { - /* positive value: increasing width means subtracting */ - inc = -1; + drag_data_label = manage (new Label); + drag_data_label->set_use_markup (true); + + drag_data_window->set_border_width (6); + drag_data_window->add (*drag_data_label); + drag_data_label->show (); + + Window* toplevel = dynamic_cast (get_toplevel()); + if (toplevel) { + drag_data_window->set_transient_for (*toplevel); } + } - if (drag_start_x < w/2) { - /* started left of center */ + if (!drag_data_window->is_visible ()) { + /* 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 (); + } - opx = position_control->get_value() - (wv/2.0); + 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; + } - if (opx < 0.5) { - /* still left */ - if (ev->x > last_drag_x) { - /* motion to left */ - cerr << "was left, still left, move left\n"; - drag_dir = -inc; - } else { - cerr << "was left, still left, move right\n"; - drag_dir = inc; - } - } else { - /* now right */ - if (ev->x > last_drag_x) { - /* motion to left */ - cerr << "was left, gone right, move left\n"; - drag_dir = inc; - } else { - cerr << "was left, gone right, move right\n"; - drag_dir = -inc; - } - } - } else { - /* started right of center */ - - opx = position_control->get_value() + (wv/2.0); - - if (opx > 0.5) { - /* still right */ - if (ev->x < last_drag_x) { - /* motion to right */ - cerr << "was right, still right, move right\n"; - drag_dir = -inc; - } else { - cerr << "was right, still right, move left\n"; - drag_dir = inc; - } - } else { - /* now left */ - if (ev->x < last_drag_x) { - /* motion to right */ - cerr << "was right, gone left, move right\n"; - drag_dir = inc; - } else { - cerr << "was right, gone left, move left\n"; - drag_dir = -inc; - } - } + if (dragging_left || dragging_right) { - } + /* maintain position as invariant as we change the width */ - old_wv = wv; - wv = wv + (drag_dir * delta); - - cerr << this << " set width to " << wv << endl; - width_control->set_value (wv); - } else { + /* create a detent close to the center */ - double pv = position_control->get_value(); // 0..1.0 ; 0 = left + if (!detented && fabs (current_width) < 0.02) { + detented = true; + /* snap to zero */ + width_control->set_value (0); + } - if (ev->x > last_drag_x) { // increasing - pv = pv + delta; + if (detented) { + + accumulated_delta += delta; + + /* have we pulled far enough to escape ? */ + + if (fabs (accumulated_delta) >= 0.025) { + width_control->set_value (current_width + accumulated_delta); + detented = false; + accumulated_delta = false; + } + } else { - pv = pv - delta; + width_control->set_value (current_width + delta); } - cerr << this << " set position to " << pv << endl; - position_control->set_value (pv); + } else if (dragging_position) { + + double pv = position_control->get_value(); // 0..1.0 ; 0 = left + position_control->set_value (pv + delta); } last_drag_x = ev->x; @@ -491,16 +646,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 (); }