X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas.cc;h=f52f8852caad03b8e39cf3299e5b41701fb1e087;hb=95bb346926e237b903059c83a70e58ed9253eaca;hp=b072a2779e13d49d8c4feabb31a920a27ae406eb;hpb=792e3de1d4cb291a02c5c31dad54028049bafed9;p=ardour.git diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index b072a2779e..f52f8852ca 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -17,6 +17,10 @@ */ +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + #include #include #include @@ -27,6 +31,7 @@ #include "ardour_ui.h" #include "editor.h" +#include "global_signals.h" #include "waveview.h" #include "simplerect.h" #include "simpleline.h" @@ -45,6 +50,10 @@ #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 "i18n.h" @@ -56,7 +65,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; @@ -104,13 +113,8 @@ Editor::initialize_canvas () track_canvas->set_center_scroll_region (false); track_canvas->set_dither (Gdk::RGB_DITHER_NONE); - Glib::RefPtr screen = get_screen(); - - if (!screen) { - screen = Gdk::Screen::get_default(); - } - physical_screen_width = screen->get_width (); - physical_screen_height = screen->get_height (); + gint phys_width = physical_screen_width (Glib::RefPtr()); + gint phys_height = physical_screen_height (Glib::RefPtr()); /* stuff for the verbose canvas cursor */ @@ -141,14 +145,14 @@ Editor::initialize_canvas () #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(); @@ -160,60 +164,60 @@ Editor::initialize_canvas () 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 = 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, physical_screen_width, timebar_height); + 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); 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 = 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, physical_screen_width, (timebar_height)); + 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); 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 = 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, physical_screen_width, (timebar_height)); + 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); 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 = 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, physical_screen_width, (timebar_height)); + 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); 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 = 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, physical_screen_width, (timebar_height)); + 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); 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 = 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, physical_screen_width, (timebar_height)); + 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); @@ -244,14 +248,14 @@ 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 @@ -286,9 +290,11 @@ 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->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); @@ -331,14 +337,10 @@ Editor::track_canvas_size_allocated () 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) { @@ -346,8 +348,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); @@ -376,10 +378,9 @@ Editor::controls_layout_size_request (Requisition* req) 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)); + gint height = min ((gint) pos, (gint) (physical_screen_height(get_window()) - 600)); bool changed = false; @@ -392,7 +393,7 @@ Editor::controls_layout_size_request (Requisition* req) /* don't get too big. the fudge factors here are just guesses */ - width = min (width, (gint) (physical_screen_width - 300)); + width = min (width, (gint) (physical_screen_width(get_window()) - 300)); if ((req->width != width) || (req->height != height)) { changed = true; @@ -432,7 +433,7 @@ 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; } @@ -452,14 +453,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; @@ -499,9 +500,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; @@ -545,38 +546,36 @@ Editor::drop_regions (const RefPtr& /*context*/, } void -Editor::maybe_autoscroll (GdkEventMotion* event, bool allow_vert) +Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert) { - nframes64_t rightmost_frame = leftmost_frame + current_page_frames(); + framepos_t rightmost_frame = leftmost_frame + current_page_frames(); bool startit = false; + 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 && 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 (_drags->current_pointer_frame() > rightmost_frame) { - 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 (_drags->current_pointer_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 (); } @@ -597,8 +596,8 @@ 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; @@ -726,7 +725,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 +737,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; @@ -750,6 +748,7 @@ Editor::stop_canvas_autoscroll () bool Editor::left_track_canvas (GdkEventCrossing */*ev*/) { + DropDownKeys (); set_entered_track (0); set_entered_regionview (0); reset_canvas_action_sensitivity (false); @@ -791,7 +790,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); @@ -800,6 +799,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 */ @@ -925,3 +926,35 @@ 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* event) +{ + /* 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); + } + + return false; +} + +bool +Editor::track_canvas_key_release (GdkEventKey* event) +{ + if (mouse_mode == Editing::MouseZoom && !Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { + set_canvas_cursor (_cursors->zoom_in); + } + + return false; +}