X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas.cc;h=031e58bf615e415d273449ea9717472c44eddd1e;hb=bbb65d07d33160366533d9f2390f3f8d56fcb8e1;hp=bdb051173d385cc75c4e71e3537752d8250244a5;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index bdb051173d..031e58bf61 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2005 Paul Davis + Copyright (C) 2005 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,8 +22,8 @@ #include #include -#include "ardour/audioregion.h" #include "ardour/profile.h" +#include "ardour/rc_configuration.h" #include "ardour_ui.h" #include "editor.h" @@ -36,16 +36,19 @@ #include "simpleline_p.h" #include "imageframe_p.h" #include "canvas_impl.h" +#include "canvas-noevent-text.h" #include "editing.h" #include "rgb_macros.h" #include "utils.h" -#include "time_axis_view.h" #include "audio_time_axis.h" +#include "editor_drag.h" +#include "region_view.h" +#include "editor_group_tabs.h" +#include "editor_routes.h" #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -67,22 +70,22 @@ GType gnome_canvas_imageframe_get_type(void); } -static void ardour_canvas_type_init() +static void ardour_canvas_type_init() { // Map gtypes to gtkmm wrapper-creation functions: - + Glib::wrap_register(gnome_canvas_simpleline_get_type(), &Gnome::Canvas::SimpleLine_Class::wrap_new); Glib::wrap_register(gnome_canvas_simplerect_get_type(), &Gnome::Canvas::SimpleRect_Class::wrap_new); Glib::wrap_register(gnome_canvas_waveview_get_type(), &Gnome::Canvas::WaveView_Class::wrap_new); // Glib::wrap_register(gnome_canvas_imageframe_get_type(), &Gnome::Canvas::ImageFrame_Class::wrap_new); - + // Register the gtkmm gtypes: (void) Gnome::Canvas::WaveView::get_type(); (void) Gnome::Canvas::SimpleLine::get_type(); (void) Gnome::Canvas::SimpleRect::get_type(); (void) Gnome::Canvas::ImageFrame::get_type(); -} +} void Editor::initialize_canvas () @@ -92,7 +95,7 @@ Editor::initialize_canvas () } else { track_canvas = new ArdourCanvas::CanvasAA (); } - + ArdourCanvas::init (); ardour_canvas_type_init (); @@ -113,16 +116,16 @@ Editor::initialize_canvas () Pango::FontDescription* font = get_font_for_style (N_("VerboseCanvasCursor")); - verbose_canvas_cursor = new ArdourCanvas::Text (*track_canvas->root()); + verbose_canvas_cursor = new ArdourCanvas::NoEventText (*track_canvas->root()); verbose_canvas_cursor->property_font_desc() = *font; verbose_canvas_cursor->property_anchor() = ANCHOR_NW; delete font; - + verbose_cursor_visible = false; /* on the bottom, an image */ - + 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()); @@ -133,7 +136,7 @@ Editor::initialize_canvas () logo_item->show (); } - /* a group to hold time (measure) lines */ + /* a group to hold time (measure) lines */ time_line_group = new ArdourCanvas::Group (*track_canvas->root()); #ifdef GTKOSX @@ -152,9 +155,6 @@ Editor::initialize_canvas () _background_group = new ArdourCanvas::Group (*track_canvas->root()); _master_group = new ArdourCanvas::Group (*track_canvas->root()); - range_marker_drag_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, physical_screen_height); - range_marker_drag_rect->hide (); - _trackview_group = new ArdourCanvas::Group (*_master_group); _region_motion_group = new ArdourCanvas::Group (*_trackview_group); @@ -187,7 +187,7 @@ Editor::initialize_canvas () range_marker_bar->property_outline_pixels() = 0; } range_marker_bar->property_outline_what() = (0x1 | 0x8); - + transport_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); if (Profile->get_sae()) { transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); @@ -207,7 +207,7 @@ Editor::initialize_canvas () marker_bar->property_outline_pixels() = 0; } marker_bar->property_outline_what() = (0x1 | 0x8); - + cd_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); if (Profile->get_sae()) { cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); @@ -228,14 +228,6 @@ Editor::initialize_canvas () 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, physical_screen_height)); - - marker_drag_line = new ArdourCanvas::Line (*timebar_group); - marker_drag_line->property_width_pixels() = 1; - marker_drag_line->property_points() = marker_drag_line_points; - marker_drag_line->hide(); - 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 (); @@ -254,56 +246,57 @@ Editor::initialize_canvas () transport_punchin_line->property_x2() = 0.0; transport_punchin_line->property_y2() = physical_screen_height; transport_punchin_line->hide (); - + 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() = physical_screen_height; transport_punchout_line->hide(); - + // used to show zoom mode active zooming 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)); - + + zoom_rect->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0)); + // used as rubberband rect 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)); - playhead_cursor = new Cursor (*this, &Editor::canvas_playhead_cursor_event); + tempo_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar)); + meter_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar)); + marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar)); + cd_marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar)); + range_marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar)); + transport_marker_bar->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar)); + + playhead_cursor = new EditorCursor (*this, &Editor::canvas_playhead_cursor_event); if (logo_item) { logo_item->lower_to_bottom (); } /* 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 (sigc::mem_fun (*this, &Editor::track_canvas_scroll_event)); + track_canvas->signal_motion_notify_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_motion_notify_event)); + track_canvas->signal_button_press_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_button_press_event)); + track_canvas->signal_button_release_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_button_release_event)); + track_canvas->signal_drag_motion().connect (sigc::mem_fun (*this, &Editor::track_canvas_drag_motion)); 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->signal_leave_notify_event().connect (sigc::mem_fun(*this, &Editor::left_track_canvas)); + track_canvas->signal_enter_notify_event().connect (sigc::mem_fun(*this, &Editor::entered_track_canvas)); track_canvas->set_flags (CAN_FOCUS); /* set up drag-n-drop */ vector target_table; - + // Drag-N-Drop from the region list can generate this target target_table.push_back (TargetEntry ("regions")); @@ -312,11 +305,11 @@ Editor::initialize_canvas () 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->signal_drag_data_received().connect (sigc::mem_fun(*this, &Editor::track_canvas_drag_data_received)); - track_canvas->signal_size_allocate().connect (mem_fun(*this, &Editor::track_canvas_allocate)); + track_canvas->signal_size_allocate().connect (sigc::mem_fun(*this, &Editor::track_canvas_allocate)); - ColorsChanged.connect (mem_fun (*this, &Editor::color_handler)); + ColorsChanged.connect (sigc::mem_fun (*this, &Editor::color_handler)); color_handler(); } @@ -331,12 +324,12 @@ Editor::track_canvas_allocate (Gtk::Allocation alloc) bool Editor::track_canvas_size_allocated () { - bool height_changed = canvas_height != canvas_allocation.get_height(); + bool height_changed = _canvas_height != canvas_allocation.get_height(); - canvas_width = canvas_allocation.get_width(); - canvas_height = canvas_allocation.get_height(); + _canvas_width = canvas_allocation.get_width(); + _canvas_height = canvas_allocation.get_height(); - if (session) { + if (_session) { TrackViewList::iterator i; double height = 0; @@ -344,34 +337,34 @@ Editor::track_canvas_size_allocated () height += (*i)->effective_height (); (*i)->clip_to_viewport (); } - + full_canvas_height = height + canvas_timebars_vsize; } if (height_changed) { if (playhead_cursor) { - playhead_cursor->set_length (canvas_height); + playhead_cursor->set_length (_canvas_height); } - + for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) { - (*x)->set_line_vpos (0, canvas_height); + (*x)->set_line_vpos (0, _canvas_height); } - vertical_adjustment.set_page_size (canvas_height); + vertical_adjustment.set_page_size (_canvas_height); last_trackview_group_vertical_offset = get_trackview_group_vertical_offset (); - if ((vertical_adjustment.get_value() + canvas_height) >= vertical_adjustment.get_upper()) { - /* + 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_value (full_canvas_height - canvas_height); + vertical_adjustment.set_value (full_canvas_height - _canvas_height); } } handle_new_duration (); - reset_hscrollbar_stepping (); update_fixed_rulers(); redisplay_tempo (false); + _summary->set_overlays_dirty (); Resized (); /* EMIT_SIGNAL */ @@ -381,21 +374,22 @@ Editor::track_canvas_size_allocated () void Editor::controls_layout_size_request (Requisition* req) { - TreeModel::Children rows = route_display_model->children(); - TreeModel::Children::iterator i; - double pos; + double pos = 0; + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + pos += (*i)->effective_height (); + (*i)->clip_to_viewport (); + } + + gint height = min ((gint) pos, (gint) (physical_screen_height - 600)); + bool changed = false; - for (pos = 0, i = rows.begin(); i != rows.end(); ++i) { - TimeAxisView *tv = (*i)[route_display_columns.tv]; - if (tv != 0) { - pos += tv->effective_height (); - tv->clip_to_viewport (); - } + gint w = edit_controls_vbox.get_width(); + if (_group_tabs->is_mapped()) { + w += _group_tabs->get_width (); } - gint height = min ((gint) pos, (gint) (physical_screen_height - 600)); - gint width = max (edit_controls_vbox.get_width(), controls_layout.get_width()); + gint width = max (w, controls_layout.get_width()); /* don't get too big. the fudge factors here are just guesses */ @@ -408,16 +402,19 @@ Editor::controls_layout_size_request (Requisition* req) if (req->width != width) { gint vbox_width = edit_controls_vbox.get_width(); + if (_group_tabs->is_mapped()) { + vbox_width += _group_tabs->get_width(); + } req->width = width; - /* this one is important: it determines how big the layout thinks it really is, as + /* 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.property_width () = vbox_width; controls_layout.property_width_request () = vbox_width; - time_button_event_box.property_width_request () = vbox_width; - zoom_box.property_width_request () = vbox_width; + // time_button_event_box.property_width_request () = vbox_width; + // zoom_box.property_width_request () = vbox_width; } if (req->height != height) { @@ -427,21 +424,23 @@ Editor::controls_layout_size_request (Requisition* req) } if (changed) { - controls_layout_size_request_connection = controls_layout.signal_size_request().connect (mem_fun (*this, &Editor::controls_layout_size_request)); + controls_layout_size_request_connection = controls_layout.signal_size_request().connect (sigc::mem_fun (*this, &Editor::controls_layout_size_request)); } - //cerr << "sizes = " << req->width << " " << edit_controls_vbox.get_width() << " " << controls_layout.get_width() << " " << zoom_box.get_width() << " " << time_button_frame.get_width() << endl;//DEBUG + //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) +Editor::track_canvas_map_handler (GdkEventAny* /*ev*/) { - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + if (current_canvas_cursor) { + track_canvas->get_window()->set_cursor (*current_canvas_cursor); + } return false; } -void +void Editor::track_canvas_drag_data_received (const RefPtr& context, - int x, int y, + int x, int y, const SelectionData& data, guint info, guint time) { @@ -472,21 +471,21 @@ Editor::drop_paths_part_two (const vector& paths, nframes64_t frame, do frame = 0; if (Profile->get_sae() || Config->get_only_copy_imported_files()) { - do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, frame); + do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, frame); } else { do_embed (paths, Editing::ImportDistinctFiles, ImportAsTrack, frame); } - + } else if ((tv = dynamic_cast (tvp.first)) != 0) { /* check that its an audio track, not a bus */ - + if (tv->get_diskstream()) { /* select the track, then embed/import */ selection->set (tv); if (Profile->get_sae() || Config->get_only_copy_imported_files()) { - do_import (paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, frame); + do_import (paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, frame); } else { do_embed (paths, Editing::ImportSerializeFiles, ImportToTrack, frame); } @@ -496,7 +495,7 @@ Editor::drop_paths_part_two (const vector& paths, nframes64_t frame, do void Editor::drop_paths (const RefPtr& context, - int x, int y, + int x, int y, const SelectionData& data, guint info, guint time) { @@ -508,26 +507,26 @@ Editor::drop_paths (const RefPtr& context, double cy; if (convert_drop_to_paths (paths, context, x, y, data, info, time) == 0) { - + /* D-n-D coordinates are window-relative, so convert to "world" coordinates */ track_canvas->window_to_world (x, y, wx, wy); - + ev.type = GDK_BUTTON_RELEASE; ev.button.x = wx; ev.button.y = wy; - + frame = event_frame (&ev, 0, &cy); - + snap_to (frame); - + #ifdef GTKOSX /* We are not allowed to call recursive main event loops from within the main event loop with GTK/Quartz. Since import/embed wants to push up a progress dialog, defer all this till we go idle. */ - Glib::signal_idle().connect (bind (mem_fun (*this, &Editor::idle_drop_paths), paths, frame, cy)); + Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &Editor::idle_drop_paths), paths, frame, cy)); #else drop_paths_part_two (paths, frame, cy); #endif @@ -537,52 +536,39 @@ Editor::drop_paths (const RefPtr& context, } void -Editor::drop_regions (const RefPtr& context, - int x, int y, - const SelectionData& data, - guint info, guint time) +Editor::drop_regions (const RefPtr& /*context*/, + int /*x*/, int /*y*/, + const SelectionData& /*data*/, + guint /*info*/, guint /*time*/) { - std::list > regions; - region_list_display.get_object_drag_data (regions); - - for (list >::iterator r = regions.begin(); r != regions.end(); ++r) { - - boost::shared_ptr ar; - - if ((ar = boost::dynamic_pointer_cast(*r)) != 0) { - insert_region_list_drag (ar, x, y); - } - } - - context->drag_finish (true, false, time); + _drags->end_grab (0); } void -Editor::maybe_autoscroll (GdkEventMotion* event) +Editor::maybe_autoscroll (GdkEventMotion* event, bool allow_vert) { - nframes64_t rightmost_frame = leftmost_frame + current_page_frames(); - nframes64_t frame = drag_info.current_pointer_frame; + pair frames = _drags->extent (); bool startit = false; autoscroll_y = 0; autoscroll_x = 0; - if (event->y < canvas_timebars_vsize) { + if (event->y < canvas_timebars_vsize && allow_vert) { autoscroll_y = -1; startit = true; - } else if (event->y > canvas_height) { + } else if (event->y > _canvas_height) { autoscroll_y = 1; startit = true; } - if (frame > rightmost_frame) { + if (frames.second > rightmost_frame) { if (rightmost_frame < max_frames) { autoscroll_x = 1; startit = true; } - } else if (frame < leftmost_frame) { + } else if (frames.first < leftmost_frame) { if (leftmost_frame > 0) { autoscroll_x = -1; startit = true; @@ -597,44 +583,7 @@ Editor::maybe_autoscroll (GdkEventMotion* event) 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; -} - -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_x, autoscroll_y); } @@ -659,20 +608,23 @@ Editor::autoscroll_canvas () double target_pixel; if (autoscroll_x_distance != 0) { + + pair const e = _drags->extent (); + if (autoscroll_x > 0) { - autoscroll_x_distance = (unit_to_frame (drag_info.current_pointer_x) - (leftmost_frame + current_page_frames())) / 3; + autoscroll_x_distance = (e.second - (leftmost_frame + current_page_frames())) / 3; } else if (autoscroll_x < 0) { - autoscroll_x_distance = (leftmost_frame - unit_to_frame (drag_info.current_pointer_x)) / 3; + autoscroll_x_distance = (leftmost_frame - e.first) / 3; } } if (autoscroll_y_distance != 0) { if (autoscroll_y > 0) { - autoscroll_y_distance = (drag_info.current_pointer_y - (get_trackview_group_vertical_offset() + canvas_height)) / 3; + autoscroll_y_distance = (_drags->current_pointer_y() - (get_trackview_group_vertical_offset() + _canvas_height)) / 3; } else if (autoscroll_y < 0) { - autoscroll_y_distance = (vertical_adjustment.get_value () - drag_info.current_pointer_y) / 3; + autoscroll_y_distance = (vertical_adjustment.get_value () - _drags->current_pointer_y()) / 3; } } @@ -702,12 +654,12 @@ Editor::autoscroll_canvas () new_pixel = vertical_pos - autoscroll_y_distance; } - target_pixel = drag_info.current_pointer_y - autoscroll_y_distance; + target_pixel = _drags->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; + 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; @@ -717,16 +669,16 @@ Editor::autoscroll_canvas () new_pixel = min (top_of_bottom_of_canvas, new_pixel); - target_pixel = drag_info.current_pointer_y + autoscroll_y_distance; - + target_pixel = _drags->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; + target_pixel = _drags->current_pointer_y(); new_pixel = vertical_pos; } @@ -748,11 +700,11 @@ Editor::autoscroll_canvas () Gdk::ModifierType mask; canvas_window->get_pointer (x, y, mask); ev.type = GDK_MOTION_NOTIFY; - ev.state &= Gdk::BUTTON1_MASK; + ev.state = Gdk::BUTTON1_MASK; ev.x = x; ev.y = y; - motion_handler (drag_info.item, (GdkEvent*) &ev, drag_info.item_type, true); + motion_handler (0, (GdkEvent*) &ev, true); autoscroll_cnt++; @@ -763,7 +715,7 @@ Editor::autoscroll_canvas () autoscroll_timeout_tag = g_idle_add ( _autoscroll_canvas, this); return false; - } + } return true; } @@ -771,7 +723,7 @@ Editor::autoscroll_canvas () void Editor::start_canvas_autoscroll (int dx, int dy) { - if (!session || autoscroll_active) { + if (!_session || autoscroll_active) { return; } @@ -783,7 +735,7 @@ Editor::start_canvas_autoscroll (int dx, int 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 (); @@ -802,7 +754,7 @@ Editor::stop_canvas_autoscroll () } bool -Editor::left_track_canvas (GdkEventCrossing *ev) +Editor::left_track_canvas (GdkEventCrossing */*ev*/) { set_entered_track (0); set_entered_regionview (0); @@ -811,7 +763,7 @@ Editor::left_track_canvas (GdkEventCrossing *ev) } bool -Editor::entered_track_canvas (GdkEventCrossing *ev) +Editor::entered_track_canvas (GdkEventCrossing */*ev*/) { reset_canvas_action_sensitivity (true); return FALSE; @@ -825,31 +777,35 @@ Editor::tie_vertical_scrolling () /* this will do an immediate redraw */ controls_layout.get_vadjustment()->set_value (vertical_adjustment.get_value()); + + if (pending_visual_change.idle_handler_id < 0) { + _summary->set_overlays_dirty (); + } } 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; + double x1, y1, x2, y2, x_delta; + _master_group->get_bounds (x1, y1, x2, y2); + + x_delta = - (x1 + horizontal_adjustment.get_value()); - _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); + time_line_group->move (x_delta, 0); + cursor_group->move (x_delta, 0); - _master_group->move (-x_delta, 0); - timebar_group->move (-x_delta, 0); - time_line_group->move (-x_delta, 0); - cursor_group->move (-x_delta, 0); + leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); update_fixed_rulers (); redisplay_tempo (true); + if (pending_visual_change.idle_handler_id < 0) { + _summary->set_overlays_dirty (); + } + #ifndef GTKOSX if (!autoscroll_active) { /* force rulers and canvas to move in lock step */ @@ -877,24 +833,7 @@ Editor::scroll_canvas_vertically () } last_trackview_group_vertical_offset = get_trackview_group_vertical_offset (); /* required to keep the controls_layout in lock step 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); - } - redisplay_tempo (true); -} - -void -Editor::canvas_scroll_to (nframes64_t time_origin) -{ - leftmost_frame = time_origin; + update_canvas_now (); } void @@ -930,11 +869,6 @@ Editor::color_handler() 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(); @@ -960,8 +894,8 @@ Editor::color_handler() /* redisplay_tempo (true); - if (session) - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers + if (_session) + _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers */ } @@ -969,8 +903,25 @@ void Editor::flush_canvas () { if (is_mapped()) { - track_canvas->update_now (); + update_canvas_now (); // gdk_window_process_updates (GTK_LAYOUT(track_canvas->gobj())->bin_window, true); } } +void +Editor::update_canvas_now () +{ + /* GnomeCanvas has a bug whereby if its idle handler is not scheduled between + two calls to update_now, an assert will trip. This wrapper works around + that problem by only calling update_now if the assert will not trip. + + I think the GC bug is due to the fact that its code will reset need_update + and need_redraw to FALSE without checking to see if an idle handler is scheduled. + If one is scheduled, GC should probably remove it. + */ + + GnomeCanvas* c = track_canvas->gobj (); + if (c->need_update || c->need_redraw) { + track_canvas->update_now (); + } +}