X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=2d9da96b0fc3afd9a97d703bae64b37d87245c49;hb=234b06a18cf3e8c07bc44fb4f8c1218e17fb65f1;hp=2492d1a3486d86aa1489cf690a73ed48ec9f3e9f;hpb=d63e8ba0e8eeda4f53684bbd20f027c0cd6f7c89;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 2492d1a348..2d9da96b0f 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -20,19 +20,29 @@ #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 "simplerect.h" #include "rgb_macros.h" #include @@ -41,120 +51,134 @@ using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace Gtkmm2ext; -PBD::Signal1 Marker::CatchDeletion; +PBD::Signal1 ArdourMarker::CatchDeletion; -Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, +static double marker_height = 13.0; + +void ArdourMarker::setup_sizes(const double timebar_height) +{ + marker_height = floor (timebar_height) - 2; +} + +ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation, Type type, framepos_t frame, bool handle_events) : editor (ed) , _parent (&parent) - , _line (0) + , _track_canvas_line (0) , _type (type) , _selected (false) , _shown (false) , _line_shown (false) - , _canvas_height (0) , _color (rgba) , _left_label_limit (DBL_MAX) , _right_label_limit (DBL_MAX) , _label_offset (0) { - /* Shapes we use: - - Mark: - - (0,0) -> (6,0) - ^ | - | V - (0,5) (6,5) - \ / - (3,13) - - - TempoMark: - MeterMark: - - (3,0) - / \ - (0,5) -> (6,5) - ^ | - | V - (0,10)<-(6,10) - - - Start: - 0,0\ - | \ - | \ 6,6 - | / - | / - 0,12 + const double MH = marker_height - 1; + 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())); - End: - - /12,0 - / | - / | - 6,6 | - \ | - \ | - \ | - 12,12 - - PunchIn: - - 0,0 ------> 13,0 - | / - | / - | / - | / - | / - | / - 0,13 - - PunchOut - - 0,0 -->-13,0 - \ | - \ | - \ | - \ | - \ | - \ | - 13,13 - - - */ + /* 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,marker_height + * + * + * PunchOut + * + * 0,0 ------> marker_height,0 + * \ | + * \ | + * \ | + * \ | + * \ | + * \ | + * \ | + * marker_height,marker_height + * + */ 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, 13.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; + _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)); + 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; @@ -162,90 +186,95 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con case SessionStart: case RangeStart: - - 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)); + 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; + _label_offset = 8.0; break; case SessionEnd: case RangeEnd: 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)); + 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 (marker_height, marker_height)); + points->push_back (ArdourCanvas::Duple (0.0, marker_height)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); _shift = 0; - _label_offset = 12.0; + _label_offset = marker_height; 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 (marker_height, 0.0)); + points->push_back (ArdourCanvas::Duple (marker_height, marker_height)); + points->push_back (ArdourCanvas::Duple (0.0, marker_height)); + points->push_back (ArdourCanvas::Duple (marker_height, 0.0)); - _shift = 13; + _shift = marker_height; _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 (marker_height, 0.0)); + points->push_back (ArdourCanvas::Duple (0.0, marker_height)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); _shift = 0; - _label_offset = 13.0; + _label_offset = marker_height; 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 (marker_height, 0.0)); + points->push_back (ArdourCanvas::Duple (marker_height, marker_height)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - _shift = 13; + _shift = marker_height; _label_offset = 0.0; break; } frame_position = frame; - unit_position = editor.frame_to_unit (frame); + unit_position = editor.sample_to_pixel (frame); unit_position -= _shift; - group = new Group (parent, unit_position, 0); + group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 0)); +#ifdef CANVAS_DEBUG + group->name = string_compose ("Marker::group for %1", annotation); +#endif - _name_background = new ArdourCanvas::SimpleRect (*group); - _name_background->property_outline_pixels() = 1; + _name_background = new ArdourCanvas::Rectangle (group); +#ifdef CANVAS_DEBUG + _name_background->name = string_compose ("Marker::_name_background for %1", annotation); +#endif /* adjust to properly locate the tip */ - mark = new ArdourCanvas::Polygon (*group); - mark->property_points() = *points; + mark = new ArdourCanvas::Polygon (group); + CANVAS_DEBUG_NAME (mark, string_compose ("Marker::mark for %1", annotation)); + + mark->set (*points); set_color_rgba (rgba); - mark->property_width_pixels() = 1; /* setup name pixbuf sizes */ name_font = get_font_for_style (N_("MarkerText")); @@ -258,103 +287,102 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con 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_pixbuf->property_y() = (13/2) - (name_height/2); + _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); - _name_background->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)); } - } - -Marker::~Marker () +ArdourMarker::~ArdourMarker () { CatchDeletion (this); /* EMIT SIGNAL */ /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ delete group; - delete _line; + delete _track_canvas_line; } -void Marker::reparent(ArdourCanvas::Group & parent) +void ArdourMarker::reparent(ArdourCanvas::Container & parent) { - group->reparent (parent); + group->reparent (&parent); _parent = &parent; } void -Marker::set_selected (bool s) +ArdourMarker::set_selected (bool s) { _selected = s; setup_line (); } void -Marker::set_show_line (bool s) +ArdourMarker::set_show_line (bool s) { _line_shown = s; setup_line (); } void -Marker::setup_line () +ArdourMarker::setup_line () { if (_shown && (_selected || _line_shown)) { - if (_line == 0) { - - _line = new ArdourCanvas::SimpleLine (*group); - _line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_EditPoint.get(); + if (_track_canvas_line == 0) { - _line->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); + _track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group()); + _track_canvas_line->set_outline_color (UIConfiguration::instance().color ("edit point")); + _track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); } - /* work out where to start the line from so that it extends from the top of the canvas */ - double yo = 0; - double xo = 0; - - _line->i2w (xo, yo); + ArdourCanvas::Duple g = group->canvas_origin(); + ArdourCanvas::Duple d = _track_canvas_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0)); - _line->property_x1() = _shift; - _line->property_x2() = _shift; - _line->property_y1() = -yo; // zero in world coordinates, negative in item/parent coordinate space - _line->property_y2() = -yo + _canvas_height; - - _line->property_color_rgba() = _selected ? ARDOUR_UI::config()->canvasvar_EditPoint.get() : _color; - _line->raise_to_top (); - _line->show (); + _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 ("edit point") : _color); + _track_canvas_line->raise_to_top (); + _track_canvas_line->show (); } else { - if (_line) { - _line->hide (); + if (_track_canvas_line) { + _track_canvas_line->hide (); } } } void -Marker::canvas_height_set (double h) +ArdourMarker::canvas_height_set (double h) { _canvas_height = h; setup_line (); } ArdourCanvas::Item& -Marker::the_item() const +ArdourMarker::the_item() const { - return *mark; + return *group; } void -Marker::set_name (const string& new_name) +ArdourMarker::set_name (const string& new_name) { _name = new_name; @@ -363,13 +391,13 @@ Marker::set_name (const string& new_name) /** @return true if our label is on the left of the mark, otherwise false */ bool -Marker::label_on_left () const +ArdourMarker::label_on_left () const { return (_type == SessionEnd || _type == RangeEnd || _type == LoopEnd || _type == PunchOut); } void -Marker::setup_name_display () +ArdourMarker::setup_name_display () { double limit = DBL_MAX; @@ -379,48 +407,57 @@ Marker::setup_name_display () limit = _right_label_limit; } + const float padding = std::max(2.f, rintf(2.f * UIConfiguration::instance().get_ui_scale())); + /* Work out how wide the name can be */ - int name_width = min ((double) pixel_width (_name, name_font) + 2, limit); - if (name_width == 0) { - name_width = 1; - } + int name_width = min ((double) pixel_width (_name, name_font) + padding, limit); - if (label_on_left ()) { - name_pixbuf->property_x() = -name_width; - } + if (name_width == 0) { + _name_item->hide (); + } else { + _name_item->show (); - name_pixbuf->property_pixbuf() = pixbuf_from_string (_name, name_font, name_width, name_height, Gdk::Color ("#000000")); + if (label_on_left ()) { + _name_item->set_x_position (-name_width); + } - if (label_on_left ()) { - _name_background->property_x1() = name_pixbuf->property_x() - 2; - _name_background->property_x2() = name_pixbuf->property_x() + name_width + _shift; - } else { - _name_background->property_x1() = name_pixbuf->property_x() - _label_offset + 2; - _name_background->property_x2() = name_pixbuf->property_x() + 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 + */ + _name_background->set_x1 (_name_item->position().x + name_width + padding); + } } - _name_background->property_y1() = 0; - _name_background->property_y2() = 13; + _name_background->set_y0 (0); + /* unfortunate hard coding - this has to * match the marker bars height */ + _name_background->set_y1 (marker_height + 1.0); } void -Marker::set_position (framepos_t frame) +ArdourMarker::set_position (framepos_t frame) { - double new_unit_position = editor.frame_to_unit (frame); - new_unit_position -= _shift; - group->move (new_unit_position - unit_position, 0.0); + unit_position = editor.sample_to_pixel (frame) - _shift; + group->set_x_position (unit_position); + setup_line (); frame_position = frame; - unit_position = new_unit_position; } void -Marker::reposition () +ArdourMarker::reposition () { set_position (frame_position); } void -Marker::show () +ArdourMarker::show () { _shown = true; @@ -429,7 +466,7 @@ Marker::show () } void -Marker::hide () +ArdourMarker::hide () { _shown = false; @@ -438,27 +475,27 @@ Marker::hide () } void -Marker::set_color_rgba (uint32_t c) +ArdourMarker::set_color_rgba (uint32_t c) { _color = c; - mark->property_fill_color_rgba() = _color; - mark->property_outline_color_rgba() = _color; + mark->set_fill_color (_color); + mark->set_outline_color (_color); - if (_line && !_selected) { - _line->property_color_rgba() = _color; + if (_track_canvas_line && !_selected) { + _track_canvas_line->set_outline_color (_color); } - _name_background->property_fill() = true; - _name_background->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (_color, 0x70); - _name_background->property_outline_color_rgba() = _color; + _name_background->set_fill (true); + _name_background->set_fill_color (UINT_RGBA_CHANGE_A (_color, 0x70)); + _name_background->set_outline_color (_color); } /** Set the number of pixels that are available for a label to the left of the centre of this marker */ void -Marker::set_left_label_limit (double p) +ArdourMarker::set_left_label_limit (double p) { /* Account for the size of the marker */ - _left_label_limit = p - 13; + _left_label_limit = p - marker_height; if (_left_label_limit < 0) { _left_label_limit = 0; } @@ -470,10 +507,10 @@ Marker::set_left_label_limit (double p) /** Set the number of pixels that are available for a label to the right of the centre of this marker */ void -Marker::set_right_label_limit (double p) +ArdourMarker::set_right_label_limit (double p) { /* Account for the size of the marker */ - _right_label_limit = p - 13; + _right_label_limit = p - marker_height; if (_right_label_limit < 0) { _right_label_limit = 0; } @@ -485,13 +522,13 @@ Marker::set_right_label_limit (double p) /***********************************************************************/ -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, 0, 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 () @@ -500,13 +537,13 @@ TempoMarker::~TempoMarker () /***********************************************************************/ -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, 0, 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 ()