*/
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
#include <libgnomecanvasmm/init.h>
#include <libgnomecanvasmm/pixbuf.h>
#include <jack/types.h>
-#include <gtkmm2ext/utils.h>
+
+#include "gtkmm2ext/utils.h"
#include "ardour/profile.h"
#include "ardour/rc_configuration.h"
+#include "ardour/smf_source.h"
#include "ardour_ui.h"
#include "editor.h"
+#include "global_signals.h"
#include "waveview.h"
#include "simplerect.h"
#include "simpleline.h"
-#include "imageframe.h"
#include "waveview_p.h"
#include "simplerect_p.h"
#include "simpleline_p.h"
-#include "imageframe_p.h"
#include "canvas_impl.h"
#include "canvas-noevent-text.h"
#include "editing.h"
#include "editor_drag.h"
#include "region_view.h"
#include "editor_group_tabs.h"
-#include "editor_routes.h"
#include "editor_summary.h"
+#include "video_timeline.h"
+#include "keyboard.h"
+#include "editor_cursors.h"
+#include "mouse_cursors.h"
+#include "verbose_cursor.h"
#include "i18n.h"
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;
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
track_canvas = new ArdourCanvas::CanvasAA ();
}
+ track_canvas->set_can_default (true);
+ set_default (*track_canvas);
+
ArdourCanvas::init ();
ardour_canvas_type_init ();
track_canvas->set_center_scroll_region (false);
track_canvas->set_dither (Gdk::RGB_DITHER_NONE);
- Glib::RefPtr<Gdk::Screen> screen = get_screen();
-
- 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 */
+ gint phys_width = physical_screen_width (Glib::RefPtr<Gdk::Window>());
+ gint phys_height = physical_screen_height (Glib::RefPtr<Gdk::Window>());
- Pango::FontDescription* font = get_font_for_style (N_("VerboseCanvasCursor"));
-
- 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;
+ _verbose_cursor = new VerboseCursor (this);
/* on the bottom, an image */
#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();
_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 ());
+ 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;
+
+ videotl_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;
+ videotl_bar = new ArdourCanvas::SimpleRect (*videotl_bar_group, 0.0, 0.0, phys_width, (timebar_height * videotl_bar_height - 1));
+ videotl_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;
+ videotl_bar = new ArdourCanvas::SimpleRect (*videotl_bar_group, 0.0, 0.0, phys_width, (timebar_height * videotl_bar_height));
+ videotl_bar->property_outline_pixels() = 0;
}
- cd_marker_bar->property_outline_what() = (0x1 | 0x8);
+ videotl_bar->property_outline_what() = (0x1 | 0x8);
+ ARDOUR_UI::instance()->video_timeline = new VideoTimeLine(this, videotl_bar_group, (timebar_height * videotl_bar_height));
timebar_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.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);
+ videotl_group = new ArdourCanvas::Group (*timebar_group, 0.0, 0.0);
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;
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
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));
+ videotl_bar_group->signal_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_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));
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 (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->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), false);
+ track_canvas->signal_enter_notify_event().connect (sigc::mem_fun(*this, &Editor::entered_track_canvas), false);
track_canvas->set_flags (CAN_FOCUS);
/* set up drag-n-drop */
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) {
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);
redisplay_tempo (false);
_summary->set_overlays_dirty ();
- Resized (); /* EMIT_SIGNAL */
-
return false;
}
void
-Editor::controls_layout_size_request (Requisition* req)
+Editor::reset_controls_layout_width ()
{
- 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));
+ GtkRequisition req;
+ gint w;
- bool changed = false;
+ edit_controls_vbox.size_request (req);
+ w = req.width;
- gint w = edit_controls_vbox.get_width();
- if (_group_tabs->is_mapped()) {
- w += _group_tabs->get_width ();
- }
+ if (_group_tabs->is_mapped()) {
+ _group_tabs->size_request (req);
+ w += req.width;
+ }
- gint width = max (w, controls_layout.get_width());
-
- /* don't get too big. the fudge factors here are just guesses */
-
- width = min (width, (gint) (physical_screen_width - 300));
-
- if ((req->width != width) || (req->height != height)) {
- changed = true;
- controls_layout_size_request_connection.disconnect ();
- }
-
- 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;
+ /* 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 (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
+ /* size request is set elsewhere, see ::track_canvas_allocate() */
}
bool
Editor::track_canvas_map_handler (GdkEventAny* /*ev*/)
{
if (current_canvas_cursor) {
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_cursor (current_canvas_cursor);
}
return false;
}
}
bool
-Editor::idle_drop_paths (vector<ustring> paths, nframes64_t frame, double ypos)
+Editor::idle_drop_paths (vector<string> paths, framepos_t frame, double ypos, bool copy)
{
- drop_paths_part_two (paths, frame, ypos);
+ drop_paths_part_two (paths, frame, ypos, copy);
return false;
}
void
-Editor::drop_paths_part_two (const vector<ustring>& paths, nframes64_t frame, double ypos)
+Editor::drop_paths_part_two (const vector<string>& paths, framepos_t frame, double ypos, bool copy)
{
RouteTimeAxisView* tv;
+
+ /* MIDI files must always be imported, because we consider them
+ * writable. So split paths into two vectors, and follow the import
+ * path on the MIDI part.
+ */
+
+ vector<string> midi_paths;
+ vector<string> audio_paths;
+
+ for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+ if (SMFSource::safe_midi_file_extension (*i)) {
+ midi_paths.push_back (*i);
+ } else {
+ audio_paths.push_back (*i);
+ }
+ }
+
std::pair<TimeAxisView*, int> const tvp = trackview_by_y_position (ypos);
if (tvp.first == 0) {
frame = 0;
- if (Profile->get_sae() || Config->get_only_copy_imported_files()) {
- do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, frame);
+ do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, frame);
+
+ if (Profile->get_sae() || Config->get_only_copy_imported_files() || copy) {
+ do_import (audio_paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, frame);
} else {
- do_embed (paths, Editing::ImportDistinctFiles, ImportAsTrack, frame);
+ do_embed (audio_paths, Editing::ImportDistinctFiles, ImportAsTrack, frame);
}
} else if ((tv = dynamic_cast<RouteTimeAxisView*> (tvp.first)) != 0) {
- /* check that its an audio track, not a bus */
+ /* check that its a track, not a bus */
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 (midi_paths, Editing::ImportSerializeFiles, ImportToTrack, SrcBest, frame);
+
+ if (Profile->get_sae() || Config->get_only_copy_imported_files() || copy) {
+ do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, frame);
} else {
- do_embed (paths, Editing::ImportSerializeFiles, ImportToTrack, frame);
+ do_embed (audio_paths, Editing::ImportSerializeFiles, ImportToTrack, frame);
}
}
}
const SelectionData& data,
guint info, guint time)
{
- vector<ustring> paths;
+ vector<string> paths;
GdkEvent ev;
- nframes64_t frame;
+ framepos_t frame;
double wx;
double wy;
double cy;
snap_to (frame);
+ bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY);
#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 (sigc::bind (sigc::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, copy));
#else
- drop_paths_part_two (paths, frame, cy);
+ drop_paths_part_two (paths, frame, cy, copy);
#endif
}
context->drag_finish (true, false, time);
}
-void
-Editor::drop_regions (const RefPtr<Gdk::DragContext>& /*context*/,
- int /*x*/, int /*y*/,
- const SelectionData& /*data*/,
- guint /*info*/, guint /*time*/)
+/** 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
{
- _drags->end_grab (0);
+ return current_page_frames() / 6;
}
+/** @param allow_horiz true to allow horizontal autoscroll, otherwise false.
+ * @param allow_vert true to allow vertical autoscroll, otherwise false.
+ * @param moving_left true if we are moving left, so we only want to autoscroll on the left of the canvas,
+ * otherwise false, so we only want to autoscroll on the right of the canvas.
+ * @param moving_up true if we are moving up, so we only want to autoscroll at the top of the canvas,
+ * otherwise false, so we only want to autoscroll at the bottom of the canvas.
+ */
void
-Editor::maybe_autoscroll (GdkEventMotion* event, bool allow_vert)
+Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool moving_left, bool moving_up)
{
- nframes64_t rightmost_frame = leftmost_frame + current_page_frames();
+ if (!Config->get_autoscroll_editor ()) {
+ return;
+ }
+
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> gdk_window = get_window ();
+ Gdk::Rectangle window_rect;
+ gdk_window->get_frame_extents (window_rect);
+
+ Glib::RefPtr<Gdk::Screen> 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 && allow_vert) {
+ if (ty < canvas_timebars_vsize && moving_up && allow_vert) {
autoscroll_y = -1;
startit = true;
- } else if (event->y > _canvas_height) {
+ } else if (ty > _canvas_height && !moving_up && allow_vert) {
autoscroll_y = 1;
startit = true;
}
- if (_drags->current_pointer_frame() > rightmost_frame) {
- if (rightmost_frame < max_frames) {
+ framepos_t rightmost_frame = leftmost_frame + current_page_frames();
+ if (_autoscroll_fudging) {
+ rightmost_frame -= autoscroll_fudge_threshold ();
+ }
+
+ if (_drags->current_pointer_frame() > rightmost_frame && allow_horiz) {
+ if (rightmost_frame < max_framepos && !moving_left) {
autoscroll_x = 1;
startit = true;
}
- } else if (_drags->current_pointer_frame() < leftmost_frame) {
- if (leftmost_frame > 0) {
+ } else if (_drags->current_pointer_frame() < leftmost_frame && allow_horiz) {
+ if (leftmost_frame > 0 && moving_left) {
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 ();
}
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 = (_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 - _drags->current_pointer_frame()) / 3;
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;
void
Editor::stop_canvas_autoscroll ()
{
-
if (autoscroll_timeout_tag >= 0) {
g_source_remove (autoscroll_timeout_tag);
autoscroll_timeout_tag = -1;
bool
Editor::left_track_canvas (GdkEventCrossing */*ev*/)
{
- DropDownKeys ();
+ DropDownKeys ();
+ within_track_canvas = false;
+ //cerr << "left track canvas\n";
set_entered_track (0);
set_entered_regionview (0);
reset_canvas_action_sensitivity (false);
bool
Editor::entered_track_canvas (GdkEventCrossing */*ev*/)
{
+ //cerr << "entered track canvas\n";
+ within_track_canvas = true;
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 ()
{
time_line_group->move (x_delta, 0);
cursor_group->move (x_delta, 0);
- leftmost_frame = (nframes64_t) floor (p * frames_per_unit);
+ leftmost_frame = (framepos_t) floor (p * frames_per_unit);
update_fixed_rulers ();
redisplay_tempo (true);
_summary->set_overlays_dirty ();
}
+ update_video_timeline();
+
+ HorizontalPositionChanged (); /* EMIT SIGNAL */
+
#ifndef GTKOSX
if (!autoscroll_active && !_stationary_playhead) {
/* force rulers and canvas to move in lock step */
}
}
#endif
-
}
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();
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();
+ videotl_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VideoBar.get();
+ videotl_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();
{
return frame_to_unit (leftmost_frame);
}
+
+void
+Editor::set_canvas_cursor (Gdk::Cursor* cursor, bool save)
+{
+ if (save) {
+ current_canvas_cursor = cursor;
+ }
+
+ Glib::RefPtr<Gdk::Window> win = track_canvas->get_window();
+
+ if (win) {
+ 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;
+}
projects / ardour.git / blobdiff