hans' patches for MIDI note resizing++
[ardour.git] / gtk2_ardour / editor_canvas.cc
index 55a8c47b01fe7371a3019fae690146e26da685a5..1331ce8759081809535dfa30387156e52b5a4218 100644 (file)
@@ -22,6 +22,7 @@
 #include <gtkmm2ext/utils.h>
 
 #include <ardour/audioregion.h>
+#include <ardour/profile.h>
 
 #include "ardour_ui.h"
 #include "editor.h"
@@ -97,25 +98,36 @@ static void ardour_canvas_type_init()
 void
 Editor::initialize_canvas ()
 {
+       if (getenv ("ARDOUR_NON_AA_CANVAS")) {
+               track_canvas = new ArdourCanvas::Canvas ();
+               time_canvas = new ArdourCanvas::Canvas ();
+       } else {
+               track_canvas = new ArdourCanvas::CanvasAA ();
+               time_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_dither         (Gdk::RGB_DITHER_NONE);
+       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_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.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);
+       /* just scroll stuff for the timecanvas */
+       time_canvas->signal_scroll_event().connect (mem_fun (*this, &Editor::time_canvas_scroll_event));
+
+       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);
 
        /* set up drag-n-drop */
 
@@ -123,19 +135,20 @@ Editor::initialize_canvas ()
        
        // Drag-N-Drop from the region list can generate this target
        target_table.push_back (TargetEntry ("regions"));
+       target_table.push_back (TargetEntry ("routes"));
 
        target_table.push_back (TargetEntry ("text/plain"));
        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"));
 
-       verbose_canvas_cursor = new ArdourCanvas::Text (*track_canvas.root());
+       verbose_canvas_cursor = new ArdourCanvas::Text (*track_canvas->root());
        verbose_canvas_cursor->property_font_desc() = *font;
        verbose_canvas_cursor->property_anchor() = ANCHOR_NW;
        
@@ -143,42 +156,69 @@ Editor::initialize_canvas ()
 
        verbose_cursor_visible = false;
        
+       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 ();
+       }
+       
        /* 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_line_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
+       tempo_lines = new TempoLines(*track_canvas, time_line_group);
+       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);
-       time_canvas.set_dither          (Gdk::RGB_DITHER_NONE);
+       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);
+       time_canvas->set_dither (Gdk::RGB_DITHER_NONE);
        
-       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);
+       marker_time_line_group = new ArdourCanvas::Group (*time_canvas->root(), 0.0, 0.0);
+       marker_tempo_lines = new TempoLines(*time_canvas, marker_time_line_group);
+       
+       meter_group = new ArdourCanvas::Group (*time_canvas->root(), 0.0, 0.0);
+       tempo_group = new ArdourCanvas::Group (*time_canvas->root(), 0.0, timebar_height);
+       range_marker_group = new ArdourCanvas::Group (*time_canvas->root(), 0.0, timebar_height * 2.0);
+       transport_marker_group = new ArdourCanvas::Group (*time_canvas->root(), 0.0, timebar_height * 3.0);
+       marker_group = new ArdourCanvas::Group (*time_canvas->root(), 0.0, timebar_height * 4.0);
+       cd_marker_group = new ArdourCanvas::Group (*time_canvas->root(), 0.0, timebar_height * 5.0);
        
        tempo_bar = new ArdourCanvas::SimpleRect (*tempo_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0);
+
        tempo_bar->property_outline_what() = (0x1 | 0x8);
        tempo_bar->property_outline_pixels() = 1;
        
        meter_bar = new ArdourCanvas::SimpleRect (*meter_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0);
+
        meter_bar->property_outline_what() = (0x1 | 0x8);
        meter_bar->property_outline_pixels() = 1;
        
        marker_bar = new ArdourCanvas::SimpleRect (*marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0);
+
        marker_bar->property_outline_what() = (0x1 | 0x8);
        marker_bar->property_outline_pixels() = 1;
+
+       cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0);
+       cd_marker_bar->property_outline_what() = (0x1 | 0x8);
+       cd_marker_bar->property_outline_pixels() = 1;
        
        range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0);
        range_marker_bar->property_outline_what() = (0x1 | 0x8);
        range_marker_bar->property_outline_pixels() = 1;
        
        transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0);
+
        transport_marker_bar->property_outline_what() = (0x1 | 0x8);
        transport_marker_bar->property_outline_pixels() = 1;
+       
+       cd_marker_bar_drag_rect = new ArdourCanvas::SimpleRect (*cd_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0);
+       // 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, max_canvas_coordinate, timebar_height-1.0);
        range_bar_drag_rect->property_outline_pixels() = 0;
@@ -191,12 +231,12 @@ Editor::initialize_canvas ()
        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 = new ArdourCanvas::Line (*track_canvas.root());
+       marker_drag_line = new ArdourCanvas::Line (*track_canvas->root());
        marker_drag_line->property_width_pixels() = 1;
        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 = new ArdourCanvas::SimpleRect (*track_canvas->root(), 0.0, 0.0, 0.0, 0.0);
        range_marker_drag_rect->hide ();
        
        transport_loop_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
@@ -224,20 +264,21 @@ Editor::initialize_canvas ()
        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 = new ArdourCanvas::SimpleRect (*track_canvas->root(), 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 = new ArdourCanvas::SimpleRect (*track_canvas->root(), 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));
        
@@ -246,13 +287,16 @@ Editor::initialize_canvas ()
        
        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);
+       time_canvas->set_scroll_region(0.0, 0.0, time_width, time_height);
 
-       edit_cursor = new Cursor (*this, &Editor::canvas_edit_cursor_event);
        playhead_cursor = new Cursor (*this, &Editor::canvas_playhead_cursor_event);
 
        initial_ruler_update_required = true;
-       track_canvas.signal_size_allocate().connect (mem_fun(*this, &Editor::track_canvas_allocate));
+       track_canvas->signal_size_allocate().connect (mem_fun(*this, &Editor::track_canvas_allocate));
+
+       if (logo_item) {
+               logo_item->lower_to_bottom ();
+       }
 
        ColorsChanged.connect (mem_fun (*this, &Editor::color_handler));
        color_handler();
@@ -274,7 +318,6 @@ Editor::track_canvas_allocate (Gtk::Allocation alloc)
        } 
 
        initial_ruler_update_required = false;
-       
        track_canvas_size_allocated ();
 }
 
@@ -304,48 +347,33 @@ Editor::track_canvas_size_allocated ()
        }
 
        zoom_range_clock.set ((nframes_t) floor ((canvas_width * frames_per_unit)));
-       edit_cursor->set_position (edit_cursor->current_frame);
        playhead_cursor->set_position (playhead_cursor->current_frame);
 
        reset_hscrollbar_stepping ();
        reset_scrolling_region ();
 
-       if (edit_cursor) edit_cursor->set_length (canvas_height);
        if (playhead_cursor) playhead_cursor->set_length (canvas_height);
 
-       if (marker_drag_line) {
-               marker_drag_line_points.back().set_y(canvas_height);
-               marker_drag_line->property_points() = marker_drag_line_points;
+       double y1 = vertical_adjustment.get_value ();
+       
+       for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
+               (*x)->set_line_vpos (y1, canvas_height);
        }
 
-       if (range_marker_drag_rect) {
-               range_marker_drag_rect->property_y1() = 0.0;
-               range_marker_drag_rect->property_y2() = canvas_height;
-       }
-
-       if (transport_loop_range_rect) {
-               transport_loop_range_rect->property_y1() = 0.0;
-               transport_loop_range_rect->property_y2() = canvas_height;
-       }
-
-       if (transport_punch_range_rect) {
-               transport_punch_range_rect->property_y1() = 0.0;
-               transport_punch_range_rect->property_y2() = canvas_height;
-       }
-
-       if (transport_punchin_line) {
-               transport_punchin_line->property_y1() = 0.0;
-               transport_punchin_line->property_y2() = canvas_height;
-       }
-
-       if (transport_punchout_line) {
-               transport_punchout_line->property_y1() = 0.0;
-               transport_punchout_line->property_y2() = canvas_height;
-       }
-               
+       range_marker_drag_rect->property_y1() = y1;
+       range_marker_drag_rect->property_y2() = full_canvas_height;
+       transport_loop_range_rect->property_y1() = y1;
+       transport_loop_range_rect->property_y2() = full_canvas_height;
+       transport_punch_range_rect->property_y1() = y1;
+       transport_punch_range_rect->property_y2() = full_canvas_height;
+       transport_punchin_line->property_y1() = y1;
+       transport_punchin_line->property_y2() = full_canvas_height;
+       transport_punchout_line->property_y1() = y1;
+       transport_punchout_line->property_y2() = full_canvas_height;
+       
        update_fixed_rulers();
        redisplay_tempo (true);
-       
+
        Resized (); /* EMIT_SIGNAL */
 
        return false;
@@ -365,12 +393,20 @@ Editor::reset_scrolling_region (Gtk::Allocation* alloc)
                }
        }
 
-       double last_canvas_unit =  last_canvas_frame / frames_per_unit;
+       double last_canvas_unit =  max ((last_canvas_frame / frames_per_unit), canvas_width);
 
-       track_canvas.set_scroll_region (0.0, 0.0, max (last_canvas_unit, canvas_width), pos);
+       track_canvas->set_scroll_region (0.0, 0.0, last_canvas_unit, pos);
 
        // 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);
+       time_canvas->set_scroll_region ( 0.0, 0.0, last_canvas_unit, 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;
+
+       update_punch_range_view (true);
 
        controls_layout.queue_resize();
 }
@@ -382,8 +418,8 @@ 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;
                }
@@ -395,12 +431,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);
@@ -409,21 +442,26 @@ 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(), -1);
 
-       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);
+       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);
+       time_canvas->get_window()->set_cursor (*timebar_cursor);
        return false;
 }
 
@@ -433,9 +471,15 @@ 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 {
+       }
+       else if(data.get_target() == "routes") {
+               drop_routes (context, x, y, data, info, time);
+       }
+       else {
                drop_paths (context, x, y, data, info, time);
        }
 }
@@ -452,7 +496,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
        vector<ustring> paths;
        string spath;
        GdkEvent ev;
-       nframes_t frame;
+       nframes64_t frame;
 
        if (convert_drop_to_paths (paths, context, x, y, data, info, time)) {
                goto out;
@@ -464,7 +508,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
        double wx;
        double wy;
 
-       track_canvas.window_to_world (x, y, wx, wy);
+       track_canvas->window_to_world (x, y, wx, wy);
        wx += horizontal_adjustment.get_value();
        wy += vertical_adjustment.get_value();
        
@@ -480,15 +524,27 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
 
                /* drop onto canvas background: create new tracks */
 
-               nframes_t pos = 0;
-               do_embed (paths, false, ImportAsTrack, 0, pos, false);
+               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<RouteTimeAxisView*>(tvp)) != 0) {
 
                /* check that its an audio track, not a bus */
                
+               /* check that its an audio track, not a bus */
+               
                if (tv->get_diskstream()) {
-                       do_embed (paths, false, ImportToTrack, tv->audio_track().get(), 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);
+                       }
                }
        }
 
@@ -515,6 +571,22 @@ Editor::drop_regions (const RefPtr<Gdk::DragContext>& context,
        context->drag_finish (true, false, time);
 }
 
+void
+Editor::drop_routes (const Glib::RefPtr<Gdk::DragContext>& context,
+                    int x, int y,
+                    const Gtk::SelectionData& data,
+                    guint info, guint time) {
+       const SerializedObjectPointers<boost::shared_ptr<Route> >* sr = 
+               reinterpret_cast<const SerializedObjectPointers<boost::shared_ptr<Route> > *> (data.get_data());
+
+       for (uint32_t i = 0; i < sr->cnt; ++i) {
+               boost::shared_ptr<Route> r = sr->data[i];
+               insert_route_list_drag (r, x, y);
+       }
+
+       context->drag_finish (true, false, time);
+}
+
 void
 Editor::maybe_autoscroll (GdkEvent* event)
 {
@@ -676,24 +748,64 @@ Editor::left_track_canvas (GdkEventCrossing *ev)
        return FALSE;
 }
 
+void
+Editor::tie_vertical_scrolling ()
+{
+       double y1 = vertical_adjustment.get_value();
+
+       playhead_cursor->set_y_axis (y1);
+
+       range_marker_drag_rect->property_y1() = y1;
+       range_marker_drag_rect->property_y2() = full_canvas_height;
+       transport_loop_range_rect->property_y1() = y1;
+       transport_loop_range_rect->property_y2() = full_canvas_height;
+       transport_punch_range_rect->property_y1() = y1;
+       transport_punch_range_rect->property_y2() = full_canvas_height;
+       transport_punchin_line->property_y1() = y1;
+       transport_punchin_line->property_y2() = full_canvas_height;
+       transport_punchout_line->property_y1() = y1;
+       transport_punchout_line->property_y2() = full_canvas_height;
+
+       if (!selection->markers.empty()) {
+               for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {            
+                       (*x)->set_line_vpos (y1, canvas_height);
+               }
+       }
+
+       if (logo_item) {
+               logo_item->property_y() = y1;
+       }
+
+       /* this will do an immediate redraw */
+
+       controls_layout.get_vadjustment()->set_value (y1);
+}
 
 void 
 Editor::canvas_horizontally_scrolled ()
 {
-       /* this is the core function that controls horizontal scrolling of the canvas. it is called
-          whenever the horizontal_adjustment emits its "value_changed" signal. it typically executes in an
-          idle handler, which is important because tempo_map_changed() should issue redraws immediately
-          and not defer them to an idle handler.
-       */
+       nframes64_t time_origin = (nframes_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
+
+       if (time_origin != leftmost_frame) {
+               canvas_scroll_to (time_origin);
+       }
+}
 
-       leftmost_frame = (nframes_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
+void
+Editor::canvas_scroll_to (nframes64_t time_origin)
+{
+       leftmost_frame = time_origin;
        nframes_t rightmost_frame = leftmost_frame + current_page_frames ();
-       
+
        if (rightmost_frame > last_canvas_frame) {
                last_canvas_frame = rightmost_frame;
                reset_scrolling_region ();
        }
        
+       if (logo_item) {
+               logo_item->property_x() = horizontal_adjustment.get_value ();
+       }
+
        update_fixed_rulers ();
 
        redisplay_tempo (!_dragging_hscrollbar);
@@ -702,7 +814,6 @@ Editor::canvas_horizontally_scrolled ()
 void
 Editor::color_handler()
 {
-       edit_cursor->canvas_item.property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EditCursor.get();
        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();
        
@@ -715,12 +826,18 @@ Editor::color_handler()
        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();
 
@@ -760,3 +877,12 @@ Editor::color_handler()
                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);
+       }
+}