X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_canvas.cc;h=3e2f423cd66c385d56826f0244afb695e835bf87;hb=efab36a85e4a462716f2d7f4d0f12a12e45b4a75;hp=146f756225a83e51b2fb2f7343d9314fb50990e0;hpb=6e9b9294e1e7a22f31eabbafa39cee5844b3449a;p=ardour.git diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 146f756225..3e2f423cd6 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 @@ -17,15 +17,22 @@ */ +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + #include #include #include -#include + +#include "gtkmm2ext/utils.h" #include "ardour/profile.h" +#include "ardour/rc_configuration.h" #include "ardour_ui.h" #include "editor.h" +#include "global_signals.h" #include "waveview.h" #include "simplerect.h" #include "simpleline.h" @@ -35,17 +42,23 @@ #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 "audio_time_axis.h" #include "editor_drag.h" #include "region_view.h" +#include "editor_group_tabs.h" +#include "editor_summary.h" +#include "keyboard.h" +#include "editor_cursors.h" +#include "mouse_cursors.h" +#include "verbose_cursor.h" #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -53,7 +66,7 @@ using namespace Glib; using namespace Gtkmm2ext; using namespace Editing; -/* XXX this is a hack. it ought to be the maximum value of an nframes64_t */ +/* XXX this is a hack. it ought to be the maximum value of an framepos_t */ const double max_canvas_coordinate = (double) JACK_MAX_FRAMES; @@ -67,22 +80,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 +105,7 @@ Editor::initialize_canvas () } else { track_canvas = new ArdourCanvas::CanvasAA (); } - + ArdourCanvas::init (); ardour_canvas_type_init (); @@ -101,28 +114,13 @@ Editor::initialize_canvas () track_canvas->set_center_scroll_region (false); track_canvas->set_dither (Gdk::RGB_DITHER_NONE); - Glib::RefPtr screen = get_screen(); + gint phys_width = physical_screen_width (Glib::RefPtr()); + gint phys_height = physical_screen_height (Glib::RefPtr()); - if (!screen) { - screen = Gdk::Screen::get_default(); - } - physical_screen_width = screen->get_width (); - physical_screen_height = screen->get_height (); - - /* 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->property_font_desc() = *font; - verbose_canvas_cursor->property_anchor() = ANCHOR_NW; - - delete font; - - verbose_cursor_visible = false; + _verbose_cursor = new VerboseCursor (this); /* 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,19 +131,19 @@ 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 /*XXX please don't laugh. this actually improves canvas performance on osx */ - bogus_background_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, max_canvas_coordinate/3, physical_screen_height); + bogus_background_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, max_canvas_coordinate/3, phys_height); bogus_background_rect->property_outline_pixels() = 0; #endif - transport_loop_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, physical_screen_height); + transport_loop_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, phys_height); 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, physical_screen_height); + transport_punch_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, phys_height); transport_punch_range_rect->property_outline_pixels() = 0; transport_punch_range_rect->hide(); @@ -156,64 +154,34 @@ Editor::initialize_canvas () _region_motion_group = new ArdourCanvas::Group (*_trackview_group); meter_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); - if (Profile->get_sae()) { - meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, physical_screen_width, timebar_height - 1); - meter_bar->property_outline_pixels() = 1; - } else { - meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, physical_screen_width, timebar_height); - meter_bar->property_outline_pixels() = 0; - } - meter_bar->property_outline_what() = (0x1 | 0x8); + meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, phys_width, timebar_height - 1); + meter_bar->property_outline_pixels() = 1; + meter_bar->property_outline_what() = 0x8; tempo_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); - if (Profile->get_sae()) { - tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); - tempo_bar->property_outline_pixels() = 1; - } else { - tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); - tempo_bar->property_outline_pixels() = 0; - } - tempo_bar->property_outline_what() = (0x1 | 0x8); + tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1)); + tempo_bar->property_outline_pixels() = 1; + tempo_bar->property_outline_what() = 0x8; range_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); - if (Profile->get_sae()) { - range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); - range_marker_bar->property_outline_pixels() = 1; - } else { - range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); - range_marker_bar->property_outline_pixels() = 0; - } - range_marker_bar->property_outline_what() = (0x1 | 0x8); - + range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1)); + range_marker_bar->property_outline_pixels() = 1; + range_marker_bar->property_outline_what() = 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)); - transport_marker_bar->property_outline_pixels() = 1; - } else { - transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); - transport_marker_bar->property_outline_pixels() = 0; - } - transport_marker_bar->property_outline_what() = (0x1 | 0x8); + transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1)); + transport_marker_bar->property_outline_pixels() = 1; + transport_marker_bar->property_outline_what() = 0x8; marker_bar_group = new ArdourCanvas::Group (*track_canvas->root ()); - if (Profile->get_sae()) { - marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height - 1)); - marker_bar->property_outline_pixels() = 1; - } else { - marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); - marker_bar->property_outline_pixels() = 0; - } - marker_bar->property_outline_what() = (0x1 | 0x8); - + marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1)); + marker_bar->property_outline_pixels() = 1; + marker_bar->property_outline_what() = 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)); - cd_marker_bar->property_outline_pixels() = 1; - } else { - cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height)); - cd_marker_bar->property_outline_pixels() = 0; - } - cd_marker_bar->property_outline_what() = (0x1 | 0x8); + cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, phys_width, (timebar_height - 1)); + cd_marker_bar->property_outline_pixels() = 1; + cd_marker_bar->property_outline_what() = 0x8; timebar_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0); cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0); @@ -241,35 +209,35 @@ Editor::initialize_canvas () 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() = physical_screen_height; + transport_punchin_line->property_y2() = phys_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->property_y2() = phys_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)); + + 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); @@ -278,22 +246,24 @@ Editor::initialize_canvas () } /* 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_drag_motion().connect (mem_fun (*this, &Editor::track_canvas_drag_motion)); + 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->signal_key_press_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_key_press)); + track_canvas->signal_key_release_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_key_release)); 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->add_events (Gdk::POINTER_MOTION_HINT_MASK | Gdk::SCROLL_MASK | Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK); + 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")); @@ -302,11 +272,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(); } @@ -321,117 +291,92 @@ 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; for (i = track_views.begin(); i != track_views.end(); ++i) { - 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); + + for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) { + i->second->canvas_height_set (_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); - - Resized (); /* EMIT_SIGNAL */ + _summary->set_overlays_dirty (); return false; } void -Editor::controls_layout_size_request (Requisition* req) -{ - TreeModel::Children rows = route_display_model->children(); - TreeModel::Children::iterator i; - double pos; - 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 height = min ((gint) pos, (gint) (physical_screen_height - 600)); - gint width = max (edit_controls_vbox.get_width(), controls_layout.get_width()); - - /* don't get too big. the fudge factors here are just guesses */ +Editor::reset_controls_layout_width () +{ + GtkRequisition req; + gint w; - width = min (width, (gint) (physical_screen_width - 300)); + edit_controls_vbox.size_request (req); + w = req.width; - if ((req->width != width) || (req->height != height)) { - changed = true; - controls_layout_size_request_connection.disconnect (); - } + if (_group_tabs->is_mapped()) { + _group_tabs->size_request (req); + w += req.width; + } - if (req->width != width) { - gint vbox_width = edit_controls_vbox.get_width(); - req->width = width; + /* the controls layout has no horizontal scrolling, its visible + width is always equal to the total width of its contents. + */ - /* 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; + controls_layout.property_width() = w; + controls_layout.property_width_request() = w; +} - time_button_event_box.property_width_request () = vbox_width; - zoom_box.property_width_request () = vbox_width; - } +void +Editor::reset_controls_layout_height (int32_t h) +{ + /* set the height of the scrollable area (i.e. the sum of all contained widgets) + */ - if (req->height != height) { - req->height = height; - controls_layout.property_height () = (guint) floor (pos); - controls_layout.property_height_request () = height; - } + controls_layout.property_height() = h; - if (changed) { - controls_layout_size_request_connection = controls_layout.signal_size_request().connect (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 + /* size request is set elsewhere, see ::track_canvas_allocate() */ } 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) { + set_canvas_cursor (current_canvas_cursor); + } return false; } -void +/** This is called when something is dropped onto the track canvas */ +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) { @@ -443,14 +388,14 @@ Editor::track_canvas_drag_data_received (const RefPtr& context } bool -Editor::idle_drop_paths (vector paths, nframes64_t frame, double ypos) +Editor::idle_drop_paths (vector paths, framepos_t frame, double ypos) { drop_paths_part_two (paths, frame, ypos); return false; } void -Editor::drop_paths_part_two (const vector& paths, nframes64_t frame, double ypos) +Editor::drop_paths_part_two (const vector& paths, framepos_t frame, double ypos) { RouteTimeAxisView* tv; @@ -462,21 +407,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()) { + + if (tv->track()) { /* 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); } @@ -486,38 +431,38 @@ 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) { - vector paths; + vector paths; GdkEvent ev; - nframes64_t frame; + framepos_t frame; double wx; double wy; 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 @@ -527,57 +472,85 @@ 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*/) { - assert (_drag); - _drag->end_grab (0); - delete _drag; - _drag = 0; + _drags->end_grab (0); +} + +/** If the editor window is arranged such that the edge of the trackview is right up + * against the edge of the screen, autoscroll will not work very well. In this situation, + * we start autoscrolling some distance in from the right-hand-side of the screen edge; + * this is the distance at which that happens. + */ +int +Editor::autoscroll_fudge_threshold () const +{ + return current_page_frames() / 6; } void -Editor::maybe_autoscroll (GdkEventMotion* event) +Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert) { - nframes64_t rightmost_frame = leftmost_frame + current_page_frames(); - nframes64_t frame = _drag->current_pointer_frame(); bool startit = false; + /* Work out the distance between the right hand edge of the trackview and the edge of + the monitor that it is on. + */ + + Glib::RefPtr gdk_window = get_window (); + Gdk::Rectangle window_rect; + gdk_window->get_frame_extents (window_rect); + + Glib::RefPtr screen = get_screen (); + Gdk::Rectangle root_rect; + screen->get_root_window()->get_frame_extents (root_rect); + + Gtk::Allocation editor_list = _the_notebook.get_allocation (); + + framecnt_t distance = pixel_to_frame (root_rect.get_x() + root_rect.get_width() - window_rect.get_x() - window_rect.get_width()); + if (_the_notebook.is_visible ()) { + distance += pixel_to_frame (editor_list.get_width()); + } + + /* Note whether we're fudging the autoscroll (see autoscroll_fudge_threshold) */ + _autoscroll_fudging = (distance < autoscroll_fudge_threshold ()); + + double const ty = _drags->current_pointer_y() - get_trackview_group_vertical_offset (); + autoscroll_y = 0; autoscroll_x = 0; - if (event->y < canvas_timebars_vsize) { + if (ty < canvas_timebars_vsize && allow_vert) { autoscroll_y = -1; startit = true; - } else if (event->y > canvas_height) { + } else if (ty > _canvas_height && allow_vert) { autoscroll_y = 1; startit = true; } - if (frame > rightmost_frame) { + framepos_t rightmost_frame = leftmost_frame + current_page_frames(); + if (_autoscroll_fudging) { + rightmost_frame -= autoscroll_fudge_threshold (); + } - if (rightmost_frame < max_frames) { + if (_drags->current_pointer_frame() > rightmost_frame && allow_horiz) { + if (rightmost_frame < max_framepos) { autoscroll_x = 1; startit = true; } - - } else if (frame < leftmost_frame) { + } else if (_drags->current_pointer_frame() < leftmost_frame && allow_horiz) { if (leftmost_frame > 0) { autoscroll_x = -1; startit = true; } - } - if (!allow_vertical_scroll) { - autoscroll_y = 0; - } - - if ((autoscroll_x != last_autoscroll_x) || (autoscroll_y != last_autoscroll_y) || (autoscroll_x == 0 && autoscroll_y == 0)) { + if (autoscroll_active && ((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); } @@ -595,27 +568,31 @@ Editor::_autoscroll_canvas (void *arg) bool Editor::autoscroll_canvas () { - nframes64_t new_frame; - nframes64_t limit = max_frames - current_page_frames(); + framepos_t new_frame; + framepos_t limit = max_framepos - current_page_frames(); GdkEventMotion ev; double new_pixel; double target_pixel; - + if (autoscroll_x_distance != 0) { + if (autoscroll_x > 0) { - autoscroll_x_distance = (unit_to_frame (_drag->current_pointer_x()) - (leftmost_frame + current_page_frames())) / 3; + autoscroll_x_distance = (_drags->current_pointer_frame() - (leftmost_frame + current_page_frames())) / 3; + if (_autoscroll_fudging) { + autoscroll_x_distance += autoscroll_fudge_threshold () / 3; + } } else if (autoscroll_x < 0) { - autoscroll_x_distance = (leftmost_frame - unit_to_frame (_drag->current_pointer_x())) / 3; + autoscroll_x_distance = (leftmost_frame - _drags->current_pointer_frame()) / 3; } } if (autoscroll_y_distance != 0) { if (autoscroll_y > 0) { - autoscroll_y_distance = (_drag->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->current_pointer_y()) / 3; + autoscroll_y_distance = (vertical_adjustment.get_value () - _drags->current_pointer_y()) / 3; } } @@ -645,12 +622,12 @@ Editor::autoscroll_canvas () new_pixel = vertical_pos - autoscroll_y_distance; } - target_pixel = _drag->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; @@ -660,16 +637,16 @@ Editor::autoscroll_canvas () new_pixel = min (top_of_bottom_of_canvas, new_pixel); - target_pixel = _drag->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->current_pointer_y(); + target_pixel = _drags->current_pointer_y(); new_pixel = vertical_pos; } @@ -691,11 +668,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->item(), (GdkEvent*) &ev, true); + motion_handler (0, (GdkEvent*) &ev, true); autoscroll_cnt++; @@ -706,7 +683,7 @@ Editor::autoscroll_canvas () autoscroll_timeout_tag = g_idle_add ( _autoscroll_canvas, this); return false; - } + } return true; } @@ -714,7 +691,7 @@ Editor::autoscroll_canvas () void Editor::start_canvas_autoscroll (int dx, int dy) { - if (!session || autoscroll_active) { + if (!_session || autoscroll_active) { return; } @@ -723,10 +700,10 @@ Editor::start_canvas_autoscroll (int dx, int dy) autoscroll_active = true; autoscroll_x = dx; autoscroll_y = dy; - autoscroll_x_distance = (nframes64_t) floor (current_page_frames()/50.0); + autoscroll_x_distance = (framepos_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 (); @@ -735,7 +712,6 @@ Editor::start_canvas_autoscroll (int dx, int dy) void Editor::stop_canvas_autoscroll () { - if (autoscroll_timeout_tag >= 0) { g_source_remove (autoscroll_timeout_tag); autoscroll_timeout_tag = -1; @@ -745,8 +721,9 @@ Editor::stop_canvas_autoscroll () } bool -Editor::left_track_canvas (GdkEventCrossing *ev) +Editor::left_track_canvas (GdkEventCrossing */*ev*/) { + DropDownKeys (); set_entered_track (0); set_entered_regionview (0); reset_canvas_action_sensitivity (false); @@ -754,12 +731,28 @@ 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; } +void +Editor::ensure_time_axis_view_is_visible (const TimeAxisView& tav) +{ + double begin = tav.y_position(); + + double v = vertical_adjustment.get_value (); + + if (begin < v || begin + tav.current_height() > v + _canvas_height - canvas_timebars_vsize) { + /* try to put the TimeAxisView roughly central */ + if (begin >= _canvas_height/2.0) { + begin -= _canvas_height/2.0; + } + vertical_adjustment.set_value (begin); + } +} + void Editor::tie_vertical_scrolling () { @@ -768,31 +761,39 @@ 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 () +Editor::set_horizontal_position (double p) { - nframes64_t time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); - /* horizontal scrolling only */ double x1, y1, x2, y2, x_delta; _master_group->get_bounds (x1, y1, x2, y2); - x_delta = - (x1 + horizontal_adjustment.get_value()); + x_delta = - (x1 + p); _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); + leftmost_frame = (framepos_t) floor (p * frames_per_unit); update_fixed_rulers (); redisplay_tempo (true); + if (pending_visual_change.idle_handler_id < 0) { + _summary->set_overlays_dirty (); + } + + HorizontalPositionChanged (); /* EMIT SIGNAL */ + #ifndef GTKOSX - if (!autoscroll_active) { + if (!autoscroll_active && !_stationary_playhead) { /* force rulers and canvas to move in lock step */ while (gtk_events_pending ()) { gtk_main_iteration (); @@ -818,14 +819,14 @@ 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 (); + update_canvas_now (); } 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(); + _verbose_cursor->set_color (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(); @@ -879,8 +880,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 */ } @@ -888,8 +889,63 @@ 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 (); + } +} + +double +Editor::horizontal_position () const +{ + return frame_to_unit (leftmost_frame); +} +void +Editor::set_canvas_cursor (Gdk::Cursor* cursor, bool save) +{ + if (save) { + current_canvas_cursor = cursor; + } + + if (is_drawable()) { + track_canvas->get_window()->set_cursor (*cursor); + } +} + +bool +Editor::track_canvas_key_press (GdkEventKey*) +{ + /* XXX: event does not report the modifier key pressed down, AFAICS, so use the Keyboard object instead */ + if (mouse_mode == Editing::MouseZoom && Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { + set_canvas_cursor (_cursors->zoom_out, true); + } + + return false; +} + +bool +Editor::track_canvas_key_release (GdkEventKey*) +{ + if (mouse_mode == Editing::MouseZoom && !Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { + set_canvas_cursor (_cursors->zoom_in, true); + } + + return false; +}