Unify the canvases by moving groups around rather than using set_scrolling_region...
[ardour.git] / gtk2_ardour / editor_canvas.cc
index 632dadd60a1b7cf00c9dded0e9b9461707d45e60..376b47409631690cc0f829204ea38539dfc14b39 100644 (file)
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <libgnomecanvasmm/init.h>
+#include <libgnomecanvasmm/pixbuf.h>
 #include <jack/types.h>
 #include <gtkmm2ext/utils.h>
 
 #include <ardour/audioregion.h>
+#include <ardour/profile.h>
 
 #include "ardour_ui.h"
 #include "editor.h"
@@ -52,7 +53,7 @@ using namespace Glib;
 using namespace Gtkmm2ext;
 using namespace Editing;
 
-/* XXX this is a hack. it ought to be the maximum value of an jack_nframes_t */
+/* XXX this is a hack. it ought to be the maximum value of an nframes64_t */
 
 const double max_canvas_coordinate = (double) JACK_MAX_FRAMES;
 
@@ -86,18 +87,32 @@ static void ardour_canvas_type_init()
 void
 Editor::initialize_canvas ()
 {
+       if (getenv ("ARDOUR_NON_AA_CANVAS")) {
+               track_canvas = new ArdourCanvas::Canvas ();
+       } else {
+               track_canvas = new ArdourCanvas::CanvasAA ();
+       }
+       
        ArdourCanvas::init ();
        ardour_canvas_type_init ();
 
        /* don't try to center the canvas */
 
-       track_canvas.set_center_scroll_region (false);
+       track_canvas->set_center_scroll_region (false);
+       track_canvas->set_dither (Gdk::RGB_DITHER_NONE);
+
+       /* need to handle 4 specific types of events as catch-alls */
+
+       track_canvas->signal_scroll_event().connect (mem_fun (*this, &Editor::track_canvas_scroll_event));
+       track_canvas->signal_motion_notify_event().connect (mem_fun (*this, &Editor::track_canvas_motion_notify_event));
+       track_canvas->signal_button_press_event().connect (mem_fun (*this, &Editor::track_canvas_button_press_event));
+       track_canvas->signal_button_release_event().connect (mem_fun (*this, &Editor::track_canvas_button_release_event));
 
-       track_canvas.signal_event().connect (bind (mem_fun (*this, &Editor::track_canvas_event), (ArdourCanvas::Item*) 0));
-       track_canvas.set_name ("EditorMainCanvas");
-       track_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK|Gdk::SCROLL_MASK);
-       track_canvas.signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas));
-       track_canvas.set_flags (CAN_FOCUS);
+       track_canvas->set_name ("EditorMainCanvas");
+       track_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK|Gdk::SCROLL_MASK);
+       track_canvas->signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas));
+       track_canvas->signal_enter_notify_event().connect (mem_fun(*this, &Editor::entered_track_canvas));
+       track_canvas->set_flags (CAN_FOCUS);
 
        /* set up drag-n-drop */
 
@@ -110,247 +125,249 @@ Editor::initialize_canvas ()
        target_table.push_back (TargetEntry ("text/uri-list"));
        target_table.push_back (TargetEntry ("application/x-rootwin-drop"));
 
-       track_canvas.drag_dest_set (target_table);
-       track_canvas.signal_drag_data_received().connect (mem_fun(*this, &Editor::track_canvas_drag_data_received));
+       track_canvas->drag_dest_set (target_table);
+       track_canvas->signal_drag_data_received().connect (mem_fun(*this, &Editor::track_canvas_drag_data_received));
 
        /* stuff for the verbose canvas cursor */
 
-       Pango::FontDescription font = get_font_for_style (N_("VerboseCanvasCursor"));
+       Pango::FontDescription* font = get_font_for_style (N_("VerboseCanvasCursor"));
 
-       verbose_canvas_cursor = new ArdourCanvas::Text (*track_canvas.root());
-       verbose_canvas_cursor->property_font_desc() = font;
+       verbose_canvas_cursor = new ArdourCanvas::Text (*track_canvas->root());
+       verbose_canvas_cursor->property_font_desc() = *font;
        verbose_canvas_cursor->property_anchor() = ANCHOR_NW;
-       verbose_canvas_cursor->property_fill_color_rgba() = color_map[cVerboseCanvasCursor];
+
+       delete font;
        
        verbose_cursor_visible = false;
-       
-       /* a group to hold time (measure) lines */
-       
-       time_line_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0);
-       cursor_group = new ArdourCanvas::Group (*track_canvas.root(), 0.0, 0.0);
 
-       time_canvas.set_name ("EditorTimeCanvas");
-       time_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK);
-       time_canvas.set_flags (CAN_FOCUS);
-       time_canvas.set_center_scroll_region (false);
+       /* on the bottom, an image */
        
-       meter_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, 0.0);
-       tempo_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height);
-       marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 2.0);
-       range_marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 3.0);
-       transport_marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 4.0);
-       
-       tempo_bar = new ArdourCanvas::SimpleRect (*tempo_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
-       tempo_bar->property_fill_color_rgba() = color_map[cTempoBar];
-       tempo_bar->property_outline_pixels() = 0;
-       
-       meter_bar = new ArdourCanvas::SimpleRect (*meter_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
-       meter_bar->property_fill_color_rgba() = color_map[cMeterBar];
+       if (Profile->get_sae()) {
+               Image img (::get_icon (X_("saelogo")));
+               logo_item = new ArdourCanvas::Pixbuf (*track_canvas->root(), 0.0, 0.0, img.get_pixbuf());
+               // logo_item->property_height_in_pixels() = true;
+               // logo_item->property_width_in_pixels() = true;
+               // logo_item->property_height_set() = true;
+               // logo_item->property_width_set() = true;
+               logo_item->show ();
+       }
+
+       _master_group = new ArdourCanvas::Group (*track_canvas->root());
+
+       _trackview_group = new ArdourCanvas::Group (*_master_group);
+       _region_motion_group = new ArdourCanvas::Group (*_master_group);
+
+       meter_bar_group = new ArdourCanvas::Group (*track_canvas->root());
+       meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, 100, timebar_height);
+       meter_bar->property_outline_what() = (0x1 | 0x8);
        meter_bar->property_outline_pixels() = 0;
-       
-       marker_bar = new ArdourCanvas::SimpleRect (*marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
-       marker_bar->property_fill_color_rgba() = color_map[cMarkerBar];
-       marker_bar->property_outline_pixels() = 0;
-       
-       range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
-       range_marker_bar->property_fill_color_rgba() = color_map[cRangeMarkerBar];
+
+       tempo_bar_group = new ArdourCanvas::Group (*track_canvas->root());
+       tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, 100, (timebar_height));
+       tempo_bar->property_outline_what() = (0x1 | 0x8);
+       tempo_bar->property_outline_pixels() = 0;
+
+       range_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
+       range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, 100, (timebar_height));
+       range_marker_bar->property_outline_what() = (0x1 | 0x8);
        range_marker_bar->property_outline_pixels() = 0;
        
-       transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
-       transport_marker_bar->property_fill_color_rgba() = color_map[cTransportMarkerBar];
+       transport_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
+       transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, 100, (timebar_height));
+       transport_marker_bar->property_outline_what() = (0x1 | 0x8);
        transport_marker_bar->property_outline_pixels() = 0;
+
+       marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
+       marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, 100, (timebar_height));
+       marker_bar->property_outline_what() = (0x1 | 0x8);
+       marker_bar->property_outline_pixels() = 0;
        
-       range_bar_drag_rect = new ArdourCanvas::SimpleRect (*range_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
-       range_bar_drag_rect->property_fill_color_rgba() = color_map[cRangeDragBarRectFill];
-       range_bar_drag_rect->property_outline_color_rgba() = color_map[cRangeDragBarRect];
-       range_bar_drag_rect->property_outline_pixels() = 0;
-       range_bar_drag_rect->hide ();
-       
-       transport_bar_drag_rect = new ArdourCanvas::SimpleRect (*transport_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
-       transport_bar_drag_rect ->property_fill_color_rgba() = color_map[cTransportDragRectFill];
-       transport_bar_drag_rect->property_outline_color_rgba() = color_map[cTransportDragRect];
-       transport_bar_drag_rect->property_outline_pixels() = 0;
-       transport_bar_drag_rect->hide ();
+       cd_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
+       cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, 100, (timebar_height));
+       cd_marker_bar->property_outline_what() = (0x1 | 0x8);
+       cd_marker_bar->property_outline_pixels() = 0;
+
+
+       /* a group to hold time (measure) lines */
        
+       time_line_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0);
+
+       range_marker_drag_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
+       //range_marker_drag_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
+       range_marker_drag_rect->hide ();
+
+       timebar_group =  new ArdourCanvas::Group (*track_canvas->root());
+       cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
+
+       meter_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 5.0);
+       tempo_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 4.0);
+       range_marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 3.0);
+       transport_marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 2.0);
+       marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height);
+       cd_marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, 0.0);
+
        marker_drag_line_points.push_back(Gnome::Art::Point(0.0, 0.0));
-       marker_drag_line_points.push_back(Gnome::Art::Point(0.0, 0.0));
+       marker_drag_line_points.push_back(Gnome::Art::Point(0.0, 1.0));
 
-       marker_drag_line = new ArdourCanvas::Line (*track_canvas.root());
+       marker_drag_line = new ArdourCanvas::Line (*timebar_group);
        marker_drag_line->property_width_pixels() = 1;
-       marker_drag_line->property_fill_color_rgba() = color_map[cMarkerDragLine];
        marker_drag_line->property_points() = marker_drag_line_points;
        marker_drag_line->hide();
 
-       range_marker_drag_rect = new ArdourCanvas::SimpleRect (*track_canvas.root(), 0.0, 0.0, 0.0, 0.0);
-       range_marker_drag_rect->property_fill_color_rgba() = color_map[cRangeDragRectFill];
-       range_marker_drag_rect->property_outline_color_rgba() = color_map[cRangeDragRect];
-       range_marker_drag_rect->hide ();
-       
-       transport_loop_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
-       transport_loop_range_rect->property_fill_color_rgba() = color_map[cTransportLoopRectFill];
-       transport_loop_range_rect->property_outline_color_rgba() = color_map[cTransportLoopRect];
+       cd_marker_bar_drag_rect = new ArdourCanvas::SimpleRect (*cd_marker_group, 0.0, 0.0, 100, timebar_height);
+       cd_marker_bar_drag_rect->property_outline_pixels() = 0;
+       cd_marker_bar_drag_rect->hide ();
+
+       range_bar_drag_rect = new ArdourCanvas::SimpleRect (*range_marker_group, 0.0, 0.0, 100, timebar_height);
+       range_bar_drag_rect->property_outline_pixels() = 0;
+       range_bar_drag_rect->hide ();
+
+       transport_bar_drag_rect = new ArdourCanvas::SimpleRect (*transport_marker_group, 0.0, 0.0, 100, timebar_height);
+       transport_bar_drag_rect->property_outline_pixels() = 0;
+       transport_bar_drag_rect->hide ();
+
+       transport_loop_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
        transport_loop_range_rect->property_outline_pixels() = 1;
        transport_loop_range_rect->hide();
 
-       transport_punch_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
-       transport_punch_range_rect->property_fill_color_rgba() = color_map[cTransportPunchRectFill];
-       transport_punch_range_rect->property_outline_color_rgba() = color_map[cTransportPunchRect];
+       transport_punch_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
        transport_punch_range_rect->property_outline_pixels() = 0;
        transport_punch_range_rect->hide();
        
        transport_loop_range_rect->lower_to_bottom (); // loop on the bottom
 
-       transport_punchin_line = new ArdourCanvas::SimpleLine (*time_line_group);
+       transport_punchin_line = new ArdourCanvas::SimpleLine (*_master_group);
        transport_punchin_line->property_x1() = 0.0;
        transport_punchin_line->property_y1() = 0.0;
        transport_punchin_line->property_x2() = 0.0;
        transport_punchin_line->property_y2() = 0.0;
-       transport_punchin_line->property_color_rgba() = color_map[cPunchInLine];
        transport_punchin_line->hide ();
        
-       transport_punchout_line  = new ArdourCanvas::SimpleLine (*time_line_group);
+       transport_punchout_line  = new ArdourCanvas::SimpleLine (*_master_group);
        transport_punchout_line->property_x1() = 0.0;
        transport_punchout_line->property_y1() = 0.0;
        transport_punchout_line->property_x2() = 0.0;
        transport_punchout_line->property_y2() = 0.0;
-       transport_punchout_line->property_color_rgba() = color_map[cPunchOutLine];
        transport_punchout_line->hide();
        
        // used to show zoom mode active zooming
-       zoom_rect = new ArdourCanvas::SimpleRect (*track_canvas.root(), 0.0, 0.0, 0.0, 0.0);
-       zoom_rect->property_fill_color_rgba() = color_map[cZoomRectFill];
-       zoom_rect->property_outline_color_rgba() = color_map[cZoomRect];
+       zoom_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
        zoom_rect->property_outline_pixels() = 1;
        zoom_rect->hide();
        
        zoom_rect->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0));
        
        // used as rubberband rect
-       rubberband_rect = new ArdourCanvas::SimpleRect (*track_canvas.root(), 0.0, 0.0, 0.0, 0.0);
-       rubberband_rect->property_outline_color_rgba() = color_map[cRubberBandRect];
-       rubberband_rect->property_fill_color_rgba() = (guint32) color_map[cRubberBandRectFill];
+       rubberband_rect = new ArdourCanvas::SimpleRect (*_trackview_group, 0.0, 0.0, 0.0, 0.0);
+
        rubberband_rect->property_outline_pixels() = 1;
        rubberband_rect->hide();
        
        tempo_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar));
        meter_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
        marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
+       cd_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
        range_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
        transport_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
        
-       /* separator lines */
-       
-       tempo_line = new ArdourCanvas::SimpleLine (*tempo_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
-       tempo_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
+       ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_loop_range_view), false));
+       ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_punch_range_view), false));
 
-       meter_line = new ArdourCanvas::SimpleLine (*meter_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
-       meter_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
+       playhead_cursor = new Cursor (*this, &Editor::canvas_playhead_cursor_event);
 
-       marker_line = new ArdourCanvas::SimpleLine (*marker_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
-       marker_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
-       
-       range_marker_line = new ArdourCanvas::SimpleLine (*range_marker_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
-       range_marker_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
+       initial_ruler_update_required = true;
+       track_canvas->signal_size_allocate().connect (mem_fun(*this, &Editor::track_canvas_allocate));
 
-       transport_marker_line = new ArdourCanvas::SimpleLine (*transport_marker_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
-       transport_marker_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
+       if (logo_item) {
+               logo_item->lower_to_bottom ();
+       }
+
+       ColorsChanged.connect (mem_fun (*this, &Editor::color_handler));
+       color_handler();
 
-       ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_loop_range_view), false));
-       ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_punch_range_view), false));
-       
-       double time_height = timebar_height * 5;
-       double time_width = FLT_MAX/frames_per_unit;
-       time_canvas.set_scroll_region(0.0, 0.0, time_width, time_height);
-       
-       edit_cursor = new Cursor (*this, "blue", &Editor::canvas_edit_cursor_event);
-       playhead_cursor = new Cursor (*this, "red", &Editor::canvas_playhead_cursor_event);
-       
-       track_canvas.signal_size_allocate().connect (mem_fun(*this, &Editor::track_canvas_allocate));
 }
 
 void
 Editor::track_canvas_allocate (Gtk::Allocation alloc)
 {
-       static bool first_time = true;
+       canvas_allocation = alloc;
 
-       canvas_width = alloc.get_width();
-       canvas_height = alloc.get_height();
+       if (!initial_ruler_update_required) {
+               if (!canvas_idle_queued) {
+                       /* call this first so that we do stuff before any pending redraw */
+                       Glib::signal_idle().connect (mem_fun (*this, &Editor::track_canvas_size_allocated), false);
+                       canvas_idle_queued = true;
+               }
+               return;
+       } 
 
-       zoom_range_clock.set ((jack_nframes_t) floor ((canvas_width * frames_per_unit)));
-       edit_cursor->set_position (edit_cursor->current_frame);
-       playhead_cursor->set_position (playhead_cursor->current_frame);
+       initial_ruler_update_required = false;
+       track_canvas_size_allocated ();
+}
 
-       reset_hscrollbar_stepping ();
-       reset_scrolling_region ();
+bool
+Editor::track_canvas_size_allocated ()
+{
+       if (canvas_idle_queued) {
+               canvas_idle_queued = false;
+       }
 
-       if (edit_cursor) edit_cursor->set_length (canvas_height);
-       if (playhead_cursor) playhead_cursor->set_length (canvas_height);
+       canvas_width = canvas_allocation.get_width();
+       canvas_height = canvas_allocation.get_height();
 
-       if (marker_drag_line) {
-               marker_drag_line_points.back().set_x(canvas_height);
-               marker_drag_line->property_points() = marker_drag_line_points;
-       }
+       full_canvas_height = canvas_height;
 
-       if (range_marker_drag_rect) {
-               range_marker_drag_rect->property_y1() = 0.0;
-               range_marker_drag_rect->property_y2() = canvas_height;
-       }
+       if (session) {
+               TrackViewList::iterator i;
+               double height = 0;
 
-       if (transport_loop_range_rect) {
-               transport_loop_range_rect->property_y1() = 0.0;
-               transport_loop_range_rect->property_y2() = canvas_height;
+               for (i = track_views.begin(); i != track_views.end(); ++i) {
+                       if ((*i)->control_parent) {
+                               height += (*i)->effective_height;
+                       }
+               }
+               
+               full_canvas_height = height + canvas_timebars_vsize;
        }
 
-       if (transport_punch_range_rect) {
-               transport_punch_range_rect->property_y1() = 0.0;
-               transport_punch_range_rect->property_y2() = canvas_height;
-       }
+       zoom_range_clock.set ((nframes64_t) floor ((canvas_width * frames_per_unit)));
+       playhead_cursor->set_position (playhead_cursor->current_frame);
 
-       if (transport_punchin_line) {
-               transport_punchin_line->property_y1() = 0.0;
-               transport_punchin_line->property_y2() = canvas_height;
-       }
+       horizontal_adjustment.set_upper (session->current_end_frame()/frames_per_unit);
+       horizontal_adjustment.set_page_size (current_page_frames()/frames_per_unit);
 
-       if (transport_punchout_line) {
-               transport_punchout_line->property_y1() = 0.0;
-               transport_punchout_line->property_y2() = canvas_height;
-       }
-               
-       update_fixed_rulers ();
+       reset_hscrollbar_stepping ();
 
-       if (is_visible() && first_time) {
-               tempo_map_changed (Change (0));
-               first_time = false;
-       } else {
-               redisplay_tempo ();
+       if (playhead_cursor) {
+               playhead_cursor->set_length (canvas_height);
        }
-       
-       Resized (); /* EMIT_SIGNAL */
-}
 
-void
-Editor::reset_scrolling_region (Gtk::Allocation* alloc)
-{
-       TreeModel::Children rows = route_display_model->children();
-       TreeModel::Children::iterator i;
-       double pos;
-
-        for (pos = 0, i = rows.begin(); i != rows.end(); ++i) {
-               TimeAxisView *tv = (*i)[route_display_columns.tv];
-               if (tv != 0 && !tv->hidden()) {
-                       pos += tv->effective_height;
-                       pos += track_spacing;
-               }
+       vertical_adjustment.set_page_size (canvas_height);
+       
+       for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
+               (*x)->set_line_vpos (0, canvas_height);
        }
 
-       double last_canvas_unit =  last_canvas_frame / frames_per_unit;
+       marker_drag_line_points.back().set_y(canvas_height);
+       range_marker_drag_rect->property_y2() = canvas_height;
+       transport_loop_range_rect->property_y2() = canvas_height;
+       transport_punch_range_rect->property_y2() = canvas_height;
+       transport_punchin_line->property_y2() = canvas_height;
+       transport_punchout_line->property_y2() = canvas_height;
 
-       track_canvas.set_scroll_region (0.0, 0.0, max (last_canvas_unit, canvas_width), pos);
+       tempo_bar->property_x2() = canvas_width;
+       meter_bar->property_x2() = canvas_width;
+       marker_bar->property_x2() = canvas_width;
+       cd_marker_bar->property_x2() = canvas_width;
+       range_marker_bar->property_x2() = canvas_width;
+       transport_marker_bar->property_x2() = canvas_width;
 
-       // XXX what is the correct height value for the time canvas ? this overstates it
-       time_canvas.set_scroll_region ( 0.0, 0.0, max (last_canvas_unit, canvas_width), canvas_height);
+       update_fixed_rulers();
+       redisplay_tempo (true);
 
-       controls_layout.queue_resize();
+       Resized (); /* EMIT_SIGNAL */
+
+       return false;
 }
 
 void
@@ -360,11 +377,10 @@ Editor::controls_layout_size_request (Requisition* req)
        TreeModel::Children::iterator i;
        double pos;
 
-        for (pos = 0, i = rows.begin(); i != rows.end(); ++i) {
-               TimeAxisView *tv = (*i)[route_display_columns.tv];
+       for (pos = 0, i = rows.begin(); i != rows.end(); ++i) {
+               TimeAxisView *tv = (*i)[route_display_columns.tv];
                if (tv != 0) {
                        pos += tv->effective_height;
-                       pos += track_spacing;
                }
        }
 
@@ -374,12 +390,9 @@ Editor::controls_layout_size_request (Requisition* req)
                screen = Gdk::Screen::get_default();
        }
 
-       /* never let the width of the controls area shrink horizontally */
-
        edit_controls_vbox.check_resize();
-
        req->width = max (edit_controls_vbox.get_width(),  controls_layout.get_width());
-       
+
        /* don't get too big. the fudge factors here are just guesses */
        
        req->width = min (req->width, screen->get_width() - 300);
@@ -388,21 +401,31 @@ Editor::controls_layout_size_request (Requisition* req)
        /* this one is important: it determines how big the layout thinks it really is, as 
           opposed to what it displays on the screen
        */
+       
+       controls_layout.set_size (edit_controls_vbox.get_width(), (gint) pos);
+       controls_layout.set_size_request(edit_controls_vbox.get_width(), -1);
+       zoom_box.set_size_request(edit_controls_vbox.get_width(), -1);
+       //time_button_frame.set_size_request(edit_controls_vbox.get_width() + edit_vscrollbar.get_width(), -1);
+       time_button_frame.set_size_request(edit_controls_vbox.get_width(), -1);
+
+       if ((vertical_adjustment.get_value() + canvas_height) >= vertical_adjustment.get_upper()) {
+               /* 
+                  We're increasing the size of the canvas while the bottom is visible.
+                  We scroll down to keep in step with the controls layout.
+               */
+               vertical_adjustment.set_upper (pos + canvas_timebars_vsize);
+               vertical_adjustment.set_value (pos + canvas_timebars_vsize - canvas_height);
+       } else {
+               vertical_adjustment.set_upper (pos + canvas_timebars_vsize);
+       }
 
-       controls_layout.set_size (req->width, (gint) pos);
+       //cerr << "sizes = " << req->width << " " << edit_controls_vbox.get_width() << " " << controls_layout.get_width() << " " << zoom_box.get_width() << " " << time_button_frame.get_width() << endl;//DEBUG        
 }
 
 bool
 Editor::track_canvas_map_handler (GdkEventAny* ev)
 {
-       track_canvas.get_window()->set_cursor (*current_canvas_cursor);
-       return false;
-}
-
-bool
-Editor::time_canvas_map_handler (GdkEventAny* ev)
-{
-       time_canvas.get_window()->set_cursor (*timebar_cursor);
+       track_canvas->get_window()->set_cursor (*current_canvas_cursor);
        return false;
 }
 
@@ -412,6 +435,8 @@ Editor::track_canvas_drag_data_received (const RefPtr<Gdk::DragContext>& context
                                         const SelectionData& data,
                                         guint info, guint time)
 {
+       cerr << "drop on canvas, target = " << data.get_target() << endl;
+
        if (data.get_target() == "regions") {
                drop_regions (context, x, y, data, info, time);
        } else {
@@ -431,7 +456,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
        vector<ustring> paths;
        string spath;
        GdkEvent ev;
-       jack_nframes_t frame;
+       nframes64_t frame;
 
        if (convert_drop_to_paths (paths, context, x, y, data, info, time)) {
                goto out;
@@ -443,9 +468,9 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
        double wx;
        double wy;
 
-       track_canvas.window_to_world (x, y, wx, wy);
-       wx += horizontal_adjustment.get_value();
-       wy += vertical_adjustment.get_value();
+       track_canvas->window_to_world (x, y, wx, wy);
+       //wx += horizontal_adjustment.get_value();
+       //wy += vertical_adjustment.get_value();
        
        ev.type = GDK_BUTTON_RELEASE;
        ev.button.x = wx;
@@ -459,15 +484,27 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
 
                /* drop onto canvas background: create new tracks */
 
-               jack_nframes_t pos = 0;
-               do_embed (paths, false, ImportAsTrack, 0, pos, false);
+               frame = 0;
+
+               if (Profile->get_sae() || Config->get_only_copy_imported_files()) {
+                       do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, frame); 
+               } else {
+                       do_embed (paths, Editing::ImportDistinctFiles, ImportAsTrack, frame);
+               }
                
        } else if ((tv = dynamic_cast<AudioTimeAxisView*>(tvp)) != 0) {
 
                /* check that its an audio track, not a bus */
                
                if (tv->get_diskstream()) {
-                       do_embed (paths, false, ImportToTrack, tv->audio_track(), frame, true);
+                       /* select the track, then embed */
+                       selection->set (tv);
+
+                       if (Profile->get_sae() || Config->get_only_copy_imported_files()) {
+                               do_import (paths, Editing::ImportDistinctFiles, Editing::ImportToTrack, SrcBest, frame); 
+                       } else {
+                               do_embed (paths, Editing::ImportDistinctFiles, ImportToTrack, frame);
+                       }
                }
        }
 
@@ -481,11 +518,12 @@ Editor::drop_regions (const RefPtr<Gdk::DragContext>& context,
                      const SelectionData& data,
                      guint info, guint time)
 {
-       const DnDTreeView::SerializedObjectPointers* sr = reinterpret_cast<const DnDTreeView::SerializedObjectPointers*> (data.get_data());
+       const SerializedObjectPointers<boost::shared_ptr<Region> >* sr = 
+               reinterpret_cast<const SerializedObjectPointers<boost::shared_ptr<Region> > *> (data.get_data());
 
        for (uint32_t i = 0; i < sr->cnt; ++i) {
 
-               boost::shared_ptr<Region> r (reinterpret_cast<Region*> (sr->ptr[i]));
+               boost::shared_ptr<Region> r = sr->data[i];
                boost::shared_ptr<AudioRegion> ar;
 
                if ((ar = boost::dynamic_pointer_cast<AudioRegion>(r)) != 0) {
@@ -497,160 +535,448 @@ Editor::drop_regions (const RefPtr<Gdk::DragContext>& context,
 }
 
 void
-Editor::maybe_autoscroll (GdkEvent* event)
+Editor::maybe_autoscroll (GdkEventMotion* event)
 {
-       jack_nframes_t rightmost_frame = leftmost_frame + current_page_frames();
-       jack_nframes_t frame = drag_info.current_pointer_frame;
+       nframes64_t rightmost_frame = leftmost_frame + current_page_frames();
+       nframes64_t frame = drag_info.current_pointer_frame;
        bool startit = false;
+       double vertical_pos = vertical_adjustment.get_value();
+       double upper = vertical_adjustment.get_upper();
+
+       /* 
+          adjust the event.y to take account of the bounds 
+          of the _trackview_group 
+       */
+
+       double vsx1, vsx2, vsy1, vsy2;
+       _trackview_group->get_bounds (vsx1, vsy1, vsx2, vsy2);
+
+       autoscroll_y = 0;
+       autoscroll_x = 0;
+
+       if ((event->y - vsy1) < vertical_pos) {
+               autoscroll_y = -1;
+               startit = true;
+       }
 
-       static int last_autoscroll_direction = 0;
+       if ((event->y - vsy1) > (vertical_pos + canvas_height - canvas_timebars_vsize) && vertical_pos <= upper) {
+               autoscroll_y = 1;
+               startit = true;
+       }
 
        if (frame > rightmost_frame) {
 
                if (rightmost_frame < max_frames) {
-                       autoscroll_direction = 1;
+                       autoscroll_x = 1;
                        startit = true;
                }
 
        } else if (frame < leftmost_frame) {
-
                if (leftmost_frame > 0) {
-                       autoscroll_direction = -1;
+                       autoscroll_x = -1;
                        startit = true;
                }
 
-       } else {
+       }
 
-               if (drag_info.last_pointer_frame > drag_info.current_pointer_frame) {
-                       autoscroll_direction = -1;
-               } else {
-                       autoscroll_direction = 1;
-               }
+       if (!allow_vertical_scroll) {
+               autoscroll_y = 0;
+       }
+
+       if ((autoscroll_x != last_autoscroll_x) || (autoscroll_y != last_autoscroll_y) || (autoscroll_x == 0 && autoscroll_y == 0)) {
+               stop_canvas_autoscroll ();
+       }
+       
+       if (startit && autoscroll_timeout_tag < 0) {
+               start_canvas_autoscroll (autoscroll_x, autoscroll_y);
        }
 
+       last_autoscroll_x = autoscroll_x;
+       last_autoscroll_y = autoscroll_y;
+}
 
-       if (autoscroll_direction != last_autoscroll_direction) {
+void
+Editor::maybe_autoscroll_horizontally (GdkEventMotion* event)
+{
+       nframes64_t rightmost_frame = leftmost_frame + current_page_frames();
+       nframes64_t frame = drag_info.current_pointer_frame;
+       bool startit = false;
+
+       autoscroll_y = 0;
+       autoscroll_x = 0;
+
+       if (frame > rightmost_frame) {
+
+               if (rightmost_frame < max_frames) {
+                       autoscroll_x = 1;
+                       startit = true;
+               }
+
+       } else if (frame < leftmost_frame) {
+               if (leftmost_frame > 0) {
+                       autoscroll_x = -1;
+                       startit = true;
+               }
+
+       }
+
+       if ((autoscroll_x != last_autoscroll_x) || (autoscroll_y != last_autoscroll_y) || (autoscroll_x == 0 && autoscroll_y == 0)) {
                stop_canvas_autoscroll ();
        }
        
        if (startit && autoscroll_timeout_tag < 0) {
-               start_canvas_autoscroll (autoscroll_direction);
+               start_canvas_autoscroll (autoscroll_x, autoscroll_y);
        }
 
-       last_autoscroll_direction = autoscroll_direction;
+       last_autoscroll_x = autoscroll_x;
+       last_autoscroll_y = autoscroll_y;
 }
 
 gint
 Editor::_autoscroll_canvas (void *arg)
 {
-       return ((Editor *) arg)->autoscroll_canvas ();
+        return ((Editor *) arg)->autoscroll_canvas ();
 }
 
-gint
+bool
 Editor::autoscroll_canvas ()
 {
-       jack_nframes_t new_frame;
-       bool keep_calling = true;
-       jack_nframes_t limit = max_frames - current_page_frames();
+       nframes64_t new_frame;
+       nframes64_t limit = max_frames - current_page_frames();
        GdkEventMotion ev;
-       jack_nframes_t target_frame;
+       bool in_track_canvas;
+       double new_pixel;
+       double target_pixel;
+
+       if (autoscroll_x_distance != 0) {
+
+               if (autoscroll_cnt == 50) { /* 0.5 seconds */
+                       
+                       /* after about a while, speed up a bit by changing the timeout interval */
+                       
+                       autoscroll_x_distance = (nframes64_t) floor (current_page_frames()/30.0f);
+                       
+               } else if (autoscroll_cnt == 150) { /* 1.0 seconds */
+                       
+                       autoscroll_x_distance = (nframes64_t) floor (current_page_frames()/20.0f);
+                       
+               } else if (autoscroll_cnt == 300) { /* 1.5 seconds */
+                       
+                       /* after about another while, speed up by increasing the shift per callback */
+                       
+                       autoscroll_x_distance =  (nframes64_t) floor (current_page_frames()/10.0f);
+                       
+               } 
+       }
+
+       if (autoscroll_y_distance != 0) {
+
+               if (autoscroll_cnt == 50) { /* 0.5 seconds */
+                       
+                       /* after about a while, speed up a bit by changing the timeout interval */
+                       
+                       autoscroll_y_distance = 10;
+                       
+               } else if (autoscroll_cnt == 150) { /* 1.0 seconds */
+                       
+                       autoscroll_y_distance = 20;
+                       
+               } else if (autoscroll_cnt == 300) { /* 1.5 seconds */
+                       
+                       /* after about another while, speed up by increasing the shift per callback */
+                       
+                       autoscroll_y_distance =  40;
+               } 
+       }
 
-       if (autoscroll_direction < 0) {
-               if (leftmost_frame < autoscroll_distance) {
+       if (autoscroll_x < 0) {
+               if (leftmost_frame < autoscroll_x_distance) {
                        new_frame = 0;
                } else {
-                       new_frame = leftmost_frame - autoscroll_distance;
+                       new_frame = leftmost_frame - autoscroll_x_distance;
                }
-               target_frame = drag_info.current_pointer_frame - autoscroll_distance;
-       } else {
-               if (leftmost_frame > limit - autoscroll_distance) {
+       } else if (autoscroll_x > 0) {
+               if (leftmost_frame > limit - autoscroll_x_distance) {
                        new_frame = limit;
                } else {
-                       new_frame = leftmost_frame + autoscroll_distance;
+                       new_frame = leftmost_frame + autoscroll_x_distance;
                }
-               target_frame = drag_info.current_pointer_frame + autoscroll_distance;
+       } else {
+               new_frame = leftmost_frame;
        }
 
-       if (new_frame != leftmost_frame) {
-               reposition_x_origin (new_frame);
+       double vertical_pos = vertical_adjustment.get_value();
+
+       if (autoscroll_y < 0) {
+
+               if (vertical_pos < autoscroll_y_distance) {
+                       new_pixel = 0;
+               } else {
+                       new_pixel = vertical_pos - autoscroll_y_distance;
+               }
+
+               target_pixel = drag_info.current_pointer_y - autoscroll_y_distance;
+               target_pixel = max (target_pixel, 0.0);
+
+       } else if (autoscroll_y > 0) {
+
+               double top_of_bottom_of_canvas = full_canvas_height - canvas_height;
+
+               if (vertical_pos > full_canvas_height - autoscroll_y_distance) {
+                       new_pixel = full_canvas_height;
+               } else {
+                       new_pixel = vertical_pos + autoscroll_y_distance;
+               }
+
+               new_pixel = min (top_of_bottom_of_canvas, new_pixel);
+
+               target_pixel = drag_info.current_pointer_y + autoscroll_y_distance;
+               
+               /* don't move to the full canvas height because the item will be invisible
+                  (its top edge will line up with the bottom of the visible canvas.
+               */
+
+               target_pixel = min (target_pixel, full_canvas_height - 10);
+               
+       } else {
+               target_pixel = drag_info.current_pointer_y;
+               new_pixel = vertical_pos;
        }
 
-       /* now fake a motion event to get the object that is being dragged to move too */
 
-       ev.type = GDK_MOTION_NOTIFY;
-       ev.state &= Gdk::BUTTON1_MASK;
-       ev.x = frame_to_unit (target_frame);
-       ev.y = drag_info.current_pointer_y;
-       motion_handler (drag_info.item, (GdkEvent*) &ev, drag_info.item_type, true);
 
-       if (new_frame == 0 || new_frame == limit) {
+       if ((new_frame == 0 || new_frame == limit) && (new_pixel == 0 || new_pixel == DBL_MAX)) {
                /* we are done */
                return false;
        }
 
-       autoscroll_cnt++;
-
-       if (autoscroll_cnt == 1) {
+       if (new_frame != leftmost_frame) {
+               reset_x_origin (new_frame);
+       }
 
-               /* connect the timeout so that we get called repeatedly */
+       vertical_adjustment.set_value (new_pixel);
 
-               autoscroll_timeout_tag = gtk_timeout_add (20, _autoscroll_canvas, this);
-               keep_calling = false;
+       /* fake an event. */
 
-       } else if (autoscroll_cnt == 50) { /* 0.5 seconds */
-               
-               /* after about a while, speed up a bit by changing the timeout interval */
+       Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->track_canvas->get_window();
+       gint x, y;
+       Gdk::ModifierType mask;
+       canvas_window->get_pointer (x, y, mask);
+       ev.type = GDK_MOTION_NOTIFY;
+       ev.state |= Gdk::BUTTON1_MASK;
+       ev.x = x;
+       ev.y = y;
 
-               autoscroll_distance = (jack_nframes_t) floor (current_page_frames()/50.0f);
-               
-       } else if (autoscroll_cnt == 75) { /* 1.0 seconds */
+       motion_handler (drag_info.item, (GdkEvent*) &ev, drag_info.item_type, true);
 
-               autoscroll_distance = (jack_nframes_t) floor (current_page_frames()/20.0f);
+       autoscroll_cnt++;
 
-       } else if (autoscroll_cnt == 100) { /* 1.5 seconds */
+       if (autoscroll_cnt == 1) {
 
-               /* after about another while, speed up by increasing the shift per callback */
+               /* connect the timeout so that we get called repeatedly */
 
-               autoscroll_distance =  (jack_nframes_t) floor (current_page_frames()/10.0f);
+               autoscroll_timeout_tag = g_idle_add ( _autoscroll_canvas, this);
+               return false;
 
        } 
 
-       return keep_calling;
+       return true;
 }
 
 void
-Editor::start_canvas_autoscroll (int dir)
+Editor::start_canvas_autoscroll (int dx, int dy)
 {
-       if (!session) {
+       if (!session || autoscroll_active) {
                return;
        }
 
        stop_canvas_autoscroll ();
 
-       autoscroll_direction = dir;
-       autoscroll_distance = (jack_nframes_t) floor (current_page_frames()/50.0);
+       autoscroll_active = true;
+       autoscroll_x = dx;
+       autoscroll_y = dy;
+       autoscroll_x_distance = (nframes64_t) floor (current_page_frames()/50.0);
+       autoscroll_y_distance = fabs (dy * 5); /* pixels */
        autoscroll_cnt = 0;
        
        /* do it right now, which will start the repeated callbacks */
-       
+
        autoscroll_canvas ();
 }
 
 void
 Editor::stop_canvas_autoscroll ()
 {
+
        if (autoscroll_timeout_tag >= 0) {
-               gtk_timeout_remove (autoscroll_timeout_tag);
+               g_source_remove (autoscroll_timeout_tag);
                autoscroll_timeout_tag = -1;
        }
+
+       autoscroll_active = false;
 }
 
-gint
+bool
 Editor::left_track_canvas (GdkEventCrossing *ev)
 {
        set_entered_track (0);
        set_entered_regionview (0);
+       reset_canvas_action_sensitivity (false);
+       return false;
+}
+
+bool
+Editor::entered_track_canvas (GdkEventCrossing *ev)
+{
+       reset_canvas_action_sensitivity (true);
        return FALSE;
 }
 
+void
+Editor::tie_vertical_scrolling ()
+{
+       scroll_canvas_vertically ();
+
+       /* this will do an immediate redraw */
+
+       controls_layout.get_vadjustment()->set_value (vertical_adjustment.get_value());
+}
+
+void
+Editor::scroll_canvas_horizontally ()
+{
+       nframes64_t time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
+
+       if (time_origin != leftmost_frame) {
+               canvas_scroll_to (time_origin);
+       }
+
+       /* horizontal scrolling only */
+       double x1, x2, y1, y2, x_delta;
+
+       _master_group->get_bounds(x1, y1, x2, y2);
+       x_delta = x1 + horizontal_adjustment.get_value();
+
+       _master_group->move (-x_delta, 0);
+       timebar_group->move (-x_delta, 0);
+       cursor_group->move (-x_delta, 0);
+}
+
+void
+Editor::scroll_canvas_vertically ()
+{
+       /* vertical scrolling only */
+       double x1, x2, y1, y2, y_delta;
+
+       _trackview_group->get_bounds(x1, y1, x2, y2);
+       y_delta = y1 + vertical_adjustment.get_value() - canvas_timebars_vsize;
+
+       _trackview_group->move (0, -y_delta);
+       _region_motion_group->move (0, -y_delta);
+
+       /* required to keep the controls_layout in sync with the canvas group */
+       track_canvas->update_now ();
+
+}
+
+void 
+Editor::canvas_horizontally_scrolled ()
+{
+       nframes64_t time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
+
+       if (time_origin != leftmost_frame) {
+               canvas_scroll_to (time_origin);
+       }
+}
+
+void
+Editor::canvas_scroll_to (nframes64_t time_origin)
+{
+       leftmost_frame = time_origin;
+       nframes64_t rightmost_frame = leftmost_frame + current_page_frames ();
+
+       if (rightmost_frame > last_canvas_frame) {
+               last_canvas_frame = rightmost_frame;
+               //reset_scrolling_region ();
+       }
+
+       update_fixed_rulers ();
+
+       redisplay_tempo (!_dragging_hscrollbar);
+}
+
+void
+Editor::color_handler()
+{
+       playhead_cursor->canvas_item.property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_PlayHead.get();
+       verbose_canvas_cursor->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VerboseCanvasCursor.get();
+
+       meter_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MeterBar.get();
+       meter_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
+
+       tempo_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TempoBar.get();
+       tempo_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
+
+       marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBar.get();
+       marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
+
+       cd_marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CDMarkerBar.get();
+       cd_marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
+
+       range_marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeMarkerBar.get();
+       range_marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
+
+       transport_marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportMarkerBar.get();
+       transport_marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
+
+       cd_marker_bar_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get();
+       cd_marker_bar_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get();
+
+       range_bar_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get();
+       range_bar_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get();
+
+       transport_bar_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportDragRect.get();
+       transport_bar_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportDragRect.get();
+
+       marker_drag_line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerDragLine.get();
+
+       range_marker_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragRect.get();
+       range_marker_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragRect.get();
+
+       transport_loop_range_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportLoopRect.get();
+       transport_loop_range_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportLoopRect.get();
+
+       transport_punch_range_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportPunchRect.get();
+       transport_punch_range_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportPunchRect.get();
+
+       transport_punchin_line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_PunchLine.get();
+       transport_punchout_line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_PunchLine.get();
+
+       zoom_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ZoomRect.get();
+       zoom_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ZoomRect.get();
+
+       rubberband_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RubberBandRect.get();
+       rubberband_rect->property_fill_color_rgba() = (guint32) ARDOUR_UI::config()->canvasvar_RubberBandRect.get();
+
+       location_marker_color = ARDOUR_UI::config()->canvasvar_LocationMarker.get();
+       location_range_color = ARDOUR_UI::config()->canvasvar_LocationRange.get();
+       location_cd_marker_color = ARDOUR_UI::config()->canvasvar_LocationCDMarker.get();
+       location_loop_color = ARDOUR_UI::config()->canvasvar_LocationLoop.get();
+       location_punch_color = ARDOUR_UI::config()->canvasvar_LocationPunch.get();
+
+       refresh_location_display ();
+       redisplay_tempo (true);
+
+       if (session)
+               session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
+}
+
+void
+Editor::flush_canvas ()
+{
+       if (is_mapped()) {
+               track_canvas->update_now ();
+               // gdk_window_process_updates (GTK_LAYOUT(track_canvas->gobj())->bin_window, true);
+       }
+}