using namespace std;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtk;
using namespace Glib;
_track_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, vertical_adjustment);
_track_canvas = _track_canvas_viewport->canvas ();
+ _track_canvas->set_background_color (ARDOUR_UI::config()->color ("arrange base"));
+
+ /* scroll group for items that should not automatically scroll
+ * (e.g verbose cursor). It shares the canvas coordinate space.
+ */
+ no_scroll_group = new ArdourCanvas::Container (_track_canvas->root());
+
ArdourCanvas::ScrollGroup* hsg;
ArdourCanvas::ScrollGroup* hg;
ArdourCanvas::ScrollGroup* vg;
}
/*a group to hold global rects like punch/loop indicators */
- global_rect_group = new ArdourCanvas::Layout (hv_scroll_group);
+ global_rect_group = new ArdourCanvas::Container (hv_scroll_group);
CANVAS_DEBUG_NAME (global_rect_group, "global rect group");
transport_loop_range_rect = new ArdourCanvas::Rectangle (global_rect_group, ArdourCanvas::Rect (0.0, 0.0, 0.0, ArdourCanvas::COORD_MAX));
transport_punch_range_rect->hide();
/*a group to hold time (measure) lines */
- time_line_group = new ArdourCanvas::Layout (hv_scroll_group);
+ time_line_group = new ArdourCanvas::Container (hv_scroll_group);
CANVAS_DEBUG_NAME (time_line_group, "time line group");
- _trackview_group = new ArdourCanvas::Layout (hv_scroll_group);
+ _trackview_group = new ArdourCanvas::Container (hv_scroll_group);
CANVAS_DEBUG_NAME (_trackview_group, "Canvas TrackViews");
- // used to show zoom mode active zooming
- zoom_rect = new ArdourCanvas::Rectangle (hv_scroll_group, ArdourCanvas::Rect (0.0, 0.0, 0.0, 0.0));
- zoom_rect->hide();
- zoom_rect->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0));
-
// used as rubberband rect
rubberband_rect = new ArdourCanvas::Rectangle (hv_scroll_group, ArdourCanvas::Rect (0.0, 0.0, 0.0, 0.0));
rubberband_rect->hide();
/* a group to hold stuff while it gets dragged around. Must be the
* uppermost (last) group with hv_scroll_group as a parent
*/
- _drag_motion_group = new ArdourCanvas::Layout (hv_scroll_group);
+ _drag_motion_group = new ArdourCanvas::Container (hv_scroll_group);
CANVAS_DEBUG_NAME (_drag_motion_group, "Canvas Drag Motion");
/* TIME BAR CANVAS */
- _time_markers_group = new ArdourCanvas::Layout (h_scroll_group);
+ _time_markers_group = new ArdourCanvas::Container (h_scroll_group);
CANVAS_DEBUG_NAME (_time_markers_group, "time bars");
- cd_marker_group = new ArdourCanvas::Layout (_time_markers_group, ArdourCanvas::Duple (0.0, 0.0));
+ cd_marker_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple (0.0, 0.0));
CANVAS_DEBUG_NAME (cd_marker_group, "cd marker group");
/* the vide is temporarily placed a the same location as the
cd_marker_group, but is moved later.
*/
- videotl_group = new ArdourCanvas::Layout (_time_markers_group, ArdourCanvas::Duple(0.0, 0.0));
+ videotl_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple(0.0, 0.0));
CANVAS_DEBUG_NAME (videotl_group, "videotl group");
- marker_group = new ArdourCanvas::Layout (_time_markers_group, ArdourCanvas::Duple (0.0, timebar_height + 1.0));
+ marker_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple (0.0, timebar_height + 1.0));
CANVAS_DEBUG_NAME (marker_group, "marker group");
- transport_marker_group = new ArdourCanvas::Layout (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 2.0) + 1.0));
+ transport_marker_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 2.0) + 1.0));
CANVAS_DEBUG_NAME (transport_marker_group, "transport marker group");
- range_marker_group = new ArdourCanvas::Layout (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 3.0) + 1.0));
+ range_marker_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 3.0) + 1.0));
CANVAS_DEBUG_NAME (range_marker_group, "range marker group");
- tempo_group = new ArdourCanvas::Layout (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 4.0) + 1.0));
+ tempo_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 4.0) + 1.0));
CANVAS_DEBUG_NAME (tempo_group, "tempo group");
- meter_group = new ArdourCanvas::Layout (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 5.0) + 1.0));
+ meter_group = new ArdourCanvas::Container (_time_markers_group, ArdourCanvas::Duple (0.0, (timebar_height * 5.0) + 1.0));
CANVAS_DEBUG_NAME (meter_group, "meter group");
meter_bar = new ArdourCanvas::Rectangle (meter_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height));
void
Editor::reset_controls_layout_width ()
{
- GtkRequisition req;
+ GtkRequisition req = { 0, 0 };
gint w;
edit_controls_vbox.size_request (req);
ArdourCanvas::Rect scrolling_boundary;
Gtk::Allocation alloc;
- int cx, cy;
if (from_headers) {
alloc = controls_layout.get_allocation ();
} else {
alloc = _track_canvas_viewport->get_allocation ();
- cx = alloc.get_x();
- cy = alloc.get_y();
/* reduce height by the height of the timebars, which happens
to correspond to the position of the hv_scroll_group.
Gdk::ModifierType mask;
frameoffset_t dx = 0;
bool no_stop = false;
- bool y_motion = false;
get_window()->get_pointer (x, y, mask);
/* scroll to make higher tracks visible */
if (autoscroll_cnt && (autoscroll_cnt % speed_factor == 0)) {
- y_motion = scroll_up_one_track ();
+ scroll_up_one_track ();
vertical_motion = true;
}
} else if (y > autoscroll_boundary.y1) {
if (autoscroll_cnt && (autoscroll_cnt % speed_factor == 0)) {
- y_motion = scroll_down_one_track ();
+ scroll_down_one_track ();
vertical_motion = true;
}
}
}
void
-Editor::_ensure_time_axis_view_is_visible (const TimeAxisView& tav, bool at_top)
+Editor::ensure_time_axis_view_is_visible (TimeAxisView const & track, bool at_top)
{
- double begin = tav.y_position();
- double v = vertical_adjustment.get_value ();
-
- if (!at_top && (begin < v || begin + tav.current_height() > v + _visible_canvas_height)) {
- /* try to put the TimeAxisView roughly central */
- if (begin >= _visible_canvas_height/2.0) {
- begin -= _visible_canvas_height/2.0;
- }
+ if (track.hidden()) {
+ return;
}
- /* Clamp the y pos so that we do not extend beyond the canvas full
- * height.
+ /* compute visible area of trackview group, as offsets from top of
+ * trackview group.
*/
- if (_full_canvas_height - begin < _visible_canvas_height){
- begin = _full_canvas_height - _visible_canvas_height;
+
+ double const current_view_min_y = vertical_adjustment.get_value();
+ double const current_view_max_y = current_view_min_y + vertical_adjustment.get_page_size();
+
+ double const track_min_y = track.y_position ();
+ double const track_max_y = track.y_position () + track.effective_height ();
+
+ if (!at_top &&
+ (track_min_y >= current_view_min_y &&
+ track_max_y < current_view_max_y)) {
+ /* already visible, and caller did not ask to place it at the
+ * top of the track canvas
+ */
+ return;
}
- vertical_adjustment.set_value (begin);
+ double new_value;
+
+ if (at_top) {
+ new_value = track_min_y;
+ } else {
+ if (track_min_y < current_view_min_y) {
+ // Track is above the current view
+ new_value = track_min_y;
+ } else if (track_max_y > current_view_max_y) {
+ // Track is below the current view
+ new_value = track.y_position () + track.effective_height() - vertical_adjustment.get_page_size();
+ } else {
+ new_value = track_min_y;
+ }
+ }
+
+ vertical_adjustment.set_value(new_value);
}
/** Called when the main vertical_adjustment has changed */
void
Editor::color_handler()
{
- ArdourCanvas::Color base = ARDOUR_UI::config()->get_canvasvar_RulerBase();
- ArdourCanvas::Color text = ARDOUR_UI::config()->get_canvasvar_RulerText();
+ ArdourCanvas::Color base = ARDOUR_UI::config()->color ("ruler base");
+ ArdourCanvas::Color text = ARDOUR_UI::config()->color ("ruler text");
timecode_ruler->set_fill_color (base);
timecode_ruler->set_outline_color (text);
minsec_ruler->set_fill_color (base);
bbt_ruler->set_fill_color (base);
bbt_ruler->set_outline_color (text);
- playhead_cursor->set_color (ARDOUR_UI::config()->get_canvasvar_PlayHead());
- _verbose_cursor->set_color (ARDOUR_UI::config()->get_canvasvar_VerboseCanvasCursor());
-
- meter_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MeterBar());
- meter_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+ playhead_cursor->set_color (ARDOUR_UI::config()->color ("play head"));
- tempo_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TempoBar());
- tempo_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+ meter_bar->set_fill_color (ARDOUR_UI::config()->color ("meter bar"));
+ meter_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- marker_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MarkerBar());
- marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+ tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("tempo bar"));
+ tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- cd_marker_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CDMarkerBar());
- cd_marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+ marker_bar->set_fill_color (ARDOUR_UI::config()->color ("marker bar"));
+ marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- range_marker_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeMarkerBar());
- range_marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+ cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("cd marker bar"));
+ cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- transport_marker_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TransportMarkerBar());
- transport_marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+ range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("range marker bar"));
+ range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
- cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
+ transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("transport marker bar"));
+ transport_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
- range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
+ cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("range drag bar rect"));
+ cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("range drag bar rect"));
- transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TransportDragRect());
- transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportDragRect());
+ range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("range drag bar rect"));
+ range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("range drag bar rect"));
- transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TransportLoopRect());
- transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportLoopRect());
+ transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("transport drag rect"));
+ transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("transport drag rect"));
- transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TransportPunchRect());
- transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportPunchRect());
+ transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("transport loop rect", "loop rectangle"));
+ transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->color ("transport loop rect"));
- transport_punchin_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_PunchLine());
- transport_punchout_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_PunchLine());
+ transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->color ("transport punch rect"));
+ transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->color ("transport punch rect"));
- zoom_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ZoomRect());
- zoom_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ZoomRect());
+ transport_punchin_line->set_outline_color (ARDOUR_UI::config()->color ("punch line"));
+ transport_punchout_line->set_outline_color (ARDOUR_UI::config()->color ("punch line"));
- rubberband_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RubberBandRect());
- rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->get_canvasvar_RubberBandRect());
+ rubberband_rect->set_outline_color (ARDOUR_UI::config()->color ("rubber band rect"));
+ rubberband_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("rubber band rect", "selection rect"));
- location_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationMarker();
- location_range_color = ARDOUR_UI::config()->get_canvasvar_LocationRange();
- location_cd_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationCDMarker();
- location_loop_color = ARDOUR_UI::config()->get_canvasvar_LocationLoop();
- location_punch_color = ARDOUR_UI::config()->get_canvasvar_LocationPunch();
+ location_marker_color = ARDOUR_UI::config()->color ("location marker");
+ location_range_color = ARDOUR_UI::config()->color ("location range");
+ location_cd_marker_color = ARDOUR_UI::config()->color ("location cd marker");
+ location_loop_color = ARDOUR_UI::config()->color ("location loop");
+ location_punch_color = ARDOUR_UI::config()->color ("location punch");
refresh_location_display ();
+
+ /* redraw the whole thing */
+ _track_canvas->queue_draw ();
+
/*
redisplay_tempo (true);
bool
Editor::track_canvas_key_press (GdkEventKey*)
{
- /* XXX: event does not report the modifier key pressed down, AFAICS, so use the Keyboard object instead */
- if (mouse_mode == Editing::MouseZoom && Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
- set_canvas_cursor (_cursors->zoom_out, true);
- }
-
return false;
}
bool
Editor::track_canvas_key_release (GdkEventKey*)
{
- if (mouse_mode == Editing::MouseZoom && !Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
- set_canvas_cursor (_cursors->zoom_in, true);
- }
-
return false;
}
{
Gdk::Cursor* c = _cursors->grabber;
- if (_internal_editing) {
- switch (mouse_mode) {
- case MouseDraw:
- c = _cursors->midi_pencil;
- break;
-
- case MouseObject:
- c = _cursors->grabber_note;
- break;
-
- case MouseTimeFX:
- c = _cursors->midi_resize;
- break;
-
- case MouseRange:
- c = _cursors->grabber_note;
- break;
-
- default:
- break;
- }
-
- } else {
-
- switch (_edit_point) {
- case EditAtMouse:
- c = _cursors->grabber_edit_point;
- break;
- default:
- boost::shared_ptr<Movable> m = _movable.lock();
- if (m && m->locked()) {
- c = _cursors->speaker;
- }
- break;
+ switch (_edit_point) {
+ case EditAtMouse:
+ c = _cursors->grabber_edit_point;
+ break;
+ default:
+ boost::shared_ptr<Movable> m = _movable.lock();
+ if (m && m->locked()) {
+ c = _cursors->speaker;
}
+ break;
}
return c;
switch (mouse_mode) {
case MouseRange:
mode_cursor = _cursors->selector;
- if (_internal_editing) {
- mode_cursor = which_grabber_cursor();
- }
break;
+ case MouseCut:
+ mode_cursor = _cursors->scissors;
+ break;
+
case MouseObject:
+ case MouseContent:
/* don't use mode cursor, pick a grabber cursor based on the item */
break;
mode_cursor = _cursors->midi_pencil;
break;
- case MouseGain:
- mode_cursor = _cursors->cross_hair;
- break;
-
- case MouseZoom:
- if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
- mode_cursor = _cursors->zoom_out;
- } else {
- mode_cursor = _cursors->zoom_in;
- }
- break;
-
case MouseTimeFX:
mode_cursor = _cursors->time_fx; // just use playhead
break;
}
/* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */
- if (!_internal_editing && get_smart_mode() ) {
+ if (get_smart_mode()) {
double x, y;
get_pointer_position (x, y);
{
Gdk::Cursor* cursor = 0;
- assert (mouse_mode == MouseObject || get_smart_mode());
-
- if (!_internal_editing) {
- switch (_join_object_range_state) {
- case JOIN_OBJECT_RANGE_NONE:
- case JOIN_OBJECT_RANGE_OBJECT:
- cursor = which_grabber_cursor ();
- cerr << "region use grabber\n";
- break;
- case JOIN_OBJECT_RANGE_RANGE:
- cursor = _cursors->selector;
- cerr << "region use selector\n";
- break;
- }
+ switch (_join_object_range_state) {
+ case JOIN_OBJECT_RANGE_NONE:
+ case JOIN_OBJECT_RANGE_OBJECT:
+ cursor = which_grabber_cursor ();
+ break;
+ case JOIN_OBJECT_RANGE_RANGE:
+ cursor = _cursors->selector;
+ break;
}
return cursor;
Gdk::Cursor* cursor = which_mode_cursor ();
+ if (!cursor) {
+ cursor = which_grabber_cursor ();
+ }
+
if (cursor) {
set_canvas_cursor (cursor);
return true;
{
Gdk::Cursor* cursor = 0;
- cerr << "entered new item type " << enum_2_string (type) << endl;
-
if (_drags->active()) {
return;
}
cursor = _cursors->fader;
break;
case GainLineItem:
- cursor = _cursors->fader;
+ cursor = which_track_cursor ();
break;
case AutomationLineItem:
cursor = _cursors->cross_hair;
cursor = _cursors->cross_hair;
break;
case LeftFrameHandle:
- cursor = which_trim_cursor (true);
+ if ( effective_mouse_mode() == MouseObject ) // (smart mode): if the user is in the top half, override the trim cursor, since they are in the range zone
+ cursor = which_trim_cursor (true); //alternatively, one could argue that we _should_ allow trims here, and disallow range selection
break;
case RightFrameHandle:
- cursor = which_trim_cursor (false);
+ if ( effective_mouse_mode() == MouseObject ) //see above
+ cursor = which_trim_cursor (false);
break;
case StartCrossFadeItem:
cursor = _cursors->fade_in;
default:
break;
}
+
+ } else if (mouse_mode == MouseDraw) {
+
+ /* ControlPointItem is not really specific to region gain mode
+ but it is the same cursor so don't worry about this for now.
+ The result is that we'll see the fader cursor if we enter
+ non-region-gain-line control points while in MouseDraw
+ mode, even though we can't edit them in this mode.
+ */
+
+ switch (type) {
+ case GainLineItem:
+ case ControlPointItem:
+ cursor = _cursors->fader;
+ break;
+ default:
+ break;
+ }
}
switch (type) {
case CdMarkerBarItem:
case VideoBarItem:
case TransportMarkerBarItem:
+ case DropZoneItem:
cursor = which_grabber_cursor();
break;
}
if (cursor) {
- set_canvas_cursor (cursor, false);
+ set_canvas_cursor (cursor, true);
+ }
+}
+
+double
+Editor::trackviews_height() const
+{
+ if (!_trackview_group) {
+ return 0;
}
+
+ return _visible_canvas_height - _trackview_group->canvas_origin().y;
}
projects / ardour.git / blobdiff