X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmono_panner.cc;h=daec1eede1c8f8bcc5c04681885637dabd03b414;hb=90ea64d1fc9e64347aca9df8c64ff0aeb674410d;hp=63f00d43c55b7de5eb03810dbdf63303167bfa4c;hpb=db79f711f8e05e9484deeed640f761d8ddd56f8c;p=ardour.git diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 63f00d43c5..daec1eede1 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -30,12 +30,16 @@ #include "gtkmm2ext/gui_thread.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/keyboard.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/persistent_tooltip.h" +#include "ardour/pannable.h" #include "ardour/panner.h" #include "ardour_ui.h" #include "global_signals.h" #include "mono_panner.h" +#include "mono_panner_editor.h" #include "rgb_macros.h" #include "utils.h" @@ -53,16 +57,15 @@ static const int top_step = 2; MonoPanner::ColorScheme MonoPanner::colors; bool MonoPanner::have_colors = false; -MonoPanner::MonoPanner (boost::shared_ptr position) - : position_control (position) - , dragging (false) +MonoPanner::MonoPanner (boost::shared_ptr panner) + : PannerInterface (panner) + , position_control (_panner->pannable()->pan_azimuth_control) , drag_start_x (0) , last_drag_x (0) , accumulated_delta (0) , detented (false) - , drag_data_window (0) - , drag_data_label (0) - , position_binder (position) + , position_binder (position_control) + , _dragging (false) { if (!have_colors) { set_colors (); @@ -71,62 +74,47 @@ MonoPanner::MonoPanner (boost::shared_ptr position) position_control->Changed.connect (connections, invalidator(*this), boost::bind (&MonoPanner::value_change, this), gui_context()); - set_flags (Gtk::CAN_FOCUS); + ColorsChanged.connect (sigc::mem_fun (*this, &MonoPanner::color_handler)); - add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK| - Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK| - Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK| - Gdk::SCROLL_MASK| - Gdk::POINTER_MOTION_MASK); - - ColorsChanged.connect (sigc::mem_fun (*this, &MonoPanner::color_handler)); + set_tooltip (); } MonoPanner::~MonoPanner () { - delete drag_data_window; + } void -MonoPanner::set_drag_data () +MonoPanner::set_tooltip () { - if (!drag_data_label) { - return; - } - double pos = position_control->get_value(); // 0..1 - + /* 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) + 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"), - (int) rint (100.0 * (1.0 - pos)), - (int) rint (100.0 * pos))); -} - -void -MonoPanner::value_change () -{ - set_drag_data (); - queue_draw (); + char buf[64]; + snprintf (buf, sizeof (buf), _("L:%3d R:%3d"), + (int) rint (100.0 * (1.0 - pos)), + (int) rint (100.0 * pos)); + _tooltip.set_tip (buf); } bool -MonoPanner::on_expose_event (GdkEventExpose* ev) +MonoPanner::on_expose_event (GdkEventExpose*) { Glib::RefPtr win (get_window()); Glib::RefPtr gc (get_style()->get_base_gc (get_state())); + Cairo::RefPtr context = get_window()->create_cairo_context(); - cairo_t* cr = gdk_cairo_create (win->gobj()); - int width, height; double pos = position_control->get_value (); /* 0..1 */ uint32_t o, f, t, b, pf, po; + const double corner_radius = 5; width = get_width(); height = get_height (); @@ -140,9 +128,9 @@ MonoPanner::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)); + context->rectangle (0, 0, width, height); + context->fill (); double usable_width = width - pos_box_size; @@ -150,10 +138,10 @@ MonoPanner::on_expose_event (GdkEventExpose* ev) 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 + 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); } const double half_lr_box = lr_box_size/2.0; @@ -164,102 +152,110 @@ MonoPanner::on_expose_event (GdkEventExpose* ev) right = width - 4 - half_lr_box; // center of right box /* center line */ - 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_set_line_width (cr, 1.0); - cairo_move_to (cr, (pos_box_size/2.0) + (usable_width/2.0), 0); - cairo_line_to (cr, (pos_box_size/2.0) + (usable_width/2.0), height); - cairo_stroke (cr); - + 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->set_line_width (1.0); + context->move_to ((pos_box_size/2.0) + (usable_width/2.0), 0); + context->line_to ((pos_box_size/2.0) + (usable_width/2.0), height); + 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, + context->move_to ( 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); - 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->select_font_face ("sans-serif", Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD); + context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); + 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, + context->move_to ( 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)); - cairo_show_text (cr, _("R")); + context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); + context->show_text (_("R")); /* 2 lines that connect them both */ - 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_set_line_width (cr, 1.0); - cairo_move_to (cr, left + half_lr_box, half_lr_box+step_down); - cairo_line_to (cr, right - half_lr_box, half_lr_box+step_down); - cairo_stroke (cr); + 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->set_line_width (1.0); + + /* make the lines a little longer than they need to be, because the corners of + the boxes are rounded and we don't want a gap + */ + context->move_to (left + half_lr_box - corner_radius, half_lr_box+step_down); + context->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down); + context->stroke (); - cairo_move_to (cr, left + half_lr_box, half_lr_box+step_down+lr_box_size); - cairo_line_to (cr, right - half_lr_box, half_lr_box+step_down+lr_box_size); - cairo_stroke (cr); + context->move_to (left + half_lr_box - corner_radius, half_lr_box+step_down+lr_box_size); + context->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down+lr_box_size); + context->stroke (); /* draw the position indicator */ double spos = (pos_box_size/2.0) + (usable_width * pos); - cairo_set_line_width (cr, 2.0); - cairo_move_to (cr, spos + (pos_box_size/2.0), top_step); /* top right */ - cairo_rel_line_to (cr, 0.0, pos_box_size); /* lower right */ - cairo_rel_line_to (cr, -pos_box_size/2.0, 4.0); /* bottom point */ - cairo_rel_line_to (cr, -pos_box_size/2.0, -4.0); /* lower left */ - cairo_rel_line_to (cr, 0.0, -pos_box_size); /* upper left */ - cairo_close_path (cr); + context->set_line_width (2.0); + context->move_to (spos + (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 (); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po)); - cairo_stroke_preserve (cr); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(pf), UINT_RGBA_G_FLT(pf), UINT_RGBA_B_FLT(pf), UINT_RGBA_A_FLT(pf)); - cairo_fill (cr); + context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po)); + context->stroke_preserve (); + context->set_source_rgba (UINT_RGBA_R_FLT(pf), UINT_RGBA_G_FLT(pf), UINT_RGBA_B_FLT(pf), UINT_RGBA_A_FLT(pf)); + context->fill (); /* marker line */ - cairo_set_line_width (cr, 1.0); - cairo_move_to (cr, spos, pos_box_size+4); - cairo_rel_line_to (cr, 0, height - (pos_box_size+4)); - cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po)); - cairo_stroke (cr); + context->set_line_width (1.0); + context->move_to (spos, pos_box_size+4); + context->rel_line_to (0, half_lr_box+step_down); + context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po)); + context->stroke (); /* done */ - cairo_destroy (cr); return true; } bool MonoPanner::on_button_press_event (GdkEventButton* ev) { + if (PannerInterface::on_button_press_event (ev)) { + return true; + } + drag_start_x = ev->x; last_drag_x = ev->x; - - dragging = false; + + _dragging = false; + _tooltip.target_stop_drag (); accumulated_delta = 0; detented = false; @@ -271,7 +267,7 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) return true; } } - + if (ev->button != 1) { return false; } @@ -284,7 +280,7 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) return true; } - + if (ev->x <= width/3) { /* left side dbl click */ position_control->set_value (0); @@ -294,7 +290,8 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) position_control->set_value (0.5); } - dragging = false; + _dragging = false; + _tooltip.target_stop_drag (); } else if (ev->type == GDK_BUTTON_PRESS) { @@ -303,7 +300,9 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) return true; } - dragging = true; + _dragging = true; + _tooltip.target_start_drag (); + StartGesture (); } return true; @@ -312,21 +311,23 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) bool MonoPanner::on_button_release_event (GdkEventButton* ev) { + if (PannerInterface::on_button_release_event (ev)) { + return true; + } + if (ev->button != 1) { return false; } - dragging = false; + _dragging = false; + _tooltip.target_stop_drag (); 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); + _panner->reset (); + } else { + StopGesture (); } return true; @@ -338,7 +339,7 @@ MonoPanner::on_scroll_event (GdkEventScroll* ev) 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 step; - + if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { step = one_degree; } else { @@ -364,50 +365,26 @@ MonoPanner::on_scroll_event (GdkEventScroll* ev) bool MonoPanner::on_motion_notify_event (GdkEventMotion* ev) { - if (!dragging) { + if (!_dragging) { return false; } - 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); - - 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_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 (); - } - int w = get_width(); double delta = (ev->x - last_drag_x) / (double) w; - + /* create a detent close to the center */ - + if (!detented && ARDOUR::Panner::equivalent (position_control->get_value(), 0.5)) { detented = true; /* snap to center */ position_control->set_value (0.5); } - + if (detented) { accumulated_delta += delta; - + /* have we pulled far enough to escape ? */ - + if (fabs (accumulated_delta) >= 0.025) { position_control->set_value (position_control->get_value() + accumulated_delta); detented = false; @@ -435,10 +412,6 @@ MonoPanner::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_Left: pv -= step; @@ -448,32 +421,15 @@ MonoPanner::on_key_press_event (GdkEventKey* ev) pv += step; position_control->set_value (pv); break; - default: + case GDK_0: + case GDK_KP_0: + position_control->set_value (0.0); + break; + default: return false; } - - return true; -} - -bool -MonoPanner::on_key_release_event (GdkEventKey* ev) -{ - return false; -} - -bool -MonoPanner::on_enter_notify_event (GdkEventCrossing* ev) -{ - grab_focus (); - Keyboard::magic_widget_grab_focus (); - return false; -} -bool -MonoPanner::on_leave_notify_event (GdkEventCrossing*) -{ - Keyboard::magic_widget_drop_focus (); - return false; + return true; } void @@ -490,6 +446,12 @@ MonoPanner::set_colors () void MonoPanner::color_handler () { - set_colors (); - queue_draw (); + set_colors (); + queue_draw (); +} + +PannerEditor* +MonoPanner::editor () +{ + return new MonoPannerEditor (this); }