_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"));
+ _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.
ArdourCanvas::ScrollGroup* hsg;
ArdourCanvas::ScrollGroup* hg;
- ArdourCanvas::ScrollGroup* vg;
+ ArdourCanvas::ScrollGroup* cg;
+
+ h_scroll_group = hg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollsHorizontally);
+ CANVAS_DEBUG_NAME (h_scroll_group, "canvas h scroll");
+ _track_canvas->add_scroller (*hg);
hv_scroll_group = hsg = new ArdourCanvas::ScrollGroup (_track_canvas->root(),
ArdourCanvas::ScrollGroup::ScrollSensitivity (ArdourCanvas::ScrollGroup::ScrollsVertically|
CANVAS_DEBUG_NAME (hv_scroll_group, "canvas hv scroll");
_track_canvas->add_scroller (*hsg);
- v_scroll_group = vg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollsVertically);
- CANVAS_DEBUG_NAME (v_scroll_group, "canvas v scroll");
- _track_canvas->add_scroller (*vg);
-
- h_scroll_group = hg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollsHorizontally);
- CANVAS_DEBUG_NAME (h_scroll_group, "canvas h scroll");
- _track_canvas->add_scroller (*hg);
+ cursor_scroll_group = cg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollsHorizontally);
+ CANVAS_DEBUG_NAME (cursor_scroll_group, "canvas cursor scroll");
+ _track_canvas->add_scroller (*cg);
_verbose_cursor = new VerboseCursor (this);
transport_punch_range_rect->hide();
/*a group to hold time (measure) lines */
- time_line_group = new ArdourCanvas::Container (hv_scroll_group);
+ time_line_group = new ArdourCanvas::Container (h_scroll_group);
CANVAS_DEBUG_NAME (time_line_group, "time line group");
_trackview_group = new ArdourCanvas::Container (hv_scroll_group);
logo_item->lower_to_bottom ();
}
-
_canvas_drop_zone = new ArdourCanvas::Rectangle (hv_scroll_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, 0.0));
/* this thing is transparent */
_canvas_drop_zone->set_fill (false);
do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, frame);
- if (Profile->get_sae() || Config->get_only_copy_imported_files() || copy) {
+ if (Profile->get_sae() || ARDOUR_UI::config()->get_only_copy_imported_files() || copy) {
do_import (audio_paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, frame);
} else {
do_embed (audio_paths, Editing::ImportDistinctFiles, ImportAsTrack, frame);
do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack, SrcBest, frame);
- if (Profile->get_sae() || Config->get_only_copy_imported_files() || copy) {
+ if (Profile->get_sae() || ARDOUR_UI::config()->get_only_copy_imported_files() || copy) {
do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, frame);
} else {
do_embed (audio_paths, Editing::ImportSerializeFiles, ImportToTrack, frame);
void
Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool from_headers)
{
- if (!Config->get_autoscroll_editor () || autoscroll_active ()) {
+ if (!ARDOUR_UI::config()->get_autoscroll_editor () || autoscroll_active ()) {
return;
}
autoscroll_connection.disconnect ();
}
+Editor::EnterContext*
+Editor::get_enter_context(ItemType type)
+{
+ for (ssize_t i = _enter_stack.size() - 1; i >= 0; --i) {
+ if (_enter_stack[i].item_type == type) {
+ return &_enter_stack[i];
+ }
+ }
+ return NULL;
+}
+
bool
Editor::left_track_canvas (GdkEventCrossing */*ev*/)
{
playhead_cursor->set_color (ARDOUR_UI::config()->color ("play head"));
- meter_bar->set_fill_color (ARDOUR_UI::config()->color ("meter bar"));
+ meter_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("meter bar", "marker bar"));
meter_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("tempo bar"));
+ tempo_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("tempo bar", "marker bar"));
tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- marker_bar->set_fill_color (ARDOUR_UI::config()->color ("marker bar"));
+ marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("marker bar", "marker bar"));
marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("cd marker bar"));
+ cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("cd marker bar", "marker bar"));
cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("range marker bar"));
+ range_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("range marker bar", "marker bar"));
range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("transport marker bar"));
+ transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("transport marker bar", "marker bar"));
transport_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("range drag bar rect"));
refresh_location_display ();
- /* redraw the whole thing */
- _track_canvas->queue_draw ();
+ /* redraw the whole thing */
+ _track_canvas->set_background_color (ARDOUR_UI::config()->color ("arrange base"));
+ _track_canvas->queue_draw ();
/*
redisplay_tempo (true);
{
Glib::RefPtr<Gdk::Window> win = _track_canvas->get_window();
- if (win && cursor) {
- win->set_cursor (*cursor);
+ if (win && !_cursors->is_invalid (cursor)) {
+ /* glibmm 2.4 doesn't allow null cursor pointer because it uses
+ a Gdk::Cursor& as the argument to Gdk::Window::set_cursor().
+ But a null pointer just means "use parent window cursor",
+ and so should be allowed. Gtkmm 3.x has fixed this API.
+
+ For now, drop down and use C API
+ */
+ gdk_window_set_cursor (win->gobj(), cursor ? cursor->gobj() : 0);
}
}
size_t
Editor::push_canvas_cursor (Gdk::Cursor* cursor)
{
- if (cursor) {
+ if (!_cursors->is_invalid (cursor)) {
_cursor_stack.push_back (cursor);
set_canvas_cursor (cursor);
}
/* Popped to an existing cursor, we're done. Otherwise, the
context that created this cursor has been destroyed, so we need
to skip to the next down the stack. */
+ set_canvas_cursor (_cursor_stack.back());
return;
}
}
Gdk::Cursor*
Editor::which_mode_cursor () const
{
- Gdk::Cursor* mode_cursor = 0;
+ Gdk::Cursor* mode_cursor = MouseCursors::invalid_cursor ();
switch (mouse_mode) {
case MouseRange:
Gdk::Cursor*
Editor::which_track_cursor () const
{
- Gdk::Cursor* cursor = 0;
+ Gdk::Cursor* cursor = MouseCursors::invalid_cursor();
switch (_join_object_range_state) {
case JOIN_OBJECT_RANGE_NONE:
return cursor;
}
-void
-Editor::choose_canvas_cursor_on_entry (ItemType type)
+Gdk::Cursor*
+Editor::which_canvas_cursor(ItemType type) const
{
- Gdk::Cursor* cursor = 0;
-
- if (_drags->active()) {
- return;
- }
-
- cursor = which_mode_cursor ();
+ Gdk::Cursor* cursor = which_mode_cursor ();
if ((mouse_mode == MouseObject || get_smart_mode ()) ||
mouse_mode == MouseContent) {
switch (type) {
case RegionItem:
- case RegionViewNameHighlight:
- case RegionViewName:
- case WaveItem:
+ /* We don't choose a cursor for these items on top of a region view,
+ because this would push a new context on the enter stack which
+ means switching the region context for things like smart mode
+ won't actualy change the cursor. */
+ // case RegionViewNameHighlight:
+ // case RegionViewName:
+ // case WaveItem:
case StreamItem:
case AutomationTrackItem:
cursor = which_track_cursor ();
case CrossfadeViewItem:
cursor = _cursors->cross_hair;
break;
+ case NoteItem:
+ cursor = _cursors->grabber_note;
default:
break;
}
case ControlPointItem:
cursor = _cursors->fader;
break;
+ case NoteItem:
+ cursor = _cursors->grabber_note;
default:
break;
}
break;
}
- if (cursor) {
- CursorContext::set(&_enter_cursor_ctx, *this, cursor);
- _entered_item_type = type;
+ return cursor;
+}
+
+void
+Editor::choose_canvas_cursor_on_entry (ItemType type)
+{
+ if (_drags->active()) {
+ return;
+ }
+
+ Gdk::Cursor* cursor = which_canvas_cursor(type);
+
+ if (!_cursors->is_invalid (cursor)) {
+ // Push a new enter context
+ const EnterContext ctx = { type, CursorContext::create(*this, cursor) };
+ _enter_stack.push_back(ctx);
+ }
+}
+
+void
+Editor::update_all_enter_cursors ()
+{
+ for (std::vector<EnterContext>::iterator i = _enter_stack.begin(); i != _enter_stack.end(); ++i) {
+ i->cursor_ctx->change(which_canvas_cursor(i->item_type));
}
}