#include "ardour/rc_configuration.h"
#include "ardour/smf_source.h"
+#include "pbd/error.h"
+
#include "canvas/canvas.h"
#include "canvas/rectangle.h"
#include "canvas/pixbuf.h"
#include "ardour_ui.h"
#include "automation_time_axis.h"
#include "editor.h"
-#include "global_signals.h"
#include "editing.h"
#include "rgb_macros.h"
#include "utils.h"
#include "keyboard.h"
#include "editor_cursors.h"
#include "mouse_cursors.h"
+#include "ui_config.h"
#include "verbose_cursor.h"
#include "i18n.h"
_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 (UIConfiguration::instance().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* 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(),
+ hv_scroll_group = hsg = new ArdourCanvas::ScrollGroup (_track_canvas->root(),
ArdourCanvas::ScrollGroup::ScrollSensitivity (ArdourCanvas::ScrollGroup::ScrollsVertically|
ArdourCanvas::ScrollGroup::ScrollsHorizontally));
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);
/* 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::Container (hv_scroll_group);
+ _drag_motion_group = new ArdourCanvas::Container (hv_scroll_group);
CANVAS_DEBUG_NAME (_drag_motion_group, "Canvas Drag Motion");
/* TIME BAR CANVAS */
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);
initialize_rulers ();
- ColorsChanged.connect (sigc::mem_fun (*this, &Editor::color_handler));
+ UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &Editor::color_handler));
color_handler();
}
bool
Editor::track_canvas_map_handler (GdkEventAny* /*ev*/)
{
- if (current_canvas_cursor) {
- set_canvas_cursor (current_canvas_cursor);
+ if (!_cursor_stack.empty()) {
+ set_canvas_cursor (get_canvas_cursor());
+ } else {
+ PBD::error << "cursor stack is empty" << endmsg;
}
return false;
}
/* drop onto canvas background: create new tracks */
frame = 0;
-
- do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, frame);
+ InstrumentSelector is; // instantiation builds instrument-list and sets default.
+ do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, frame, is.selected_instrument());
- if (Profile->get_sae() || Config->get_only_copy_imported_files() || copy) {
+ if (Profile->get_sae() || UIConfiguration::instance().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() || UIConfiguration::instance().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 (!UIConfiguration::instance().get_autoscroll_editor () || autoscroll_active ()) {
return;
}
/* the effective width of the autoscroll boundary so
that we start scrolling before we hit the edge.
-
+
this helps when the window is slammed up against the
right edge of the screen, making it hard to scroll
effectively.
*/
- if (alloc.get_width() > 20) {
+ if (alloc.get_width() > 20) {
alloc.set_width (alloc.get_width() - 20);
alloc.set_x (alloc.get_x() + 10);
- }
+ }
}
// const double vertical_pos = vertical_adjustment.get_value();
const int speed_factor = 10;
- /* vertical */
+ /* vertical */
if (y < autoscroll_boundary.y0) {
/* the motion handler expects events in canvas coordinate space */
/* we asked for the mouse position above (::get_pointer()) via
- * our own top level window (we being the Editor). Convert into
+ * our own top level window (we being the Editor). Convert into
* coordinates within the canvas window.
*/
} else if (no_stop) {
/* not changing visual state but pointer is outside the scrolling boundary
- * so we still need to deliver a fake motion event
+ * so we still need to deliver a fake motion event
*/
GdkEventMotion ev;
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*/)
{
double const track_min_y = track.y_position ();
double const track_max_y = track.y_position () + track.effective_height ();
- if (!at_top &&
+ 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
void
Editor::color_handler()
{
- ArdourCanvas::Color base = ARDOUR_UI::config()->color ("ruler base");
- ArdourCanvas::Color text = ARDOUR_UI::config()->color ("ruler text");
+ ArdourCanvas::Color base = UIConfiguration::instance().color ("ruler base");
+ ArdourCanvas::Color text = UIConfiguration::instance().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()->color ("play head"));
+ playhead_cursor->set_color (UIConfiguration::instance().color ("play head"));
- meter_bar->set_fill_color (ARDOUR_UI::config()->color ("meter bar"));
- meter_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
+ meter_bar->set_fill_color (UIConfiguration::instance().color_mod ("meter bar", "marker bar"));
+ meter_bar->set_outline_color (UIConfiguration::instance().color ("marker bar separator"));
- tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("tempo bar"));
- tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
+ tempo_bar->set_fill_color (UIConfiguration::instance().color_mod ("tempo bar", "marker bar"));
+ tempo_bar->set_outline_color (UIConfiguration::instance().color ("marker bar separator"));
- 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"));
+ marker_bar->set_fill_color (UIConfiguration::instance().color_mod ("marker bar", "marker bar"));
+ marker_bar->set_outline_color (UIConfiguration::instance().color ("marker bar separator"));
- 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"));
+ cd_marker_bar->set_fill_color (UIConfiguration::instance().color_mod ("cd marker bar", "marker bar"));
+ cd_marker_bar->set_outline_color (UIConfiguration::instance().color ("marker bar separator"));
- 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"));
+ range_marker_bar->set_fill_color (UIConfiguration::instance().color_mod ("range marker bar", "marker bar"));
+ range_marker_bar->set_outline_color (UIConfiguration::instance().color ("marker bar separator"));
- 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"));
+ transport_marker_bar->set_fill_color (UIConfiguration::instance().color_mod ("transport marker bar", "marker bar"));
+ transport_marker_bar->set_outline_color (UIConfiguration::instance().color ("marker bar separator"));
- 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"));
+ cd_marker_bar_drag_rect->set_fill_color (UIConfiguration::instance().color ("range drag bar rect"));
+ cd_marker_bar_drag_rect->set_outline_color (UIConfiguration::instance().color ("range drag bar rect"));
- 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"));
+ range_bar_drag_rect->set_fill_color (UIConfiguration::instance().color ("range drag bar rect"));
+ range_bar_drag_rect->set_outline_color (UIConfiguration::instance().color ("range drag bar rect"));
- 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_bar_drag_rect->set_fill_color (UIConfiguration::instance().color ("transport drag rect"));
+ transport_bar_drag_rect->set_outline_color (UIConfiguration::instance().color ("transport drag rect"));
- 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_loop_range_rect->set_fill_color (UIConfiguration::instance().color_mod ("transport loop rect", "loop rectangle"));
+ transport_loop_range_rect->set_outline_color (UIConfiguration::instance().color ("transport loop rect"));
- 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"));
+ transport_punch_range_rect->set_fill_color (UIConfiguration::instance().color ("transport punch rect"));
+ transport_punch_range_rect->set_outline_color (UIConfiguration::instance().color ("transport punch rect"));
- transport_punchin_line->set_outline_color (ARDOUR_UI::config()->color ("punch line"));
- transport_punchout_line->set_outline_color (ARDOUR_UI::config()->color ("punch line"));
+ transport_punchin_line->set_outline_color (UIConfiguration::instance().color ("punch line"));
+ transport_punchout_line->set_outline_color (UIConfiguration::instance().color ("punch line"));
- rubberband_rect->set_outline_color (ARDOUR_UI::config()->color ("rubber band rect"));
- rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->color ("rubber band rect"));
+ rubberband_rect->set_outline_color (UIConfiguration::instance().color ("rubber band rect"));
+ rubberband_rect->set_fill_color (UIConfiguration::instance().color_mod ("rubber band rect", "selection rect"));
- 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");
+ location_marker_color = UIConfiguration::instance().color ("location marker");
+ location_range_color = UIConfiguration::instance().color ("location range");
+ location_cd_marker_color = UIConfiguration::instance().color ("location cd marker");
+ location_loop_color = UIConfiguration::instance().color ("location loop");
+ location_punch_color = UIConfiguration::instance().color ("location punch");
refresh_location_display ();
- /* redraw the whole thing */
- _track_canvas->queue_draw ();
-
+ /* redraw the whole thing */
+ _track_canvas->set_background_color (UIConfiguration::instance().color ("arrange base"));
+ _track_canvas->queue_draw ();
+
/*
redisplay_tempo (true);
return _track_canvas_viewport;
}
-void
-Editor::set_canvas_cursor (Gdk::Cursor* cursor, bool save)
+Gdk::Cursor*
+Editor::get_canvas_cursor () const
{
- if (save) {
- current_canvas_cursor = cursor;
- }
+ /* The top of the cursor stack is always the currently visible cursor. */
+ return _cursor_stack.back();
+}
+void
+Editor::set_canvas_cursor (Gdk::Cursor* cursor)
+{
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);
}
}
-void
+size_t
Editor::push_canvas_cursor (Gdk::Cursor* cursor)
{
- if (cursor) {
- _cursor_stack.push (cursor);
- set_canvas_cursor (cursor, false);
+ if (!_cursors->is_invalid (cursor)) {
+ _cursor_stack.push_back (cursor);
+ set_canvas_cursor (cursor);
}
+ return _cursor_stack.size() - 1;
}
void
Editor::pop_canvas_cursor ()
{
- if (!_cursor_stack.empty()) {
- Gdk::Cursor* cursor = _cursor_stack.top ();
- _cursor_stack.pop ();
- set_canvas_cursor (cursor, false);
+ while (true) {
+ if (_cursor_stack.size() <= 1) {
+ PBD::error << "attempt to pop default cursor" << endmsg;
+ return;
+ }
+
+ _cursor_stack.pop_back();
+ if (_cursor_stack.back()) {
+ /* 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* 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;
Gdk::Cursor*
Editor::which_mode_cursor () const
{
- Gdk::Cursor* mode_cursor = 0;
+ Gdk::Cursor* mode_cursor = MouseCursors::invalid_cursor ();
switch (mouse_mode) {
case MouseRange:
mode_cursor = _cursors->selector;
- if (_internal_editing) {
- mode_cursor = which_grabber_cursor();
- }
break;
case MouseCut:
break;
case MouseObject:
+ case MouseContent:
/* don't use mode cursor, pick a grabber cursor based on the item */
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);
hv_scroll_group->add_items_at_point (ArdourCanvas::Duple (x,y), items);
- // first item will be the upper most
+ // first item will be the upper most
if (!items.empty()) {
const ArdourCanvas::Item* i = items.front();
Gdk::Cursor*
Editor::which_track_cursor () const
{
- Gdk::Cursor* cursor = 0;
-
- assert (mouse_mode == MouseObject || get_smart_mode());
+ Gdk::Cursor* cursor = MouseCursors::invalid_cursor();
- if (!_internal_editing) {
- 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;
- }
+ 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;
}
-bool
-Editor::reset_canvas_cursor ()
+Gdk::Cursor*
+Editor::which_canvas_cursor(ItemType type) const
{
- if (!is_drawable()) {
- return false;
- }
-
Gdk::Cursor* cursor = which_mode_cursor ();
- if (!cursor) {
- cursor = which_grabber_cursor ();
- }
-
- if (cursor) {
- set_canvas_cursor (cursor);
- return true;
- }
-
- return false;
-}
-
-void
-Editor::choose_canvas_cursor_on_entry (GdkEventCrossing* /*event*/, ItemType type)
-{
- Gdk::Cursor* cursor = 0;
-
- if (_drags->active()) {
- return;
+ if (mouse_mode == MouseRange) {
+ switch (type) {
+ case StartSelectionTrimItem:
+ cursor = _cursors->left_side_trim;
+ break;
+ case EndSelectionTrimItem:
+ cursor = _cursors->right_side_trim;
+ break;
+ default:
+ break;
+ }
}
-
- cursor = which_mode_cursor ();
-
- if (mouse_mode == MouseObject || get_smart_mode ()) {
+
+ if ((mouse_mode == MouseObject || get_smart_mode ()) ||
+ mouse_mode == MouseContent) {
/* find correct cursor to use in object/smart mode */
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 ();
cursor = _cursors->fader;
break;
case GainLineItem:
- cursor = which_track_cursor ();
+ cursor = _cursors->cross_hair;
break;
case AutomationLineItem:
cursor = _cursors->cross_hair;
case FadeOutTrimHandleItem:
cursor = _cursors->fade_out;
break;
- case NoteItem:
- cursor = which_grabber_cursor();
- break;
case FeatureLineItem:
cursor = _cursors->cross_hair;
break;
case LeftFrameHandle:
- 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
+ if ( effective_mouse_mode() == MouseObject ) // (smart mode): if the user is in the btm half, show the trim cursor
+ cursor = which_trim_cursor (true);
+ else
+ cursor = _cursors->selector; // (smart mode): in the top half, just show the selection (range) cursor
break;
case RightFrameHandle:
if ( effective_mouse_mode() == MouseObject ) //see above
cursor = which_trim_cursor (false);
+ else
+ cursor = _cursors->selector;
break;
case StartCrossFadeItem:
cursor = _cursors->fade_in;
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) {
- set_canvas_cursor (cursor, true);
+ 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));
}
}
projects / ardour.git / blobdiff