globally remove all trailing whitespace from ardour code base.
[ardour.git] / gtk2_ardour / editor_canvas.cc
index 8ad2abdfad3ca77f82c10887b189d96d4fb28472..13fd6fe8b94b3ec92dc19bfba21c4207016dd157 100644 (file)
@@ -27,6 +27,8 @@
 #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"
@@ -35,8 +37,8 @@
 #include "canvas/debug.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"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Glib;
@@ -67,23 +71,30 @@ Editor::initialize_canvas ()
        _track_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, vertical_adjustment);
        _track_canvas = _track_canvas_viewport->canvas ();
 
-       ArdourCanvas::ScrollGroup* hsg; 
+       _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* hg;
-       ArdourCanvas::ScrollGroup* vg;
+       ArdourCanvas::ScrollGroup* cg;
 
-       hv_scroll_group = hsg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), 
+       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|
                                                                                                             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);
 
@@ -100,7 +111,7 @@ Editor::initialize_canvas ()
        }
 
        /*a group to hold global rects like punch/loop indicators */
-       global_rect_group = new ArdourCanvas::Group (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));
@@ -112,17 +123,12 @@ Editor::initialize_canvas ()
        transport_punch_range_rect->hide();
 
        /*a group to hold time (measure) lines */
-       time_line_group = new ArdourCanvas::Group (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::Group (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();
@@ -130,30 +136,30 @@ Editor::initialize_canvas ()
        /* 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::Group (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::Group (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::Group (_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::Group (_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::Group (_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::Group (_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::Group (_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::Group (_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::Group (_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));
@@ -225,7 +231,6 @@ Editor::initialize_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);
@@ -268,7 +273,7 @@ Editor::initialize_canvas ()
 
        initialize_rulers ();
 
-       ColorsChanged.connect (sigc::mem_fun (*this, &Editor::color_handler));
+       UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &Editor::color_handler));
        color_handler();
 
 }
@@ -318,7 +323,7 @@ Editor::track_canvas_viewport_size_allocated ()
 void
 Editor::reset_controls_layout_width ()
 {
-       GtkRequisition req;
+       GtkRequisition req = { 0, 0 };
        gint w;
 
        edit_controls_vbox.size_request (req);
@@ -363,8 +368,10 @@ Editor::reset_controls_layout_height (int32_t h)
 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;
 }
@@ -412,16 +419,16 @@ Editor::drop_paths_part_two (const vector<string>& paths, framepos_t frame, doub
        }
 
 
-       std::pair<TimeAxisView*, int> const tvp = trackview_by_y_position (ypos);
+       std::pair<TimeAxisView*, int> const tvp = trackview_by_y_position (ypos, false);
        if (tvp.first == 0) {
 
                /* 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);
@@ -437,7 +444,7 @@ Editor::drop_paths_part_two (const vector<string>& paths, framepos_t frame, doub
 
                        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);
@@ -493,7 +500,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
 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;
        }
 
@@ -510,14 +517,11 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool from_headers)
 
        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.
@@ -535,16 +539,16 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool from_headers)
 
                /* 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);
-               } 
+               }
 
        }
        
@@ -574,7 +578,6 @@ Editor::autoscroll_canvas ()
        Gdk::ModifierType mask;
        frameoffset_t dx = 0;
        bool no_stop = false;
-       bool y_motion = false;
 
        get_window()->get_pointer (x, y, mask);
 
@@ -630,21 +633,21 @@ Editor::autoscroll_canvas ()
                // const double vertical_pos = vertical_adjustment.get_value();
                const int speed_factor = 10;
 
-               /* vertical */ 
+               /* vertical */
                
                if (y < autoscroll_boundary.y0) {
 
                        /* 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;
                        }
                }
@@ -672,7 +675,7 @@ Editor::autoscroll_canvas ()
                /* 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.
                 */
 
@@ -701,7 +704,7 @@ Editor::autoscroll_canvas ()
        } 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;
@@ -778,6 +781,17 @@ Editor::stop_canvas_autoscroll ()
        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*/)
 {
@@ -798,26 +812,48 @@ Editor::entered_track_canvas (GdkEventCrossing */*ev*/)
 }
 
 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 */
@@ -849,8 +885,8 @@ Editor::set_horizontal_position (double p)
 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 = 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);
@@ -860,58 +896,59 @@ Editor::color_handler()
        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());
+       playhead_cursor->set_color (UIConfiguration::instance().color ("play head"));
 
-       meter_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MeterBar());
-       meter_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       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()->get_canvasvar_TempoBar());
-       tempo_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       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()->get_canvasvar_MarkerBar());
-       marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       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()->get_canvasvar_CDMarkerBar());
-       cd_marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       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()->get_canvasvar_RangeMarkerBar());
-       range_marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       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()->get_canvasvar_TransportMarkerBar());
-       transport_marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       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()->get_canvasvar_RangeDragBarRect());
-       cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
+       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()->get_canvasvar_RangeDragBarRect());
-       range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
+       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()->get_canvasvar_TransportDragRect());
-       transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportDragRect());
+       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()->get_canvasvar_TransportLoopRect());
-       transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportLoopRect());
+       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()->get_canvasvar_TransportPunchRect());
-       transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportPunchRect());
+       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()->get_canvasvar_PunchLine());
-       transport_punchout_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_PunchLine());
+       transport_punchin_line->set_outline_color (UIConfiguration::instance().color ("punch line"));
+       transport_punchout_line->set_outline_color (UIConfiguration::instance().color ("punch line"));
 
-       zoom_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ZoomRect());
-       zoom_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ZoomRect());
+       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"));
 
-       rubberband_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RubberBandRect());
-       rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->get_canvasvar_RubberBandRect());
-
-       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 = 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->set_background_color (UIConfiguration::instance().color ("arrange base"));
+       _track_canvas->queue_draw ();
+
 /*
        redisplay_tempo (true);
 
@@ -926,81 +963,420 @@ Editor::horizontal_position () const
        return sample_to_pixel (leftmost_frame);
 }
 
-void
-Editor::set_canvas_cursor (Gdk::Cursor* cursor, bool save)
+bool
+Editor::track_canvas_key_press (GdkEventKey*)
 {
-       if (save) {
-               current_canvas_cursor = cursor;
+       return false;
+}
+
+bool
+Editor::track_canvas_key_release (GdkEventKey*)
+{
+       return false;
+}
+
+double
+Editor::clamp_verbose_cursor_x (double x)
+{
+       if (x < 0) {
+               x = 0;
+       } else {
+               x = min (_visible_canvas_width - 200.0, x);
        }
+       return x;
+}
+
+double
+Editor::clamp_verbose_cursor_y (double y)
+{
+       y = max (0.0, y);
+       y = min (_visible_canvas_height - 50, y);
+       return y;
+}
 
+ArdourCanvas::GtkCanvasViewport*
+Editor::get_track_canvas() const
+{
+       return _track_canvas_viewport;
+}
+
+Gdk::Cursor*
+Editor::get_canvas_cursor () const
+{
+       /* 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) {
-               _track_canvas->get_window()->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;
+               }
        }
 }
 
-bool
-Editor::track_canvas_key_press (GdkEventKey*)
+Gdk::Cursor*
+Editor::which_grabber_cursor () const
 {
-       /* 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);
+       Gdk::Cursor* c = _cursors->grabber;
+
+       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 false;
+       return c;
 }
 
-bool
-Editor::track_canvas_key_release (GdkEventKey*)
+Gdk::Cursor*
+Editor::which_trim_cursor (bool left) const
 {
-       if (mouse_mode == Editing::MouseZoom && !Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
-               set_canvas_cursor (_cursors->zoom_in, true);
+       if (!entered_regionview) {
+               return 0;
        }
 
-       return false;
+       Trimmable::CanTrim ct = entered_regionview->region()->can_trim ();
+               
+       if (left) {
+               
+               if (ct & Trimmable::FrontTrimEarlier) {
+                       return _cursors->left_side_trim;
+               } else {
+                       return _cursors->left_side_trim_right_only;
+               }
+       } else {
+               if (ct & Trimmable::EndTrimLater) {
+                       return _cursors->right_side_trim;
+               } else {
+                       return _cursors->right_side_trim_left_only;
+               }
+       }
 }
 
-double
-Editor::clamp_verbose_cursor_x (double x)
+Gdk::Cursor*
+Editor::which_mode_cursor () const
 {
-       if (x < 0) {
-               x = 0;
-       } else {
-               x = min (_visible_canvas_width - 200.0, x);
+       Gdk::Cursor* mode_cursor = MouseCursors::invalid_cursor ();
+
+       switch (mouse_mode) {
+       case MouseRange:
+               mode_cursor = _cursors->selector;
+               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;
+
+       case MouseDraw:
+               mode_cursor = _cursors->midi_pencil;
+               break;
+
+       case MouseTimeFX:
+               mode_cursor = _cursors->time_fx; // just use playhead
+               break;
+
+       case MouseAudition:
+               mode_cursor = _cursors->speaker;
+               break;
        }
-       return x;
+
+       /* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */
+       if (get_smart_mode()) {
+
+               double x, y;
+               get_pointer_position (x, y);
+
+               if (x >= 0 && y >= 0) {
+                       
+                       vector<ArdourCanvas::Item const *> items;
+
+                       /* Note how we choose a specific scroll group to get
+                        * items from. This could be problematic.
+                        */
+                       
+                       hv_scroll_group->add_items_at_point (ArdourCanvas::Duple (x,y), items);
+                       
+                       // first item will be the upper most
+                       
+                       if (!items.empty()) {
+                               const ArdourCanvas::Item* i = items.front();
+                               
+                               if (i && i->parent() && i->parent()->get_data (X_("timeselection"))) {
+                                       pair<TimeAxisView*, int> tvp = trackview_by_y_position (_last_motion_y);
+                                       if (dynamic_cast<AutomationTimeAxisView*> (tvp.first)) {
+                                               mode_cursor = _cursors->up_down;
+                                       }
+                               }
+                       }
+               }
+       }
+
+       return mode_cursor;
 }
 
-double
-Editor::clamp_verbose_cursor_y (double y)
+Gdk::Cursor*
+Editor::which_track_cursor () const
 {
-       y = max (0.0, y);
-       y = min (_visible_canvas_height - 50, y);
-       return y;
+       Gdk::Cursor* cursor = MouseCursors::invalid_cursor();
+
+       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;
 }
 
-ArdourCanvas::GtkCanvasViewport*
-Editor::get_track_canvas() const
+Gdk::Cursor*
+Editor::which_canvas_cursor(ItemType type) const
 {
-       return _track_canvas_viewport;
+       Gdk::Cursor* cursor = which_mode_cursor ();
+
+       if (mouse_mode == MouseRange) {
+               switch (type) {
+               case StartSelectionTrimItem:
+                       cursor = _cursors->left_side_trim;
+                       break;
+               case EndSelectionTrimItem:
+                       cursor = _cursors->right_side_trim;
+                       break;
+               default:
+                       break;
+               }
+       }
+       
+       if ((mouse_mode == MouseObject || get_smart_mode ()) ||
+           mouse_mode == MouseContent) {
+
+               /* find correct cursor to use in object/smart mode */
+
+               switch (type) {
+               case RegionItem:
+               /* 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 ();
+                       break;
+               case PlayheadCursorItem:
+                       switch (_edit_point) {
+                       case EditAtMouse:
+                               cursor = _cursors->grabber_edit_point;
+                               break;
+                       default:
+                               cursor = _cursors->grabber;
+                               break;
+                       }
+                       break;
+               case SelectionItem:
+                       cursor = _cursors->selector;
+                       break;
+               case ControlPointItem:
+                       cursor = _cursors->fader;
+                       break;
+               case GainLineItem:
+                       cursor = _cursors->cross_hair;
+                       break;
+               case AutomationLineItem:
+                       cursor = _cursors->cross_hair;
+                       break;
+               case StartSelectionTrimItem:
+                       cursor = _cursors->left_side_trim;
+                       break;
+               case EndSelectionTrimItem:
+                       cursor = _cursors->right_side_trim;
+                       break;
+               case FadeInItem:
+                       cursor = _cursors->fade_in;
+                       break;
+               case FadeInHandleItem:
+                       cursor = _cursors->fade_in;
+                       break;
+               case FadeInTrimHandleItem:
+                       cursor = _cursors->fade_in;
+                       break;
+               case FadeOutItem:
+                       cursor = _cursors->fade_out;
+                       break;
+               case FadeOutHandleItem:
+                       cursor = _cursors->fade_out;
+                       break;
+               case FadeOutTrimHandleItem:
+                       cursor = _cursors->fade_out;
+                       break;
+               case FeatureLineItem:
+                       cursor = _cursors->cross_hair;
+                       break;
+               case LeftFrameHandle:
+                       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;
+                       break;
+               case EndCrossFadeItem:
+                       cursor = _cursors->fade_out;
+                       break;
+               case CrossfadeViewItem:
+                       cursor = _cursors->cross_hair;
+                       break;
+               case NoteItem:
+                       cursor = _cursors->grabber_note;
+               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;
+               case NoteItem:
+                       cursor = _cursors->grabber_note;
+               default:
+                       break;
+               }
+       }
+
+       switch (type) {
+               /* These items use the timebar cursor at all times */
+       case TimecodeRulerItem:
+       case MinsecRulerItem:
+       case BBTRulerItem:
+       case SamplesRulerItem:
+               cursor = _cursors->timebar;
+               break;
+
+               /* These items use the grabber cursor at all times */
+       case MeterMarkerItem:
+       case TempoMarkerItem:
+       case MeterBarItem:
+       case TempoBarItem:
+       case MarkerItem:
+       case MarkerBarItem:
+       case RangeMarkerBarItem:
+       case CdMarkerBarItem:
+       case VideoBarItem:
+       case TransportMarkerBarItem:
+       case DropZoneItem:
+               cursor = which_grabber_cursor();
+               break;
+
+       default:
+               break;
+       }
+
+       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));
+       }
+}
+
+double
+Editor::trackviews_height() const
+{
+       if (!_trackview_group) {
+               return 0;
+       }
+
+       return _visible_canvas_height - _trackview_group->canvas_origin().y;
 }