*/
#include <libgnomecanvasmm/init.h>
+#include <libgnomecanvasmm/pixbuf.h>
#include <jack/types.h>
#include <gtkmm2ext/utils.h>
-#include <ardour/audioregion.h>
-#include <ardour/profile.h>
+#include "ardour/profile.h"
#include "ardour_ui.h"
#include "editor.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 "editing.h"
#include "rgb_macros.h"
#include "utils.h"
-#include "time_axis_view.h"
#include "audio_time_axis.h"
-
-#ifdef WITH_CMT
-#include "imageframe.h"
-#include "imageframe_p.h"
-#endif
+#include "editor_drag.h"
+#include "region_view.h"
+#include "editor_group_tabs.h"
+#include "editor_routes.h"
#include "i18n.h"
GType gnome_canvas_simpleline_get_type(void);
GType gnome_canvas_simplerect_get_type(void);
GType gnome_canvas_waveview_get_type(void);
-
-#ifdef WITH_CMT
GType gnome_canvas_imageframe_get_type(void);
-#endif
}
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);
-
-#ifdef WITH_CMT
- Glib::wrap_register(gnome_canvas_imageframe_get_type(), &Gnome::Canvas::ImageFrame_Class::wrap_new);
-#endif
+ // 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();
-
-#ifdef WITH_CMT
(void) Gnome::Canvas::ImageFrame::get_type();
-#endif
}
-
void
Editor::initialize_canvas ()
{
track_canvas->set_dither (Gdk::RGB_DITHER_NONE);
Glib::RefPtr<Gdk::Screen> screen = get_screen();
-
+
if (!screen) {
screen = Gdk::Screen::get_default();
}
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;
+ delete font;
+
verbose_cursor_visible = false;
+
+ /* on the bottom, an image */
if (Profile->get_sae()) {
Image img (::get_icon (X_("saelogo")));
logo_item->show ();
}
- _master_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
+ /* a group to hold time (measure) lines */
+ time_line_group = new ArdourCanvas::Group (*track_canvas->root());
- transport_loop_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, physical_screen_width);
+#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->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->property_outline_pixels() = 1;
transport_loop_range_rect->hide();
- transport_punch_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, physical_screen_width);
+ transport_punch_range_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, physical_screen_height);
transport_punch_range_rect->property_outline_pixels() = 0;
transport_punch_range_rect->hide();
- /* a group to hold time (measure) lines */
- time_line_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0);
-
- range_marker_drag_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, physical_screen_width);
- range_marker_drag_rect->hide ();
-
- _trackview_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0);
- _region_motion_group = new ArdourCanvas::Group (*_trackview_group, 0.0, 0.0);
+ _background_group = new ArdourCanvas::Group (*track_canvas->root());
+ _master_group = new ArdourCanvas::Group (*track_canvas->root());
- /* el barrio */
+ _trackview_group = new ArdourCanvas::Group (*_master_group);
+ _region_motion_group = new ArdourCanvas::Group (*_trackview_group);
- meter_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, physical_screen_width, timebar_height-1.0);
+ 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->property_outline_pixels() = 1;
- tempo_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height-1.0));
+ 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->property_outline_pixels() = 1;
- range_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height-1.0));
+ 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->property_outline_pixels() = 1;
- transport_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height-1.0));
+ 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->property_outline_pixels() = 1;
- marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height-1.0));
+ 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->property_outline_pixels() = 1;
- cd_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, physical_screen_width, (timebar_height-1.0));
+ 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->property_outline_pixels() = 1;
- timebar_group = new ArdourCanvas::Group (*track_canvas->root());
+ timebar_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
meter_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 5.0);
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, 1.0));
-
- 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 ();
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_width;
+ transport_punchin_line->property_y2() = physical_screen_height;
transport_punchin_line->hide ();
- transport_punchout_line = new ArdourCanvas::SimpleLine (*_master_group);
+ transport_punchout_line = new ArdourCanvas::SimpleLine (*_master_group);
transport_punchout_line->property_x1() = 0.0;
transport_punchout_line->property_y1() = 0.0;
transport_punchout_line->property_x2() = 0.0;
- transport_punchout_line->property_y2() = physical_screen_width;
+ transport_punchout_line->property_y2() = physical_screen_height;
transport_punchout_line->hide();
// used to show zoom mode active zooming
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);
+ 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_drag_motion().connect (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);
// 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"));
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) {
TrackViewList::iterator i;
double height = 0;
for (i = track_views.begin(); i != track_views.end(); ++i) {
- if ((*i)->control_parent) {
- height += (*i)->effective_height;
- }
+ height += (*i)->effective_height ();
(*i)->clip_to_viewport ();
}
full_canvas_height = height + canvas_timebars_vsize;
- } else {
- return true;
}
if (height_changed) {
if (playhead_cursor) {
- playhead_cursor->set_length (canvas_height);
+ playhead_cursor->set_length (_canvas_height);
}
-
- vertical_adjustment.set_page_size (canvas_height);
-
+
for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
- (*x)->set_line_vpos (0, canvas_height);
+ (*x)->set_line_vpos (0, _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()) {
+ /*
+ 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);
}
-
}
handle_new_duration ();
reset_hscrollbar_stepping ();
update_fixed_rulers();
redisplay_tempo (false);
+ _summary->set_overlays_dirty ();
- last_trackview_group_vertical_offset = get_trackview_group_vertical_offset ();
- 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 + 1);
- }
-
Resized (); /* EMIT_SIGNAL */
-
+
return false;
}
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 */
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
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) {
req->height = height;
controls_layout.property_height () = (guint) floor (pos);
+ controls_layout.property_height_request () = height;
}
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
}
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;
}
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 if(data.get_target() == "routes") {
- drop_routes (context, x, y, data, info, time);
- }
- else {
+ } else {
drop_paths (context, x, y, data, info, time);
}
}
+bool
+Editor::idle_drop_paths (vector<ustring> paths, nframes64_t frame, double ypos)
+{
+ drop_paths_part_two (paths, frame, ypos);
+ return false;
+}
+
void
-Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
- int x, int y,
- const SelectionData& data,
- guint info, guint time)
+Editor::drop_paths_part_two (const vector<ustring>& paths, nframes64_t frame, double ypos)
{
- TimeAxisView* tvp;
RouteTimeAxisView* tv;
- double cy;
- vector<ustring> paths;
- string spath;
- GdkEvent ev;
- nframes64_t frame;
-
- if (convert_drop_to_paths (paths, context, x, y, data, info, time)) {
- goto out;
- }
-
- /* D-n-D coordinates are window-relative, so convert to "world" coordinates
- */
-
- double wx;
- double wy;
-
- track_canvas->window_to_world (x, y, wx, wy);
- //wx += horizontal_adjustment.get_value();
- //wy += vertical_adjustment.get_value();
-
- ev.type = GDK_BUTTON_RELEASE;
- ev.button.x = wx;
- ev.button.y = wy;
-
- frame = event_frame (&ev, 0, &cy);
- snap_to (frame);
-
- if ((tvp = trackview_by_y_position (cy)) == 0) {
+ std::pair<TimeAxisView*, int> const tvp = trackview_by_y_position (ypos);
+ if (tvp.first == 0) {
/* drop onto canvas background: create new tracks */
do_embed (paths, Editing::ImportDistinctFiles, ImportAsTrack, frame);
}
- } else if ((tv = dynamic_cast<RouteTimeAxisView*>(tvp)) != 0) {
+ } else if ((tv = dynamic_cast<RouteTimeAxisView*> (tvp.first)) != 0) {
/* check that its an audio track, not a bus */
- /* check that its an audio track, not a bus */
-
if (tv->get_diskstream()) {
- /* select the track, then embed */
+ /* select the track, then embed/import */
selection->set (tv);
if (Profile->get_sae() || Config->get_only_copy_imported_files()) {
- do_import (paths, Editing::ImportDistinctFiles, Editing::ImportToTrack, SrcBest, frame);
+ do_import (paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, frame);
} else {
- do_embed (paths, Editing::ImportDistinctFiles, ImportToTrack, frame);
+ do_embed (paths, Editing::ImportSerializeFiles, ImportToTrack, frame);
}
}
}
-
- out:
- 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)
+Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
+ int x, int y,
+ const SelectionData& data,
+ guint info, guint time)
{
- const SerializedObjectPointers<boost::shared_ptr<Region> >* sr =
- reinterpret_cast<const SerializedObjectPointers<boost::shared_ptr<Region> > *> (data.get_data());
+ vector<ustring> paths;
+ GdkEvent ev;
+ nframes64_t frame;
+ double wx;
+ double wy;
+ double cy;
- for (uint32_t i = 0; i < sr->cnt; ++i) {
+ 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
+ */
- boost::shared_ptr<Region> r = sr->data[i];
+ 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);
- insert_region_list_drag (r, x, y);
+ 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));
+#else
+ drop_paths_part_two (paths, frame, cy);
+#endif
}
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);
+Editor::drop_regions (const RefPtr<Gdk::DragContext>& /*context*/,
+ int /*x*/, int /*y*/,
+ const SelectionData& /*data*/,
+ guint /*info*/, guint /*time*/)
+{
+ assert (_drag);
+ _drag->end_grab (0);
+ delete _drag;
+ _drag = 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;
+ nframes64_t frame = _drag->current_pointer_frame();
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;
}
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);
- }
-
- last_autoscroll_x = autoscroll_x;
- last_autoscroll_y = autoscroll_y;
-}
-
gint
Editor::_autoscroll_canvas (void *arg)
{
double new_pixel;
double target_pixel;
- if (autoscroll_x > 0) {
- autoscroll_x_distance = (unit_to_frame (drag_info.current_pointer_x) - (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;
-
+ assert (_drag);
+
+ 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;
+ } else if (autoscroll_x < 0) {
+ autoscroll_x_distance = (leftmost_frame - unit_to_frame (_drag->current_pointer_x())) / 3;
+
+ }
}
-
- if (autoscroll_y > 0) {
- autoscroll_y_distance = (drag_info.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;
+
+ if (autoscroll_y_distance != 0) {
+ if (autoscroll_y > 0) {
+ autoscroll_y_distance = (_drag->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;
+ }
}
-
+
if (autoscroll_x < 0) {
if (leftmost_frame < autoscroll_x_distance) {
new_frame = 0;
new_pixel = vertical_pos - autoscroll_y_distance;
}
- target_pixel = drag_info.current_pointer_y - autoscroll_y_distance;
+ target_pixel = _drag->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;
new_pixel = min (top_of_bottom_of_canvas, new_pixel);
- target_pixel = drag_info.current_pointer_y + autoscroll_y_distance;
+ target_pixel = _drag->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 = _drag->current_pointer_y();
new_pixel = vertical_pos;
}
reset_x_origin (new_frame);
}
+ vertical_adjustment.set_value (new_pixel);
+
/* fake an event. */
Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->track_canvas->get_window();
ev.x = x;
ev.y = y;
- motion_handler (drag_info.item, (GdkEvent*) &ev, drag_info.item_type, true);
-
- vertical_adjustment.set_value (new_pixel);
+ motion_handler (_drag->item(), (GdkEvent*) &ev, true);
autoscroll_cnt++;
}
bool
-Editor::left_track_canvas (GdkEventCrossing *ev)
+Editor::left_track_canvas (GdkEventCrossing */*ev*/)
{
set_entered_track (0);
set_entered_regionview (0);
}
bool
-Editor::entered_track_canvas (GdkEventCrossing *ev)
+Editor::entered_track_canvas (GdkEventCrossing */*ev*/)
{
reset_canvas_action_sensitivity (true);
return FALSE;
/* 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);
+ /* horizontal scrolling only */
+ double x1, y1, x2, y2, x_delta;
+ _master_group->get_bounds (x1, y1, x2, y2);
- if (time_origin != leftmost_frame) {
- canvas_scroll_to (time_origin);
- }
+ x_delta = - (x1 + horizontal_adjustment.get_value());
- /* horizontal scrolling only */
- double x1, x2, y1, y2, x_delta;
+ _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->get_bounds(x1, y1, x2, y2);
- x_delta = x1 + horizontal_adjustment.get_value();
+ leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
- _master_group->move (-x_delta, 0);
- timebar_group->move (-x_delta, 0);
- cursor_group->move (-x_delta, 0);
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 */
+ while (gtk_events_pending ()) {
+ gtk_main_iteration ();
+ }
+ }
+#endif
+
}
void
Editor::scroll_canvas_vertically ()
{
/* vertical scrolling only */
+
double y_delta;
y_delta = last_trackview_group_vertical_offset - get_trackview_group_vertical_offset ();
-
_trackview_group->move (0, y_delta);
+ _background_group->move (0, y_delta);
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
(*i)->clip_to_viewport ();
}
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;
- nframes64_t rightmost_frame = leftmost_frame + current_page_frames ();
-
- if (rightmost_frame > last_canvas_frame) {
- last_canvas_frame = rightmost_frame;
- //reset_scrolling_region ();
- }
+ update_canvas_now ();
}
void
{
playhead_cursor->canvas_item.property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_PlayHead.get();
verbose_canvas_cursor->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VerboseCanvasCursor.get();
-
+
meter_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MeterBar.get();
meter_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
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();
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 ();
+ }
+}
projects / ardour.git / blobdiff