X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstereo_panner.cc;h=8442b45e6704e086e82b91c29e0d7d85b46d5d00;hb=314f0d91d39922b6990c28d4f2cbdaef54feee34;hp=c08e16df668e0bd1286d8ff3ad6a4d1b273a9049;hpb=7de36bc5ab5b31362943f13dccc20c80f5a03774;p=ardour.git diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index c08e16df66..8442b45e67 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -22,6 +22,8 @@ #include #include +#include + #include "pbd/controllable.h" #include "pbd/compose.h" @@ -29,8 +31,13 @@ #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/keyboard.h" +#include "ardour/pannable.h" #include "ardour/panner.h" + +#include "ardour_ui.h" +#include "global_signals.h" #include "stereo_panner.h" +#include "rgb_macros.h" #include "utils.h" #include "i18n.h" @@ -44,17 +51,35 @@ static const int lr_box_size = 15; static const int step_down = 10; static const int top_step = 2; -StereoPanner::StereoPanner (boost::shared_ptr position, boost::shared_ptr width) - : position_control (position) - , width_control (width) +StereoPanner::ColorScheme StereoPanner::colors[3]; +bool StereoPanner::have_colors = false; + +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 (); + have_colors = true; + } + 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); @@ -63,29 +88,42 @@ StereoPanner::StereoPanner (boost::shared_ptr position, boost Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK| Gdk::SCROLL_MASK| Gdk::POINTER_MOTION_MASK); + + 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. + */ + + 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()))); } void StereoPanner::value_change () { - set_tooltip (); + set_drag_data (); queue_draw (); } @@ -101,89 +139,129 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) 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; + State state; width = get_width(); height = get_height (); + if (swidth == 0.0) { + state = Mono; + } else if (swidth < 0.0) { + state = Inverted; + } else { + state = Normal; + } + + o = colors[state].outline; + f = colors[state].fill; + t = colors[state].text; + b = colors[state].background; + /* background */ - cairo_set_source_rgb (cr, 0.184, 0.172, 0.172); + 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); - /* compute the outer edges of the L/R boxes based on the current stereo width */ - - int usable_width = width - lr_box_size; - int center = lr_box_size/2 + (int) floor (usable_width * pos); - int left = center - (int) floor (fswidth * usable_width / 2.0); // center of leftmost box - int right = center + (int) floor (fswidth * usable_width / 2.0); // center of rightmost box + /* 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 */ + + 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; + cairo_translate (cr, 1.0, 0.0); + } - // cerr << "pos " << pos << " width = " << width << " swidth = " << swidth << " center @ " << center << " L = " << left << " R = " << right << endl; + double center = (lr_box_size/2.0) + (usable_width * pos); + const double pan_spread = (fswidth * usable_width)/2.0; + const double half_lr_box = lr_box_size/2.0; + int left; + int right; + + left = center - pan_spread; // center of left box + right = center + pan_spread; // center of right box /* compute & draw the line through the box */ cairo_set_line_width (cr, 2); - cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0); + 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); - } - /* left box */ - left -= lr_box_size/2; - right -= lr_box_size/2; - cairo_rectangle (cr, - left, - (lr_box_size/2)+step_down, + left - half_lr_box, + half_lr_box+step_down, lr_box_size, lr_box_size); - cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0); + 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, 0.4509, 0.7686, 0.8627, 0.8); + 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); /* add text */ cairo_move_to (cr, - left + 3, + left - half_lr_box + 3, (lr_box_size/2) + step_down + 13); - cairo_set_source_rgba (cr, 0.129, 0.054, 0.588, 1.0); cairo_select_font_face (cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); - cairo_show_text (cr, "L"); + + 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)); + if (swidth < 0.0) { + cairo_show_text (cr, _("R")); + } else { + cairo_show_text (cr, _("L")); + } + } /* right box */ cairo_rectangle (cr, - right, - (lr_box_size/2)+step_down, + right - half_lr_box, + half_lr_box+step_down, lr_box_size, lr_box_size); - cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0); + 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, 0.4509, 0.7686, 0.8627, 0.8); + 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); /* add text */ cairo_move_to (cr, - right + 3, + right - half_lr_box + 3, (lr_box_size/2)+step_down + 13); - cairo_set_source_rgba (cr, 0.129, 0.054, 0.588, 1.0); - cairo_show_text (cr, "R"); + 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)); + + if (state == Mono) { + cairo_show_text (cr, _("M")); + } else { + if (swidth < 0.0) { + cairo_show_text (cr, _("L")); + } else { + cairo_show_text (cr, _("R")); + } + } /* draw the central box */ cairo_set_line_width (cr, 1); - cairo_rectangle (cr, center - (pos_box_size/2), top_step, pos_box_size, pos_box_size); - cairo_set_source_rgba (cr, 0.3137, 0.4431, 0.7843, 1.0); + 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, 0.4509, 0.7686, 0.8627, 0.8); + 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); /* done */ @@ -197,24 +275,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 = 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; } @@ -224,15 +406,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; @@ -272,87 +481,71 @@ 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_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 window a little away from the mouse */ + drag_data_window->move (ev->x_root+30, ev->y_root+30); + 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 */ - drag_dir = -inc; - } else { - drag_dir = inc; - } - } else { - /* now right */ - if (ev->x > last_drag_x) { - /* motion to left */ - drag_dir = inc; - } else { - drag_dir = -inc; - } - } - } else { - /* started right of center */ - - opx = position_control->get_value() + (wv/2.0); + if (dragging_left || dragging_right) { - if (opx > 0.5) { - /* still right */ - if (ev->x < last_drag_x) { - /* motion to right */ - drag_dir = -inc; - } else { - drag_dir = inc; - } - } else { - /* now left */ - if (ev->x < last_drag_x) { - /* motion to right */ - drag_dir = inc; - } else { - drag_dir = -inc; - } - } + /* maintain position as invariant as we change the width */ - } - old_wv = wv; - wv = wv + (drag_dir * delta); + /* create a detent close to the center */ + + if (!detented && fabs (current_width) < 0.02) { + detented = true; + /* snap to zero */ + width_control->set_value (0); + } - width_control->set_value (wv); + if (detented) { - } else { + accumulated_delta += delta; - double pv = position_control->get_value(); // 0..1.0 ; 0 = left - - if (ev->x > last_drag_x) { // increasing - pv = pv + 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); } - 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; @@ -373,11 +566,25 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) step = one_degree * 5.0; } + /* up/down control width because we consider pan position more "important" + (and thus having higher "sense" priority) than width. + */ + switch (ev->keyval) { case GDK_Up: - wv += step; - width_control->set_value (wv); + if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { + width_control->set_value (1.0); + } else { + width_control->set_value (wv + step); + } break; + case GDK_Down: + if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { + width_control->set_value (-1.0); + } else { + width_control->set_value (wv - step); + } + case GDK_Left: pv -= step; position_control->set_value (pv); @@ -386,12 +593,15 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) pv += step; position_control->set_value (pv); break; - case GDK_Down: - wv -= step; - width_control->set_value (wv); + + break; + case GDK_0: + case GDK_KP_0: + width_control->set_value (0.0); break; - default: - return forward_key_press (ev); + + default: + return false; } return true; @@ -417,3 +627,32 @@ StereoPanner::on_leave_notify_event (GdkEventCrossing*) Keyboard::magic_widget_drop_focus (); return false; } + +void +StereoPanner::set_colors () +{ + colors[Normal].fill = ARDOUR_UI::config()->canvasvar_StereoPannerFill.get(); + 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(); +} + +void +StereoPanner::color_handler () +{ + set_colors (); + queue_draw (); +}