X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=875fd4cdf39e32bd95b205f2ed879e984e7b2c5a;hb=053eaf77fde7639d4e200d36a9db99b2d4fc615b;hp=f4848228f8286ac13e89263ffea60d2e92069fbd;hpb=c83389b8ec5fef9553a401e6123b7e55702af9e2;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index f4848228f8..875fd4cdf3 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -19,6 +19,11 @@ #include #include "ardour/tempo.h" +#include "canvas/rectangle.h" +#include "canvas/group.h" +#include "canvas/line.h" +#include "canvas/polygon.h" +#include "canvas/text.h" #include "ardour_ui.h" /* @@ -30,8 +35,7 @@ #include "marker.h" #include "public_editor.h" #include "utils.h" -#include "canvas_impl.h" -#include "simpleline.h" +#include "rgb_macros.h" #include @@ -39,16 +43,27 @@ using namespace std; using namespace ARDOUR; +using namespace Gtkmm2ext; PBD::Signal1 Marker::CatchDeletion; Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, - Type type, nframes_t frame, bool handle_events) + Type type, framepos_t frame, bool handle_events) + + : editor (ed) + , _parent (&parent) + , _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) - : editor (ed), _parent(&parent), _type(type) { - double label_offset = 0; - /* Shapes we use: Mark: @@ -58,7 +73,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con | V (0,5) (6,5) \ / - (3,10) + (3,13) TempoMark: @@ -92,29 +107,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con \ | 12,12 - - TransportStart: - - 0,0 - | \ - | \ - | \ - | \ - | \ - 0,13 --- 13,13 - - TransportEnd: - - /13,0 - / | - / | - / | - / | - / | - 0,13 ------ 13,13 - - - PunchIn: + PunchIn: 0,0 ------> 13,0 | / @@ -143,210 +136,234 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con 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 (6.0, 0.0)); + points->push_back (ArdourCanvas::Duple (6.0, 5.0)); + points->push_back (ArdourCanvas::Duple (3.0, 13.0)); + points->push_back (ArdourCanvas::Duple (0.0, 5.0)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - shift = 3; - label_offset = 8.0; + _shift = 3; + _label_offset = 8.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 (3.0, 0.0)); + points->push_back (ArdourCanvas::Duple (6.0, 5.0)); + points->push_back (ArdourCanvas::Duple (6.0, 10.0)); + points->push_back (ArdourCanvas::Duple (0.0, 10.0)); + points->push_back (ArdourCanvas::Duple (0.0, 5.0)); + points->push_back (ArdourCanvas::Duple (3.0, 0.0)); + + _shift = 3; + _label_offset = 8.0; break; - case Start: + 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->push_back (ArdourCanvas::Duple (0.0, 0.0)); + points->push_back (ArdourCanvas::Duple (6.5, 6.5)); + points->push_back (ArdourCanvas::Duple (0.0, 13.0)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - shift = 0; - label_offset = 13.0; + _shift = 0; + _label_offset = 13.0; break; - case End: + 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 (6.5, 6.5)); + points->push_back (ArdourCanvas::Duple (13.0, 0.0)); + points->push_back (ArdourCanvas::Duple (13.0, 13.0)); + points->push_back (ArdourCanvas::Duple (6.5, 6.5)); - shift = 13; - label_offset = 6.0; + _shift = 13; + _label_offset = 6.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 (13.0, 13.0)); + points->push_back (ArdourCanvas::Duple (0.0, 13.0)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - shift = 0; - label_offset = 12.0; + _shift = 0; + _label_offset = 12.0; 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 (13.0, 0.0)); + points->push_back (ArdourCanvas::Duple (13.0, 13.0)); + points->push_back (ArdourCanvas::Duple (0.0, 13.0)); + points->push_back (ArdourCanvas::Duple (13.0, 0.0)); - shift = 13; - label_offset = 0.0; + _shift = 13; + _label_offset = 0.0; break; 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 (13.0, 0.0)); + points->push_back (ArdourCanvas::Duple (0.0, 13.0)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - shift = 0; - label_offset = 13.0; + _shift = 0; + _label_offset = 13.0; break; 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 (12.0, 0.0)); + points->push_back (ArdourCanvas::Duple (12.0, 12.0)); + points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - shift = 13; - label_offset = 0.0; + _shift = 13; + _label_offset = 0.0; break; } frame_position = frame; unit_position = editor.frame_to_unit (frame); + unit_position -= _shift; - /* adjust to properly locate the tip */ + group = new ArdourCanvas::Group (&parent, ArdourCanvas::Duple (unit_position, 0)); +#ifdef CANVAS_DEBUG + group->name = string_compose ("Marker::group for %1", annotation); +#endif - unit_position -= shift; + _name_background = new ArdourCanvas::Rectangle (group); +#ifdef CANVAS_DEBUG + _name_background->name = string_compose ("Marker::_name_background for %1", annotation); +#endif + _name_background->set_outline_width (1); - group = new Group (parent, unit_position, 1.0); + /* adjust to properly locate the tip */ - 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 = new ArdourCanvas::Polygon (group); +#ifdef CANVAS_DEBUG + mark->name = string_compose ("Marker::mark for %1", annotation); +#endif + mark->set (*points); + set_color_rgba (rgba); + mark->set_outline_width (1); /* 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_item = new ArdourCanvas::Text (group); + _name_item->set_font_description (name_font); + _name_item->set_color (RGBA_TO_UINT (0,0,0,255)); - name_pixbuf = new ArdourCanvas::Pixbuf(*group); - name_pixbuf->property_x() = label_offset; +#ifdef CANVAS_DEBUG + _name_item->name = string_compose ("Marker::_name_item for %1", annotation); +#endif + _name_item->set_position (ArdourCanvas::Duple (_label_offset, 13 / 2 - name_height / 2)); set_name (annotation.c_str()); editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition)); - mark->set_data ("marker", this); + /* 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 () { CatchDeletion (this); /* EMIT SIGNAL */ /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ - delete name_pixbuf; - delete mark; - delete points; - - delete line; - line = 0; + delete group; + delete _line; } void Marker::reparent(ArdourCanvas::Group & parent) { - group->reparent(parent); + group->reparent (&parent); _parent = &parent; } +void +Marker::set_selected (bool s) +{ + _selected = s; + setup_line (); +} void -Marker::set_line_vpos (double pos, double height) +Marker::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) +Marker::setup_line () { - if (!line) { + if (_shown && (_selected || _line_shown)) { - 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; + if (_line == 0) { - line->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); - } + _line = new ArdourCanvas::Line (group); + _line->set_outline_color (ARDOUR_UI::config()->canvasvar_EditPoint.get()); - show_line (); -} + _line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); + } -void -Marker::show_line () -{ - if (line) { - line->raise_to_top(); - line->show (); + /* 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->item_to_canvas (xo, yo); + + _line->set_x0 (_shift); + _line->set_x1 (_shift); + _line->set_y0 (-yo); // zero in world coordinates, negative in item/parent coordinate space + _line->set_y1 (-yo + _canvas_height); + + _line->set_outline_color (_selected ? ARDOUR_UI::config()->canvasvar_EditPoint.get() : _color); + _line->raise_to_top (); + _line->show (); + + } else { + if (_line) { + _line->hide (); + } } } void -Marker::hide_line () +Marker::canvas_height_set (double h) { - if (line) { - line->hide (); - } + _canvas_height = h; + setup_line (); } ArdourCanvas::Item& @@ -358,28 +375,63 @@ Marker::the_item() const void Marker::set_name (const string& new_name) { - int name_width = pixel_width (new_name, *name_font) + 2; + _name = new_name; - name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, name_font, name_width, name_height, Gdk::Color ("#000000")); + setup_name_display (); +} - if (_type == End || _type == LoopEnd || _type == PunchOut) { - name_pixbuf->property_x() = - (name_width); - } +/** @return true if our label is on the left of the mark, otherwise false */ +bool +Marker::label_on_left () const +{ + return (_type == SessionEnd || _type == RangeEnd || _type == LoopEnd || _type == PunchOut); } void -Marker::set_position (nframes64_t frame) +Marker::setup_name_display () { - 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; + double limit = DBL_MAX; + + if (label_on_left ()) { + limit = _left_label_limit; + } else { + limit = _right_label_limit; + } + + /* Work out how wide the name can be */ + int name_width = min ((double) pixel_width (_name, name_font) + 2, limit); - if (line) { - line->property_x1() = unit_position + shift; - line->property_x2() = unit_position + shift; + if (name_width == 0) { + name_width = 1; } + + if (label_on_left ()) { + _name_item->set_x_position (-name_width); + } + + _name_item->set (_name); + + // CAIROCANVAS + // need to "clip" name to name_width and name_height + + if (label_on_left ()) { + _name_background->set_x0 (_name_item->position().x - 2); + _name_background->set_x1 (_name_item->position().x + name_width + _shift); + } else { + _name_background->set_x0 (_name_item->position().x - _label_offset + 2); + _name_background->set_x1 (_name_item->position().x + name_width); + } + + _name_background->set_y0 (0); + _name_background->set_y1 (13); +} + +void +Marker::set_position (framepos_t frame) +{ + unit_position = editor.frame_to_unit (frame) - _shift; + group->set_x_position (unit_position); + frame_position = frame; } void @@ -391,20 +443,65 @@ Marker::reposition () void Marker::show () { - group->show(); + _shown = true; + + group->show (); + setup_line (); } void Marker::hide () { - group->hide(); + _shown = false; + + group->hide (); + setup_line (); } void -Marker::set_color_rgba (uint32_t color) +Marker::set_color_rgba (uint32_t c) { - mark->property_fill_color_rgba() = color; - mark->property_outline_color_rgba() = color; + _color = c; + mark->set_fill_color (_color); + mark->set_outline_color (_color); + + if (_line && !_selected) { + _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_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) +{ + /* Account for the size of the marker */ + _left_label_limit = p - 13; + 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_right_label_limit (double p) +{ + /* Account for the size of the marker */ + _right_label_limit = p - 13; + if (_right_label_limit < 0) { + _right_label_limit = 0; + } + + if (!label_on_left ()) { + setup_name_display (); + } } /***********************************************************************/ @@ -415,7 +512,7 @@ TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, gui _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), mark, this)); } TempoMarker::~TempoMarker () @@ -430,7 +527,7 @@ MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, gui _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), mark, this)); } MeterMarker::~MeterMarker ()