/*
- Copyright (C) 2001 Paul Davis
+ Copyright (C) 2001 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
-#include <ardour/tempo.h>
+#include <sigc++/bind.h>
+#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 "canvas/canvas.h"
+#include "canvas/debug.h"
+
+#include "ardour_ui.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.
+ */
#include "marker.h"
#include "public_editor.h"
-#include "canvas-simpleline.h"
#include "utils.h"
+#include "rgb_macros.h"
+
+#include <gtkmm2ext/utils.h>
#include "i18n.h"
-Marker::Marker (PublicEditor& ed, GnomeCanvasGroup *parent, guint32 rgba, const string& annotation,
- Type type, gint (*callback)(GnomeCanvasItem *, GdkEvent *, gpointer), jack_nframes_t frame)
+using namespace std;
+using namespace ARDOUR;
+using namespace Gtkmm2ext;
- : editor (ed), _type(type)
-{
- double label_offset = 0;
+PBD::Signal1<void,Marker*> Marker::CatchDeletion;
+
+Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation,
+ Type type, framepos_t frame, bool handle_events)
+
+ : editor (ed)
+ , _parent (&parent)
+ , _time_bars_line (0)
+ , _track_canvas_line (0)
+ , _type (type)
+ , _selected (false)
+ , _shown (false)
+ , _line_shown (false)
+ , _color (rgba)
+ , _left_label_limit (DBL_MAX)
+ , _right_label_limit (DBL_MAX)
+ , _label_offset (0)
+{
/* Shapes we use:
Mark:
^ |
| V
(0,5) (6,5)
- \ /
- (3,10)
+ \ /
+ (3,13)
TempoMark:
Start:
- 0,0 -> 5,0
- | \
- | 10,5
- | /
- 0,10 -> 5,10
+ 0,0\
+ | \
+ | \ 6,6
+ | /
+ | /
+ 0,12
End:
- 5,0 -> 10,0
- / |
- 0,5 |
- \ |
- 5,10 <-10,10
-
-
- TransportStart:
-
- 0,0->3,0
- | |
- | |
- | |
- | 3,8 -> 7,8
- | |
- 0,11 ------ 7,11
-
- TransportEnd:
-
- 4,0->7,0
- | |
- | |
- | |
- 0,8 ---- 4,8 |
- | |
- 0,11 -------- 7,11
-
-
- PunchIn:
-
- 0,0 ------> 8,0
+ /12,0
+ / |
+ / |
+ 6,6 |
+ \ |
+ \ |
+ \ |
+ 12,12
+
+ PunchIn:
+
+ 0,0 ------> 13,0
| /
| /
- | 4,5
- | |
- | |
- | |
- 0,11->4,11
+ | /
+ | /
+ | /
+ | /
+ 0,13
PunchOut
- 0,0 -->-8,0
- \ |
+ 0,0 -->-13,0
+ \ |
\ |
- 4,5 |
- | |
- | |
- | |
- 4,11->8,11
-
-
+ \ |
+ \ |
+ \ |
+ \ |
+ 13,13
+
+
*/
switch (type) {
case Mark:
- points = gnome_canvas_points_new (6);
-
- points->coords[0] = 0.0;
- points->coords[1] = 0.0;
-
- points->coords[2] = 6.0;
- points->coords[3] = 0.0;
-
- points->coords[4] = 6.0;
- points->coords[5] = 5.0;
-
- points->coords[6] = 3.0;
- points->coords[7] = 10.0;
-
- points->coords[8] = 0.0;
- points->coords[9] = 5.0;
-
- points->coords[10] = 0.0;
- points->coords[11] = 0.0;
-
- shift = 3;
- label_offset = 8.0;
+ points = new ArdourCanvas::Points ();
+
+ 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;
break;
case Tempo:
case Meter:
- points = gnome_canvas_points_new (6);
-
- points->coords[0] = 3.0;
- points->coords[1] = 0.0;
-
- points->coords[2] = 6.0;
- points->coords[3] = 5.0;
-
- points->coords[4] = 6.0;
- points->coords[5] = 10.0;
-
- points->coords[6] = 0.0;
- points->coords[7] = 10.0;
-
- points->coords[8] = 0.0;
- points->coords[9] = 5.0;
-
- points->coords[10] = 3.0;
- points->coords[11] = 0.0;
-
- shift = 3;
- label_offset = 8.0;
+
+ points = new ArdourCanvas::Points ();
+ 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:
- points = gnome_canvas_points_new (6);
-
- points->coords[0] = 0.0;
- points->coords[1] = 0.0;
-
- points->coords[2] = 5.0;
- points->coords[3] = 0.0;
-
- points->coords[4] = 10.0;
- points->coords[5] = 5.0;
-
- points->coords[6] = 5.0;
- points->coords[7] = 10.0;
-
- points->coords[8] = 0.0;
- points->coords[9] = 10.0;
-
- points->coords[10] = 0.0;
- points->coords[11] = 0.0;
-
- shift = 10;
- label_offset = 12.0;
+ case SessionStart:
+ case RangeStart:
+
+ points = new ArdourCanvas::Points ();
+ 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;
break;
- case End:
- points = gnome_canvas_points_new (6);
-
- points->coords[0] = 5.0;
- points->coords[1] = 0.0;
-
- points->coords[2] = 10.0;
- points->coords[3] = 0.0;
-
- points->coords[4] = 10.0;
- points->coords[5] = 10.0;
-
- points->coords[6] = 5.0;
- points->coords[7] = 10.0;
-
- points->coords[8] = 0.0;
- points->coords[9] = 5.0;
-
- points->coords[10] = 5.0;
- points->coords[11] = 0.0;
-
- shift = 0;
- label_offset = 12.0;
+ case SessionEnd:
+ case RangeEnd:
+ points = new ArdourCanvas::Points ();
+ 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;
break;
case LoopStart:
- points = gnome_canvas_points_new (7);
-
- points->coords[0] = 0.0;
- points->coords[1] = 0.0;
-
- points->coords[2] = 4.0;
- points->coords[3] = 0.0;
-
- points->coords[4] = 4.0;
- points->coords[5] = 8.0;
-
- points->coords[6] = 8.0;
- points->coords[7] = 8.0;
-
- points->coords[8] = 8.0;
- points->coords[9] = 11.0;
-
- points->coords[10] = 0.0;
- points->coords[11] = 11.0;
-
- points->coords[12] = 0.0;
- points->coords[13] = 0.0;
-
- shift = 0;
- label_offset = 11.0;
+ points = new ArdourCanvas::Points ();
+ 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;
break;
case LoopEnd:
- points = gnome_canvas_points_new (7);
-
- points->coords[0] = 8.0;
- points->coords[1] = 0.0;
-
- points->coords[2] = 8.0;
- points->coords[3] = 11.0;
-
- points->coords[4] = 0.0;
- points->coords[5] = 11.0;
-
- points->coords[6] = 0.0;
- points->coords[7] = 8.0;
-
- points->coords[8] = 4.0;
- points->coords[9] = 8.0;
-
- points->coords[10] = 4.0;
- points->coords[11] = 0.0;
-
- points->coords[12] = 8.0;
- points->coords[13] = 0.0;
-
- shift = 8;
- label_offset = 11.0;
+ points = new ArdourCanvas::Points ();
+ 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;
break;
case PunchIn:
- points = gnome_canvas_points_new (6);
-
- points->coords[0] = 0.0;
- points->coords[1] = 0.0;
-
- points->coords[2] = 8.0;
- points->coords[3] = 0.0;
-
- points->coords[4] = 4.0;
- points->coords[5] = 4.0;
-
- points->coords[6] = 4.0;
- points->coords[7] = 11.0;
-
- points->coords[8] = 0.0;
- points->coords[9] = 11.0;
-
- points->coords[10] = 0.0;
- points->coords[11] = 0.0;
-
- shift = 0;
- label_offset = 10.0;
+ points = new ArdourCanvas::Points ();
+ 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;
break;
-
+
case PunchOut:
- points = gnome_canvas_points_new (6);
-
- points->coords[0] = 0.0;
- points->coords[1] = 0.0;
-
- points->coords[2] = 8.0;
- points->coords[3] = 0.0;
-
- points->coords[4] = 8.0;
- points->coords[5] = 11.0;
-
- points->coords[6] = 4.0;
- points->coords[7] = 11.0;
-
- points->coords[8] = 4.0;
- points->coords[9] = 4.0;
-
- points->coords[10] = 0.0;
- points->coords[11] = 0.0;
-
- shift = 8;
- label_offset = 11.0;
+ points = new ArdourCanvas::Points ();
+ 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;
break;
-
+
}
frame_position = frame;
- unit_position = editor.frame_to_unit (frame);
+ unit_position = editor.sample_to_pixel (frame);
+ unit_position -= _shift;
+
+ group = new ArdourCanvas::Group (&parent, ArdourCanvas::Duple (unit_position, 0));
+#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
/* adjust to properly locate the tip */
- unit_position -= shift;
-
- group = gnome_canvas_item_new (parent,
- gnome_canvas_group_get_type(),
- "x", unit_position,
- "y", 1.0,
- NULL);
-
- // cerr << "set mark al points, nc = " << points->num_points << endl;
- mark = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group),
- gnome_canvas_polygon_get_type(),
- "points", points,
- "fill_color_rgba", rgba,
- "outline_color", "black",
- NULL);
-
- Pango::FontDescription font = get_font_for_style (N_("MarkerText"));
-
- text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group),
- gnome_canvas_text_get_type (),
- "text", annotation.c_str(),
- "x", label_offset,
- "y", 0.0,
- "fontdesc", font,
- "anchor", GTK_ANCHOR_NW,
- "fill_color", "black",
- NULL);
-
- gtk_object_set_data (GTK_OBJECT(group), "marker", this);
- gtk_signal_connect (GTK_OBJECT(group), "event", (GtkSignalFunc) callback, &editor);
-
- editor.ZoomChanged.connect (mem_fun(*this, &Marker::reposition));
+ mark = new ArdourCanvas::Polygon (group);
+ CANVAS_DEBUG_NAME (mark, string_compose ("Marker::mark for %1", annotation));
+
+ mark->set (*points);
+ set_color_rgba (rgba);
+
+ /* setup name pixbuf sizes */
+ name_font = get_font_for_style (N_("MarkerText"));
+
+ Gtk::Label foo;
+
+ Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
+ int width;
+
+ layout->set_font_description (name_font);
+ Gtkmm2ext::get_ink_pixel_size (layout, width, name_height);
+
+ _name_item = new ArdourCanvas::Text (group);
+ CANVAS_DEBUG_NAME (_name_item, string_compose ("Marker::_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, (13.0 / 2.0) - (name_height / 2.0) - 2.0));
+
+ set_name (annotation.c_str());
+
+ editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::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->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
+ }
}
Marker::~Marker ()
{
- /* destroying the group destroys its contents */
- gtk_object_destroy (GTK_OBJECT(group));
- gnome_canvas_points_unref (points);
+ CatchDeletion (this); /* EMIT SIGNAL */
+
+ /* destroying the parent group destroys its contents, namely any polygons etc. that we added */
+ delete group;
+ delete _time_bars_line;
+ delete _track_canvas_line;
+}
+
+void Marker::reparent(ArdourCanvas::Group & parent)
+{
+ group->reparent (&parent);
+ _parent = &parent;
+}
+
+void
+Marker::set_selected (bool s)
+{
+ _selected = s;
+ setup_line ();
+}
+
+void
+Marker::set_show_line (bool s)
+{
+ _line_shown = s;
+ setup_line ();
+}
+
+void
+Marker::setup_line ()
+{
+ if (_shown && (_selected || _line_shown)) {
+
+ if (_time_bars_line == 0) {
+
+ _time_bars_line = new ArdourCanvas::Line (editor.get_time_bars_group());
+ _time_bars_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
+ _time_bars_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
+
+ _track_canvas_line = new ArdourCanvas::Line (editor.get_track_canvas_group());
+ _track_canvas_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
+ _track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
+ }
+
+ ArdourCanvas::Duple g = group->item_to_canvas (ArdourCanvas::Duple (0, 0));
+ ArdourCanvas::Duple d = _time_bars_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0));
+
+ _time_bars_line->set_x0 (d.x);
+ _time_bars_line->set_x1 (d.x);
+ _time_bars_line->set_y0 (d.y);
+ _time_bars_line->set_y1 (ArdourCanvas::COORD_MAX);
+ _time_bars_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color);
+ _time_bars_line->raise_to_top ();
+ _time_bars_line->show ();
+
+ d = _track_canvas_line->canvas_to_item (ArdourCanvas::Duple (g.x + _shift, 0));
+ _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 ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color);
+ _track_canvas_line->raise_to_top ();
+ _track_canvas_line->show ();
+
+ } else {
+ if (_time_bars_line) {
+ _time_bars_line->hide ();
+ _track_canvas_line->hide ();
+ }
+ }
}
void
-Marker::set_name (const string& name)
+Marker::canvas_height_set (double h)
+{
+ _canvas_height = h;
+ setup_line ();
+}
+
+ArdourCanvas::Item&
+Marker::the_item() const
{
- gnome_canvas_item_set (text, "text", name.c_str(), NULL);
+ return *group;
}
void
-Marker::set_position (jack_nframes_t frame)
+Marker::set_name (const string& new_name)
{
- double new_unit_position = editor.frame_to_unit (frame);
- new_unit_position -= shift;
- gnome_canvas_item_move (group, new_unit_position - unit_position, 0.0);
+ _name = new_name;
+
+ setup_name_display ();
+}
+
+/** @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::setup_name_display ()
+{
+ 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 (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.sample_to_pixel (frame) - _shift;
+ group->set_x_position (unit_position);
+ setup_line ();
frame_position = frame;
- unit_position = new_unit_position;
}
void
Marker::reposition ()
{
set_position (frame_position);
-}
+}
void
Marker::show ()
{
- gnome_canvas_item_show (group);
+ _shown = true;
+
+ group->show ();
+ setup_line ();
}
void
Marker::hide ()
{
- gnome_canvas_item_hide (group);
+ _shown = false;
+
+ group->hide ();
+ setup_line ();
+}
+
+void
+Marker::set_color_rgba (uint32_t c)
+{
+ _color = c;
+ mark->set_fill_color (_color);
+ mark->set_outline_color (_color);
+
+ if (_time_bars_line && !_selected) {
+ _time_bars_line->set_outline_color (_color);
+ _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_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_color_rgba (uint32_t color)
+Marker::set_right_label_limit (double p)
{
- gnome_canvas_item_set (mark, "fill_color_rgba", color, NULL);
+ /* 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 ();
+ }
}
/***********************************************************************/
-TempoMarker::TempoMarker (PublicEditor& editor, GnomeCanvasGroup *parent, guint32 rgba, const string& text,
- ARDOUR::TempoSection& temp,
- gint (*callback)(GnomeCanvasItem *, GdkEvent *, gpointer))
- : Marker (editor, parent, rgba, text, Tempo, callback, 0),
+TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text,
+ ARDOUR::TempoSection& temp)
+ : Marker (editor, parent, rgba, text, Tempo, 0, false),
_tempo (temp)
{
set_position (_tempo.frame());
- gtk_object_set_data (GTK_OBJECT(group), "tempo_marker", this);
+ group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), group, this));
}
TempoMarker::~TempoMarker ()
/***********************************************************************/
-MeterMarker::MeterMarker (PublicEditor& editor, GnomeCanvasGroup *parent, guint32 rgba, const string& text,
- ARDOUR::MeterSection& m,
- gint (*callback)(GnomeCanvasItem *, GdkEvent *, gpointer))
- : Marker (editor, parent, rgba, text, Meter, callback, 0),
+MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text,
+ ARDOUR::MeterSection& m)
+ : Marker (editor, parent, rgba, text, Meter, 0, false),
_meter (m)
{
set_position (_meter.frame());
- gtk_object_set_data (GTK_OBJECT(group), "meter_marker", this);
+ group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), group, this));
}
MeterMarker::~MeterMarker ()
{
}
+
projects / ardour.git / blobdiff