X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas.cc;h=3e7aad2a1bbffd9db281398e2f38268f8086103b;hb=7b57d47e2592641181d0e87b51ee93e89b4068f2;hp=27f9128ce59d7397fdaa4a5f52cdf35ddd8376ce;hpb=71a4796dc3dbf8a7fe1df5c5d7acea388b40eae0;p=ardour.git diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 27f9128ce5..3e7aad2a1b 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -17,16 +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" @@ -44,8 +50,11 @@ #include "editor_drag.h" #include "region_view.h" #include "editor_group_tabs.h" -#include "editor_routes.h" #include "editor_summary.h" +#include "keyboard.h" +#include "editor_cursors.h" +#include "mouse_cursors.h" +#include "verbose_cursor.h" #include "i18n.h" @@ -57,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; @@ -108,17 +117,7 @@ Editor::initialize_canvas () gint phys_width = physical_screen_width (Glib::RefPtr()); gint phys_height = physical_screen_height (Glib::RefPtr()); - /* stuff for the verbose canvas cursor */ - - 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 */ @@ -155,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, phys_width, timebar_height - 1); - meter_bar->property_outline_pixels() = 1; - } else { - meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, phys_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, phys_width, (timebar_height - 1)); - tempo_bar->property_outline_pixels() = 1; - } else { - tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, phys_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, phys_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, phys_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, phys_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, phys_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, phys_width, (timebar_height - 1)); - marker_bar->property_outline_pixels() = 1; - } else { - marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, phys_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, phys_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, phys_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); @@ -282,11 +251,13 @@ Editor::initialize_canvas () 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 */ @@ -338,8 +309,8 @@ Editor::track_canvas_size_allocated () 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); @@ -357,73 +328,47 @@ Editor::track_canvas_size_allocated () 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 (); - } - - gint height = min ((gint) pos, (gint) (physical_screen_height(get_window()) - 600)); - - bool changed = false; - - gint w = edit_controls_vbox.get_width(); - if (_group_tabs->is_mapped()) { - w += _group_tabs->get_width (); - } - - gint width = max (w, controls_layout.get_width()); - - /* don't get too big. the fudge factors here are just guesses */ + GtkRequisition req; + gint w; - width = min (width, (gint) (physical_screen_width(get_window()) - 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(); - 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; } @@ -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; @@ -490,9 +435,9 @@ Editor::drop_paths (const RefPtr& context, 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; @@ -535,37 +480,85 @@ Editor::drop_regions (const RefPtr& /*context*/, _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; +} + +/** @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 (bool allow_horiz, 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; - double ty = _drags->current_pointer_y() - get_trackview_group_vertical_offset (); + /* 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 (ty < canvas_timebars_vsize && allow_vert) { + if (ty < canvas_timebars_vsize && moving_up && allow_vert) { autoscroll_y = -1; startit = true; - } else if (ty > _canvas_height && allow_vert) { + } else if (ty > _canvas_height && !moving_up && allow_vert) { autoscroll_y = 1; startit = true; } + 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_frames) { + if (rightmost_frame < max_framepos && !moving_left) { autoscroll_x = 1; startit = true; } } else if (_drags->current_pointer_frame() < leftmost_frame && allow_horiz) { - if (leftmost_frame > 0) { + if (leftmost_frame > 0 && moving_left) { autoscroll_x = -1; startit = true; } } - 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 (); } @@ -586,16 +579,19 @@ 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 = (_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; @@ -715,7 +711,7 @@ 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; @@ -738,7 +734,9 @@ Editor::stop_canvas_autoscroll () 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); @@ -748,10 +746,28 @@ Editor::left_track_canvas (GdkEventCrossing */*ev*/) 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 () { @@ -780,7 +796,7 @@ Editor::set_horizontal_position (double p) 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); @@ -789,6 +805,8 @@ Editor::set_horizontal_position (double p) _summary->set_overlays_dirty (); } + HorizontalPositionChanged (); /* EMIT SIGNAL */ + #ifndef GTKOSX if (!autoscroll_active && !_stationary_playhead) { /* force rulers and canvas to move in lock step */ @@ -823,7 +841,7 @@ 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(); @@ -914,3 +932,38 @@ 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; + } + + Glib::RefPtr 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; +}