X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=a5084bf2c9c048c26cb89f82a8747ff4ec132269;hb=154f9825ff72d691ba550de573948424b81a09a6;hp=50ef135f415bf6338b097b6b8ac7adbcf08d5b66;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 50ef135f41..a5084bf2c9 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -20,418 +20,579 @@ #include #include "ardour/tempo.h" -#include "ardour_ui.h" +#include "canvas/rectangle.h" +#include "canvas/container.h" +#include "canvas/line.h" +#include "canvas/polygon.h" +#include "canvas/text.h" +#include "canvas/canvas.h" +#include "canvas/scroll_group.h" +#include "canvas/debug.h" + +#include "ui_config.h" /* * ardour_ui.h include was moved to the top of the list * due to a conflicting definition of 'Rect' between * Apple's MacTypes.h and GTK. + * + * Now that we are including ui_config.h and not ardour_ui.h + * the above comment may no longer apply and this comment + * can be removed and ui_config.h inclusion moved. */ #include "marker.h" #include "public_editor.h" #include "utils.h" -#include "canvas_impl.h" -#include "simpleline.h" +#include "rgb_macros.h" #include -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; +using namespace Gtkmm2ext; -Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, - Type type, nframes_t frame, bool handle_events) +PBD::Signal1 ArdourMarker::CatchDeletion; - : editor (ed), _parent(&parent), _type(type) -{ - double label_offset = 0; - - /* Shapes we use: - - Mark: - - (0,0) -> (6,0) - ^ | - | V - (0,5) (6,5) - \ / - (3,10) - - - TempoMark: - MeterMark: - - (3,0) - / \ - (0,5) -> (6,5) - ^ | - | V - (0,10)<-(6,10) - - - Start: - - 0,0\ - | \ - | \ 6,6 - | / - | / - 0,12 +static double marker_height = 13.0; - End: - - /12,0 - / | - / | - 6,6 | - \ | - \ | - \ | - 12,12 - - - TransportStart: - - 0,0 - | \ - | \ - | \ - | \ - | \ - 0,13 --- 13,13 - - TransportEnd: - - /13,0 - / | - / | - / | - / | - / | - 0,13 ------ 13,13 - - - PunchIn: - - 0,0 ------> 13,0 - | / - | / - | / - | / - | / - | / - 0,13 +void ArdourMarker::setup_sizes(const double timebar_height) +{ + marker_height = floor (timebar_height) - 2; +} - PunchOut +ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation, + Type type, samplepos_t sample, bool handle_events) + + : editor (ed) + , _parent (&parent) + , _track_canvas_line (0) + , _type (type) + , _selected (false) + , _shown (false) + , _line_shown (false) + , _color (rgba) + , _points_color (rgba) + , _left_label_limit (DBL_MAX) + , _right_label_limit (DBL_MAX) + , _label_offset (0) - 0,0 -->-13,0 - \ | - \ | - \ | - \ | - \ | - \ | - 13,13 +{ + const double MH = marker_height - .5; + const double M3 = std::max(1.f, rintf(3.f * UIConfiguration::instance().get_ui_scale())); + const double M6 = std::max(2.f, rintf(6.f * UIConfiguration::instance().get_ui_scale())); - */ + /* Shapes we use: + * + * Mark: + * + * (0,0) -> (6,0) + * ^ | + * | V + * (0,MH*.4) (6,MH*.4) + * \ / + * (3,MH) + * + * + * TempoMark: + * MeterMark: + * + * (3,0) + * / \ + * (0,MH*.6) (6,MH.*.6) + * ^ | + * | V + * (0,MH) <- (6,MH) + * + * + * SessionStart: + * RangeStart: + * + * 0,0\ + * | \ + * | \ 6,MH/2 + * | / + * | / + * 0,MH + * + * + * SessionEnd: + * RangeEnd: + * + * /12,0 + * / | + * 6,MH/2/ | + * \ | + * \ | + * \12,MH + * + * + * PunchIn: + * + * 0,0 ------> marker_height,0 + * | / + * | / + * | / + * | / + * | / + * | / + * 0,MH + * + * + * PunchOut + * + * 0,0 ------> MH,0 + * \ | + * \ | + * \ | + * \ | + * \ | + * \ | + * \ | + * MH,MH + * + */ switch (type) { case Mark: points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - points->push_back (Gnome::Art::Point (6.0, 0.0)); - points->push_back (Gnome::Art::Point (6.0, 5.0)); - points->push_back (Gnome::Art::Point (3.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 5.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); + points->push_back (ArdourCanvas::Duple ( M6, 0.0)); + points->push_back (ArdourCanvas::Duple ( M6, MH * .4)); + points->push_back (ArdourCanvas::Duple ( M3, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH * .4)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - shift = 3; - label_offset = 8.0; + _shift = 3; + _label_offset = 10.0; break; case Tempo: case Meter: - points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (3.0, 0.0)); - points->push_back (Gnome::Art::Point (6.0, 5.0)); - points->push_back (Gnome::Art::Point (6.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 5.0)); - points->push_back (Gnome::Art::Point (3.0, 0.0)); - - shift = 3; - label_offset = 8.0; + points->push_back (ArdourCanvas::Duple ( M3, 0.0)); + points->push_back (ArdourCanvas::Duple ( M6, MH * .6)); + points->push_back (ArdourCanvas::Duple ( M6, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH * .6)); + points->push_back (ArdourCanvas::Duple ( M3, 0.0)); + + _shift = 3; + _label_offset = 8.0; break; - case Start: - points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - points->push_back (Gnome::Art::Point (6.5, 6.5)); - points->push_back (Gnome::Art::Point (0.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); + case SessionStart: + case RangeStart: + points = new ArdourCanvas::Points (); + points->push_back (ArdourCanvas::Duple ( 0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (M6 + .5, MH * .5)); + points->push_back (ArdourCanvas::Duple ( 0.0, MH)); + points->push_back (ArdourCanvas::Duple ( 0.0, 0.0)); - shift = 0; - label_offset = 13.0; + _shift = 0; + _label_offset = 8.0; break; - case End: - points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (6.5, 6.5)); - points->push_back (Gnome::Art::Point (13.0, 0.0)); - points->push_back (Gnome::Art::Point (13.0, 13.0)); - points->push_back (Gnome::Art::Point (6.5, 6.5)); + case SessionEnd: + case RangeEnd: + points = new ArdourCanvas::Points (); // leaks + points->push_back (ArdourCanvas::Duple ( M6, 0.0)); + points->push_back (ArdourCanvas::Duple ( M6, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH * .5)); + points->push_back (ArdourCanvas::Duple ( M6, 0.0)); - shift = 13; - label_offset = 6.0; + _shift = M6; + _label_offset = 0.0; break; case LoopStart: points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - points->push_back (Gnome::Art::Point (13.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (MH, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - shift = 0; - label_offset = 12.0; + _shift = 0; + _label_offset = MH; break; case LoopEnd: points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (13.0, 0.0)); - points->push_back (Gnome::Art::Point (13.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 13.0)); - points->push_back (Gnome::Art::Point (13.0, 0.0)); + points->push_back (ArdourCanvas::Duple (MH, 0.0)); + points->push_back (ArdourCanvas::Duple (MH, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH)); + points->push_back (ArdourCanvas::Duple (MH, 0.0)); - shift = 13; - label_offset = 0.0; + _shift = MH; + _label_offset = 0.0; break; - case PunchIn: + case PunchIn: points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - points->push_back (Gnome::Art::Point (13.0, 0.0)); - points->push_back (Gnome::Art::Point (0.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (MH, 0.0)); + points->push_back (ArdourCanvas::Duple (0.0, MH)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - shift = 0; - label_offset = 13.0; + _shift = 0; + _label_offset = MH; break; - case PunchOut: + case PunchOut: points = new ArdourCanvas::Points (); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - points->push_back (Gnome::Art::Point (12.0, 0.0)); - points->push_back (Gnome::Art::Point (12.0, 12.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (MH, 0.0)); + points->push_back (ArdourCanvas::Duple (MH, MH)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - shift = 13; - label_offset = 0.0; + _shift = MH; + _label_offset = 0.0; break; } - frame_position = frame; - unit_position = editor.frame_to_unit (frame); + sample_position = sample; + unit_position = editor.sample_to_pixel (sample); + unit_position -= _shift; - /* adjust to properly locate the tip */ + group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 1)); +#ifdef CANVAS_DEBUG + group->name = string_compose ("Marker::group for %1", annotation); +#endif + + _name_background = new ArdourCanvas::Rectangle (group); +#ifdef CANVAS_DEBUG + _name_background->name = string_compose ("Marker::_name_background for %1", annotation); +#endif - unit_position -= shift; + /* adjust to properly locate the tip */ - group = new Group (parent, unit_position, 1.0); + mark = new ArdourCanvas::Polygon (group); + CANVAS_DEBUG_NAME (mark, string_compose ("Marker::mark for %1", annotation)); - mark = new Polygon (*group); - mark->property_points() = *points; - mark->property_fill_color_rgba() = rgba; - mark->property_outline_color_rgba() = rgba; - mark->property_width_pixels() = 1; + mark->set (*points); + set_color_rgba (rgba); /* setup name pixbuf sizes */ name_font = get_font_for_style (N_("MarkerText")); - Gtk::Window win; Gtk::Label foo; - win.add (foo); Glib::RefPtr layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */ int width; - int height; - layout->set_font_description (*name_font); - Gtkmm2ext::get_ink_pixel_size (layout, width, height); - name_height = height + 6; + layout->set_font_description (name_font); + Gtkmm2ext::get_ink_pixel_size (layout, width, name_height); - name_pixbuf = new ArdourCanvas::Pixbuf(*group); - name_pixbuf->property_x() = label_offset; + _name_item = new ArdourCanvas::Text (group); + CANVAS_DEBUG_NAME (_name_item, string_compose ("ArdourMarker::_name_item for %1", annotation)); + _name_item->set_font_description (name_font); + _name_item->set_color (RGBA_TO_UINT (0,0,0,255)); + _name_item->set_position (ArdourCanvas::Duple (_label_offset, (marker_height - name_height - 1) * .5 )); set_name (annotation.c_str()); - editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition)); + editor.ZoomChanged.connect (sigc::mem_fun (*this, &ArdourMarker::reposition)); + /* events will be handled by both the group and the mark itself, so + * make sure they can both be used to lookup this object. + */ + + group->set_data ("marker", this); mark->set_data ("marker", this); if (handle_events) { - group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); + group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); } - - line = 0; - } - -Marker::~Marker () +ArdourMarker::~ArdourMarker () { - drop_references (); + CatchDeletion (this); /* EMIT SIGNAL */ /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ - delete name_pixbuf; - delete mark; + delete group; + delete _track_canvas_line; delete points; - - delete line; - line = 0; } -void Marker::reparent(ArdourCanvas::Group & parent) +void ArdourMarker::reparent(ArdourCanvas::Container & parent) { - group->reparent(parent); + group->reparent (&parent); _parent = &parent; } +void +ArdourMarker::set_selected (bool s) +{ + _selected = s; + setup_line (); +} void -Marker::set_line_vpos (double pos, double height) +ArdourMarker::set_show_line (bool s) { - if (line) { - line->property_y1() = pos; - line->property_y2() = pos + height; - } + _line_shown = s; + setup_line (); } void -Marker::add_line (ArdourCanvas::Group* group, double y_origin, double initial_height) +ArdourMarker::setup_line () { - if (!line) { + if (_shown && (_selected || _line_shown)) { + + if (_track_canvas_line == 0) { + + _track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group()); + _track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); + } + + ArdourCanvas::Duple g = group->canvas_origin(); + ArdourCanvas::Duple d = _track_canvas_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0)); - line = new ArdourCanvas::SimpleLine (*group); - line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_EditPoint.get(); - line->property_x1() = unit_position + shift; - line->property_y1() = y_origin; - line->property_x2() = unit_position + shift; - line->property_y2() = y_origin + initial_height; + _track_canvas_line->set_x0 (d.x); + _track_canvas_line->set_x1 (d.x); + _track_canvas_line->set_y0 (d.y); + _track_canvas_line->set_y1 (ArdourCanvas::COORD_MAX); + _track_canvas_line->set_outline_color ( _selected ? UIConfiguration::instance().color ("entered marker") : _color ); + _track_canvas_line->raise_to_top (); + _track_canvas_line->show (); - line->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); + } else { + if (_track_canvas_line) { + _track_canvas_line->hide (); + } } +} - show_line (); +void +ArdourMarker::canvas_height_set (double h) +{ + _canvas_height = h; + setup_line (); +} + +ArdourCanvas::Item& +ArdourMarker::the_item() const +{ + return *group; } void -Marker::show_line () +ArdourMarker::set_name (const string& new_name) { - if (line) { - line->raise_to_top(); - line->show (); - } + _name = new_name; + + mark->set_tooltip(new_name); + _name_background->set_tooltip(new_name); + _name_item->set_tooltip(new_name); + + setup_name_display (); +} + +/** @return true if our label is on the left of the mark, otherwise false */ +bool +ArdourMarker::label_on_left () const +{ + return (_type == SessionEnd || _type == RangeEnd || _type == LoopEnd || _type == PunchOut); } void -Marker::hide_line () +ArdourMarker::setup_name_display () { - if (line) { - line->hide (); + double limit = DBL_MAX; + + if (label_on_left ()) { + limit = _left_label_limit; + } else { + limit = _right_label_limit; + } + + const float padding = std::max(2.f, rintf(2.f * UIConfiguration::instance().get_ui_scale())); + const double M3 = std::max(1.f, rintf(3.f * UIConfiguration::instance().get_ui_scale())); + + /* Work out how wide the name can be */ + int name_width = min ((double) pixel_width (_name, name_font) + padding, limit); + + if (name_width == 0) { + _name_item->hide (); + } else { + _name_item->show (); + + if (label_on_left ()) { + _name_item->set_x_position (-name_width); + } + + _name_item->clamp_width (name_width); + _name_item->set (_name); + + if (label_on_left ()) { + /* adjust right edge of background to fit text */ + _name_background->set_x0 (_name_item->position().x - padding); + _name_background->set_x1 (_name_item->position().x + name_width + _shift); + } else { + /* right edge remains at zero (group-relative). Add + * arbitrary 2 pixels of extra padding at the end + */ + switch (_type) { + case Tempo: + _name_item->hide (); + // tip's x-pos is at "M3", box is 2x marker's + _name_background->set_x0 (-M3); + _name_background->set_x1 (3 * M3); + break; + case Mark: + case Meter: + _name_background->set_x0 (M3); + _name_background->set_x1 (_name_item->position().x + name_width + padding); + break; + default: + _name_background->set_x0 (0); + _name_background->set_x1 (_name_item->position().x + name_width + padding); + break; + } + } } + + _name_background->set_y0 (0); + _name_background->set_y1 (marker_height + 1); } -ArdourCanvas::Item& -Marker::the_item() const +void +ArdourMarker::set_position (samplepos_t sample) { - return *mark; + unit_position = editor.sample_to_pixel (sample) - _shift; + group->set_x_position (unit_position); + setup_line (); + sample_position = sample; } void -Marker::set_name (const string& new_name) +ArdourMarker::reposition () { - int name_width = pixel_width (new_name, *name_font) + 2; + set_position (sample_position); +} - name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, name_font, name_width, name_height, Gdk::Color ("#000000")); +void +ArdourMarker::show () +{ + _shown = true; - if (_type == End || _type == LoopEnd || _type == PunchOut) { - name_pixbuf->property_x() = - (name_width); - } + group->show (); + setup_line (); } void -Marker::set_position (nframes64_t frame) +ArdourMarker::hide () { - double new_unit_position = editor.frame_to_unit (frame); - new_unit_position -= shift; - group->move (new_unit_position - unit_position, 0.0); - frame_position = frame; - unit_position = new_unit_position; - - if (line) { - line->property_x1() = unit_position + shift; - line->property_x2() = unit_position + shift; - } + _shown = false; + + group->hide (); + setup_line (); } void -Marker::reposition () +ArdourMarker::set_points_color (uint32_t c) { - set_position (frame_position); + _points_color = c; + mark->set_fill_color (_points_color); + mark->set_outline_color (_points_color); } void -Marker::show () +ArdourMarker::set_color_rgba (uint32_t c) { - group->show(); + _color = c; + mark->set_fill_color (_color); + mark->set_outline_color (_color); + + if (_track_canvas_line && !_selected) { + _track_canvas_line->set_outline_color (_color); + } + + _name_background->set_fill (true); + _name_background->set_fill_color (UINT_RGBA_CHANGE_A (_color, 0x70)); + _name_background->set_outline (false); } +/** Set the number of pixels that are available for a label to the left of the centre of this marker */ void -Marker::hide () +ArdourMarker::set_left_label_limit (double p) { - group->hide(); + /* Account for the size of the marker */ + _left_label_limit = p - marker_height; + if (_left_label_limit < 0) { + _left_label_limit = 0; + } + + if (label_on_left ()) { + setup_name_display (); + } } +/** Set the number of pixels that are available for a label to the right of the centre of this marker */ void -Marker::set_color_rgba (uint32_t color) +ArdourMarker::set_right_label_limit (double p) { - mark->property_fill_color_rgba() = color; - mark->property_outline_color_rgba() = color; + /* Account for the size of the marker */ + _right_label_limit = p - marker_height; + if (_right_label_limit < 0) { + _right_label_limit = 0; + } + + if (!label_on_left ()) { + setup_name_display (); + } } /***********************************************************************/ -TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, +TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text, ARDOUR::TempoSection& temp) - : Marker (editor, parent, rgba, text, Tempo, 0, false), + : ArdourMarker (editor, parent, rgba, text, Tempo, temp.sample(), false), _tempo (temp) { - set_position (_tempo.frame()); - group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), mark, this)); + group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), group, this)); } TempoMarker::~TempoMarker () { } +void +TempoMarker::update_height_mark (const double ratio) +{ + const double MH = marker_height - .5; + const double top = MH * (1 - ratio); + const double M3 = std::max(1.f, rintf(3.f * UIConfiguration::instance().get_ui_scale())); + const double M6 = std::max(2.f, rintf(6.f * UIConfiguration::instance().get_ui_scale())); + + delete points; + points = new ArdourCanvas::Points (); + points->push_back (ArdourCanvas::Duple ( M3, top)); + points->push_back (ArdourCanvas::Duple ( M6, min (top + (MH * .6), MH))); + points->push_back (ArdourCanvas::Duple ( M6, MH)); + points->push_back (ArdourCanvas::Duple (0.0, MH)); + points->push_back (ArdourCanvas::Duple (0.0, min (top + (MH * .6), MH))); + points->push_back (ArdourCanvas::Duple ( M3, top)); + + mark->set (*points); +} + /***********************************************************************/ -MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, +MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text, ARDOUR::MeterSection& m) - : Marker (editor, parent, rgba, text, Meter, 0, false), + : ArdourMarker (editor, parent, rgba, text, Meter, m.sample(), false), _meter (m) { - set_position (_meter.frame()); - group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), mark, this)); + group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), group, this)); } MeterMarker::~MeterMarker () { } -