new MIDI binding maps for Korg nanoKontrol and M-Audio Axiom 25 from Chooch Schubert...
[ardour.git] / gtk2_ardour / editor_summary.cc
index 4a9a397fb917e26773614386ef0d613e649fa938..e55b53aeea081149b1617972d03c1d7bfa5d00d9 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include "region_view.h"
 #include "rgb_macros.h"
 #include "keyboard.h"
+#include "editor_routes.h"
+#include "editor_cursors.h"
+#include "mouse_cursors.h"
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
+using Gtkmm2ext::Keyboard;
 
 /** Construct an EditorSummary.
  *  @param e Editor to represent.
  */
 EditorSummary::EditorSummary (Editor* e)
-       : _editor (e),
-         _session (0),
-         _pixmap (0),
-         _regions_dirty (true),
-         _width (512),
-         _height (64),
+       : EditorComponent (e),
+         _start (0),
+         _end (1),
+         _overhang_fraction (0.1),
          _x_scale (1),
-         _y_scale (1),
+         _track_height (16),
+         _last_playhead (-1),
          _move_dragging (false),
          _moved (false),
+         _view_rectangle_x (0, 0),
+         _view_rectangle_y (0, 0),
          _zoom_dragging (false)
-         
 {
-       
+       Region::RegionPropertyChanged.connect (region_property_connection, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context());
+       _editor->playhead_cursor->PositionChanged.connect (position_connection, invalidator (*this), ui_bind (&EditorSummary::playhead_position_changed, this, _1), gui_context());
+
+       add_events (Gdk::POINTER_MOTION_MASK);  
 }
 
-/** Set the session.
+/** Connect to a session.
  *  @param s Session.
  */
 void
 EditorSummary::set_session (Session* s)
 {
-       _session = s;
-
-       Region::RegionPropertyChanged.connect (sigc::hide (mem_fun (*this, &EditorSummary::set_dirty)));
-
-       _session->RegionRemoved.connect (sigc::hide (mem_fun (*this, &EditorSummary::set_dirty)));
-       _session->EndTimeChanged.connect (mem_fun (*this, &EditorSummary::set_dirty));
-       _session->StartTimeChanged.connect (mem_fun (*this, &EditorSummary::set_dirty));
+       SessionHandlePtr::set_session (s);
 
        set_dirty ();
-}
 
-/** Destroy */
-EditorSummary::~EditorSummary ()
-{
-       if (_pixmap) {
-               gdk_pixmap_unref (_pixmap);
+       /* Note: the EditorSummary already finds out about new regions from Editor::region_view_added
+        * (which attaches to StreamView::RegionViewAdded), and cut regions by the RegionPropertyChanged
+        * emitted when a cut region is added to the `cutlist' playlist.
+        */
+
+       if (_session) {
+               _session->StartTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&EditorSummary::set_dirty, this), gui_context());
+               _session->EndTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&EditorSummary::set_dirty, this), gui_context());
        }
 }
 
@@ -82,79 +84,49 @@ EditorSummary::~EditorSummary ()
 bool
 EditorSummary::on_expose_event (GdkEventExpose* event)
 {
-       /* Render the regions pixmap */
-       
-       Gdk::Rectangle const exposure (
-               event->area.x, event->area.y, event->area.width, event->area.height
-               );
+       CairoWidget::on_expose_event (event);
 
-       Gdk::Rectangle r = exposure;
-       Gdk::Rectangle content (0, 0, _width, _height);
-       bool intersects;
-       r.intersect (content, intersects);
-       
-       if (intersects) {
-
-               GdkPixmap* p = get_pixmap (get_window()->gobj ());
-
-               gdk_draw_drawable (
-                       get_window()->gobj(),
-                       get_style()->get_fg_gc (Gtk::STATE_NORMAL)->gobj(),
-                       p,
-                       r.get_x(),
-                       r.get_y(),
-                       r.get_x(),
-                       r.get_y(),
-                       r.get_width(),
-                       r.get_height()
-                       );
+       if (_session == 0) {
+               return false;
        }
 
-       /* Render the view rectangle */
-       
-       pair<double, double> x;
-       pair<double, double> y;
-       editor_view (&x, &y);
-       
        cairo_t* cr = gdk_cairo_create (get_window()->gobj());
 
-       cairo_move_to (cr, x.first, y.first);
-       cairo_line_to (cr, x.second, y.first);
-       cairo_line_to (cr, x.second, y.second);
-       cairo_line_to (cr, x.first, y.second);
-       cairo_line_to (cr, x.first, y.first);
+       /* Render the view rectangle.  If there is an editor visual pending, don't update
+          the view rectangle now --- wait until the expose event that we'll get after
+          the visual change.  This prevents a flicker.
+       */
+
+       if (_editor->pending_visual_change.idle_handler_id < 0) {
+               get_editor (&_view_rectangle_x, &_view_rectangle_y);
+       }
+
+       cairo_move_to (cr, _view_rectangle_x.first, _view_rectangle_y.first);
+       cairo_line_to (cr, _view_rectangle_x.second, _view_rectangle_y.first);
+       cairo_line_to (cr, _view_rectangle_x.second, _view_rectangle_y.second);
+       cairo_line_to (cr, _view_rectangle_x.first, _view_rectangle_y.second);
+       cairo_line_to (cr, _view_rectangle_x.first, _view_rectangle_y.first);
        cairo_set_source_rgba (cr, 1, 1, 1, 0.25);
        cairo_fill_preserve (cr);
        cairo_set_line_width (cr, 1);
        cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
        cairo_stroke (cr);
 
-       cairo_destroy (cr);
-       
-       return true;
-}
+       /* Playhead */
 
-/** @param drawable GDK drawable.
- *  @return pixmap for the regions.
- */
-GdkPixmap *
-EditorSummary::get_pixmap (GdkDrawable* drawable)
-{
-       if (_regions_dirty) {
-
-               if (_pixmap) {
-                       gdk_pixmap_unref (_pixmap);
-               }
-               _pixmap = gdk_pixmap_new (drawable, _width, _height, -1);
+       cairo_set_line_width (cr, 1);
+       /* XXX: colour should be set from configuration file */
+       cairo_set_source_rgba (cr, 1, 0, 0, 1);
 
-               cairo_t* cr = gdk_cairo_create (_pixmap);
-               render (cr);
-               cairo_destroy (cr);
+       double const p = (_editor->playhead_cursor->current_frame - _start) * _x_scale;
+       cairo_move_to (cr, p, 0);
+       cairo_line_to (cr, p, _height);
+       cairo_stroke (cr);
+       _last_playhead = p;
 
-               _regions_dirty = false;
-       }
+       cairo_destroy (cr);
 
-       return _pixmap;
+       return true;
 }
 
 /** Render the required regions to a cairo context.
@@ -163,91 +135,121 @@ EditorSummary::get_pixmap (GdkDrawable* drawable)
 void
 EditorSummary::render (cairo_t* cr)
 {
-       if (_session == 0) {
-               return;
-       }
-
        /* background */
-       
+
        cairo_set_source_rgb (cr, 0, 0, 0);
        cairo_rectangle (cr, 0, 0, _width, _height);
        cairo_fill (cr);
 
-       /* compute total height of all tracks */
-       
-       int h = 0;
-       int max_height = 0;
-       for (PublicEditor::TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
-               int const t = (*i)->effective_height ();
-               h += t;
-               max_height = max (max_height, t);
+       if (_session == 0) {
+               return;
        }
 
-       nframes_t const start = _session->current_start_frame ();
-       _x_scale = static_cast<double> (_width) / (_session->current_end_frame() - start);
-       _y_scale = static_cast<double> (_height) / h;
-
-       /* tallest a region should ever be in the summary, in pixels */
-       int const tallest_region_pixels = 12;
+       /* compute start and end points for the summary */
+       
+       nframes_t const session_length = _session->current_end_frame() - _session->current_start_frame ();
+       double const theoretical_start = _session->current_start_frame() - session_length * _overhang_fraction;
+       _start = theoretical_start > 0 ? theoretical_start : 0;
+       _end = _session->current_end_frame() + session_length * _overhang_fraction;
+
+       /* compute track height */
+       int N = 0;
+       for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+               if (!(*i)->hidden()) {
+                       ++N;
+               }
+       }
+       
+       if (N == 0) {
+               _track_height = 16;
+       } else {
+               _track_height = (double) _height / N;
+       }
 
-       if (max_height * _y_scale > tallest_region_pixels) {
-               _y_scale = static_cast<double> (tallest_region_pixels) / max_height;
+       /* calculate x scale */
+       if (_end != _start) {
+               _x_scale = static_cast<double> (_width) / (_end - _start);
+       } else {
+               _x_scale = 1;
        }
 
-       /* render regions */
+       /* render tracks and regions */
 
        double y = 0;
-       for (PublicEditor::TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+       for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+
+               if ((*i)->hidden()) {
+                       continue;
+               }
+
+               cairo_set_source_rgb (cr, 0.2, 0.2, 0.2);
+               cairo_set_line_width (cr, _track_height - 2);
+               cairo_move_to (cr, 0, y + _track_height / 2);
+               cairo_line_to (cr, _width, y + _track_height / 2);
+               cairo_stroke (cr);
+               
                StreamView* s = (*i)->view ();
 
                if (s) {
-                       double const h = (*i)->effective_height () * _y_scale;
-                       cairo_set_line_width (cr, h);
+                       cairo_set_line_width (cr, _track_height * 0.6);
 
-                       s->foreach_regionview (bind (
-                                                      mem_fun (*this, &EditorSummary::render_region),
+                       s->foreach_regionview (sigc::bind (
+                                                      sigc::mem_fun (*this, &EditorSummary::render_region),
                                                       cr,
-                                                      start,
-                                                      y + h / 2
+                                                      y + _track_height / 2
                                                       ));
-                       y += h;
                }
+               
+               y += _track_height;
        }
 
+       /* start and end markers */
+
+       cairo_set_line_width (cr, 1);
+       cairo_set_source_rgb (cr, 1, 1, 0);
+
+       double const p = (_session->current_start_frame() - _start) * _x_scale;
+       cairo_move_to (cr, p, 0);
+       cairo_line_to (cr, p, _height);
+       cairo_stroke (cr);
+
+       double const q = (_session->current_end_frame() - _start) * _x_scale;
+       cairo_move_to (cr, q, 0);
+       cairo_line_to (cr, q, _height);
+       cairo_stroke (cr);
 }
 
 /** Render a region for the summary.
  *  @param r Region view.
  *  @param cr Cairo context.
- *  @param start Frame offset that the summary starts at.
  *  @param y y coordinate to render at.
  */
 void
-EditorSummary::render_region (RegionView* r, cairo_t* cr, nframes_t start, double y) const
+EditorSummary::render_region (RegionView* r, cairo_t* cr, double y) const
 {
        uint32_t const c = r->get_fill_color ();
        cairo_set_source_rgb (cr, UINT_RGBA_R (c) / 255.0, UINT_RGBA_G (c) / 255.0, UINT_RGBA_B (c) / 255.0);
-                       
-       cairo_move_to (cr, (r->region()->position() - start) * _x_scale, y);
-       cairo_line_to (cr, ((r->region()->position() - start + r->region()->length())) * _x_scale, y);
-       cairo_stroke (cr);
-}
 
-/** Set the summary so that the whole thing will be re-rendered next time it is required */
-void
-EditorSummary::set_dirty ()
-{
-       ENSURE_GUI_THREAD (mem_fun (*this, &EditorSummary::set_dirty));
+       if (r->region()->position() > _start) {
+               cairo_move_to (cr, (r->region()->position() - _start) * _x_scale, y);
+       } else {
+               cairo_move_to (cr, 0, y);
+       }
 
-       _regions_dirty = true;
-       queue_draw ();
+       if ((r->region()->position() + r->region()->length()) > _start) {
+               cairo_line_to (cr, ((r->region()->position() - _start + r->region()->length())) * _x_scale, y);
+       } else {
+               cairo_line_to (cr, 0, y);
+       }
+
+       cairo_stroke (cr);
 }
 
-/** Set the summary so that just the view boundary markers will be re-rendered */
+/** Set the summary so that just the overlays (viewbox, playhead etc.) will be re-rendered */
 void
-EditorSummary::set_bounds_dirty ()
+EditorSummary::set_overlays_dirty ()
 {
-       ENSURE_GUI_THREAD (mem_fun (*this, &EditorSummary::set_bounds_dirty));
+       ENSURE_GUI_THREAD (*this, &EditorSummary::set_overlays_dirty)
        queue_draw ();
 }
 
@@ -259,45 +261,37 @@ EditorSummary::on_size_request (Gtk::Requisition *req)
 {
        /* Use a dummy, small width and the actual height that we want */
        req->width = 64;
-       req->height = 64;
+       req->height = 32;
 }
 
-/** Handle a size allocation.
- *  @param alloc GTK allocation.
- */
+
 void
-EditorSummary::on_size_allocate (Gtk::Allocation& alloc)
+EditorSummary::centre_on_click (GdkEventButton* ev)
 {
-       Gtk::EventBox::on_size_allocate (alloc);
+       pair<double, double> xr;
+       pair<double, double> yr;
+       get_editor (&xr, &yr);
 
-       _width = alloc.get_width ();
-       _height = alloc.get_height ();
+       double const w = xr.second - xr.first;
 
-       set_dirty ();
-}
+       xr.first = ev->x - w / 2;
+       xr.second = ev->x + w / 2;
 
-void
-EditorSummary::centre_on_click (GdkEventButton* ev)
-{
-       nframes_t x = (ev->x / _x_scale) + _session->current_start_frame();
-       nframes_t const xh = _editor->current_page_frames () / 2;
-       if (x > xh) {
-               x -= xh;
-       } else {
-               x = 0;
+       if (xr.first < 0) {
+               xr.first = 0;
+               xr.second = w;
+       } else if (xr.second > _width) {
+               xr.second = _width;
+               xr.first = _width - w;
        }
-       
-       _editor->reset_x_origin (x);
-       
-       double y = ev->y / _y_scale;
-       double const yh = _editor->canvas_height () / 2;
-       if (y > yh) {
-               y -= yh;
-       } else {
-               y = 0;
+
+       double ey = summary_y_to_editor (ev->y);
+       ey -= (_editor->canvas_height() - _editor->get_canvas_timebars_vsize ()) / 2;
+       if (ey < 0) {
+               ey = 0;
        }
        
-       _editor->reset_y_origin (y);
+       set_editor (xr, editor_y_to_summary (ey));
 }
 
 /** Handle a button press.
@@ -307,126 +301,224 @@ bool
 EditorSummary::on_button_press_event (GdkEventButton* ev)
 {
        if (ev->button == 1) {
-               
+
                pair<double, double> xr;
                pair<double, double> yr;
-               editor_view (&xr, &yr);
-               
-               if (xr.first <= ev->x && ev->x <= xr.second && yr.first <= ev->y && ev->y <= yr.second) {
-
-                       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-
-                               /* modifier-click inside the view rectangle: start a zoom drag */
-                               _zoom_position = NONE;
-
-                               double const x1 = xr.first + (xr.second - xr.first) * 0.33;
-                               double const x2 = xr.first + (xr.second - xr.first) * 0.67;
-
-                               if (ev->x < x1) {
-                                       _zoom_position = LEFT;
-                               } else if (ev->x > x2) {
-                                       _zoom_position = RIGHT;
-                               } else {
-                                       _zoom_position = NONE;
-                               }
-                                               
-                               if (_zoom_position != NONE) {
-                                       _zoom_dragging = true;
-                                       _mouse_x_start = ev->x;
-                                       _width_start = xr.second - xr.first;
-                                       _zoom_start = _editor->get_current_zoom ();
-                                       _frames_start = _editor->leftmost_position ();
-                                       _editor->_dragging_playhead = true;
-                               }
-                                       
-                       } else {
-
-                               /* ordinary click inside the view rectangle: start a move drag */
-                               
-                               _move_dragging = true;
-                               _moved = false;
-                               _x_offset = ev->x - xr.first;
-                               _y_offset = ev->y - yr.first;
-                               _editor->_dragging_playhead = true;
+               get_editor (&xr, &yr);
+
+               _start_editor_x = xr;
+               _start_editor_y = yr;
+               _start_mouse_x = ev->x;
+               _start_mouse_y = ev->y;
+               _start_position = get_position (ev->x, ev->y);
+
+               if (_start_position != INSIDE && _start_position != BELOW_OR_ABOVE &&
+                   _start_position != TO_LEFT_OR_RIGHT && _start_position != OTHERWISE_OUTSIDE
+                       ) {
+
+                       /* start a zoom drag */
+
+                       _zoom_position = get_position (ev->x, ev->y);
+                       _zoom_dragging = true;
+                       _editor->_dragging_playhead = true;
+
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+
+                       /* secondary-modifier-click: locate playhead */
+                       if (_session) {
+                               _session->request_locate (ev->x / _x_scale + _start);
                        }
-                       
-               } else {
-                       
-                       /* click outside the view rectangle: centre the view around the mouse click */
+
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+
                        centre_on_click (ev);
+
+               } else {
+
+                       /* start a move drag */
+
+                       _move_dragging = true;
+                       _moved = false;
+                       _editor->_dragging_playhead = true;
                }
        }
 
        return true;
 }
 
+/** Fill in x and y with the editor's current viewable area in summary coordinates */
 void
-EditorSummary::editor_view (pair<double, double>* x, pair<double, double>* y) const
+EditorSummary::get_editor (pair<double, double>* x, pair<double, double>* y) const
 {
-       x->first = (_editor->leftmost_position () - _session->current_start_frame ()) * _x_scale;
+       assert (x);
+       assert (y);
+       
+       x->first = (_editor->leftmost_position () - _start) * _x_scale;
        x->second = x->first + _editor->current_page_frames() * _x_scale;
 
-       y->first = _editor->get_trackview_group_vertical_offset () * _y_scale;
-       y->second = y->first + _editor->canvas_height () * _y_scale;
+       y->first = editor_y_to_summary (_editor->vertical_adjustment.get_value ());
+       y->second = editor_y_to_summary (_editor->vertical_adjustment.get_value () + _editor->canvas_height() - _editor->get_canvas_timebars_vsize());
+}
+
+/** Get an expression of the position of a point with respect to the view rectangle */
+EditorSummary::Position
+EditorSummary::get_position (double x, double y) const
+{
+       /* how close the mouse has to be to the edge of the view rectangle to be considered `on it',
+          in pixels */
+
+       int x_edge_size = (_view_rectangle_x.second - _view_rectangle_x.first) / 4;
+       x_edge_size = min (x_edge_size, 8);
+       x_edge_size = max (x_edge_size, 1);
+
+       int y_edge_size = (_view_rectangle_y.second - _view_rectangle_y.first) / 4;
+       y_edge_size = min (y_edge_size, 8);
+       y_edge_size = max (y_edge_size, 1);
+       
+       bool const near_left = (std::abs (x - _view_rectangle_x.first) < x_edge_size);
+       bool const near_right = (std::abs (x - _view_rectangle_x.second) < x_edge_size);
+       bool const near_top = (std::abs (y - _view_rectangle_y.first) < y_edge_size);
+       bool const near_bottom = (std::abs (y - _view_rectangle_y.second) < y_edge_size);
+       bool const within_x = _view_rectangle_x.first < x && x < _view_rectangle_x.second;
+       bool const within_y = _view_rectangle_y.first < y && y < _view_rectangle_y.second;
+
+       if (near_left && near_top) {
+               return LEFT_TOP;
+       } else if (near_left && near_bottom) {
+               return LEFT_BOTTOM;
+       } else if (near_right && near_top) {
+               return RIGHT_TOP;
+       } else if (near_right && near_bottom) {
+               return RIGHT_BOTTOM;
+       } else if (near_left && within_y) {
+               return LEFT;
+       } else if (near_right && within_y) {
+               return RIGHT;
+       } else if (near_top && within_x) {
+               return TOP;
+       } else if (near_bottom && within_x) {
+               return BOTTOM;
+       } else if (within_x && within_y) {
+               return INSIDE;
+       } else if (within_x) {
+               return BELOW_OR_ABOVE;
+       } else if (within_y) {
+               return TO_LEFT_OR_RIGHT;
+       } else {
+               return OTHERWISE_OUTSIDE;
+       }
+}
+
+void
+EditorSummary::set_cursor (Position p)
+{
+       switch (p) {
+       case LEFT:
+               get_window()->set_cursor (*_editor->_cursors->resize_left);
+               break;
+       case LEFT_TOP:
+               get_window()->set_cursor (*_editor->_cursors->resize_top_left);
+               break;
+       case TOP:
+               get_window()->set_cursor (*_editor->_cursors->resize_top);
+               break;
+       case RIGHT_TOP:
+               get_window()->set_cursor (*_editor->_cursors->resize_top_right);
+               break;
+       case RIGHT:
+               get_window()->set_cursor (*_editor->_cursors->resize_right);
+               break;
+       case RIGHT_BOTTOM:
+               get_window()->set_cursor (*_editor->_cursors->resize_bottom_right);
+               break;
+       case BOTTOM:
+               get_window()->set_cursor (*_editor->_cursors->resize_bottom);
+               break;
+       case LEFT_BOTTOM:
+               get_window()->set_cursor (*_editor->_cursors->resize_bottom_left);
+               break;
+       case INSIDE:
+               get_window()->set_cursor (*_editor->_cursors->move);
+               break;
+       case TO_LEFT_OR_RIGHT:
+               get_window()->set_cursor (*_editor->_cursors->expand_left_right);
+               break;
+       case BELOW_OR_ABOVE:
+               get_window()->set_cursor (*_editor->_cursors->expand_up_down);
+               break;
+       default:
+               get_window()->set_cursor ();
+               break;
+       }
 }
 
 bool
 EditorSummary::on_motion_notify_event (GdkEventMotion* ev)
 {
+       pair<double, double> xr = _start_editor_x;
+       pair<double, double> yr = _start_editor_y;
+       double y = _start_editor_y.first;
+
        if (_move_dragging) {
 
                _moved = true;
-               _editor->reset_x_origin (((ev->x - _x_offset) / _x_scale) + _session->current_start_frame ());
-               _editor->reset_y_origin ((ev->y - _y_offset) / _y_scale);
-               return true;
+
+               /* don't alter x if we clicked outside and above or below the viewbox */
+               if (_start_position == INSIDE || _start_position == TO_LEFT_OR_RIGHT || _start_position == OTHERWISE_OUTSIDE) {
+                       xr.first += ev->x - _start_mouse_x;
+                       xr.second += ev->x - _start_mouse_x;
+               }
+
+               /* don't alter y if we clicked outside and to the left or right of the viewbox */
+               if (_start_position == INSIDE || _start_position == BELOW_OR_ABOVE) {
+                       y += ev->y - _start_mouse_y;
+               }
+
+               if (xr.first < 0) {
+                       xr.second -= xr.first;
+                       xr.first = 0;
+               }
+
+               if (y < 0) {
+                       y = 0;
+               }
+
+               set_editor (xr, y);
+               set_cursor (_start_position);
 
        } else if (_zoom_dragging) {
 
-               double const dx = ev->x - _mouse_x_start;
+               double const dx = ev->x - _start_mouse_x;
+               double const dy = ev->y - _start_mouse_y;
 
-               nframes64_t rx = _frames_start;
-               double f = 1;
-               
-               switch (_zoom_position) {
-               case LEFT:
-                       f = 1 - (dx / _width_start);
-                       rx += (dx / _x_scale);
-                       break;
-               case RIGHT:
-                       f = 1 + (dx / _width_start);
-                       break;
-               case NONE:
-                       break;
+               if (_zoom_position == LEFT || _zoom_position == LEFT_TOP || _zoom_position == LEFT_BOTTOM) {
+                       xr.first += dx;
+               } else if (_zoom_position == RIGHT || _zoom_position == RIGHT_TOP || _zoom_position == RIGHT_BOTTOM) {
+                       xr.second += dx;
                }
 
-               if (_editor->pending_visual_change.idle_handler_id < 0) {
-                       
-                       /* As a side-effect, the Editor's visual change idle handler processes
-                          pending GTK events.  Hence this motion notify handler can be called
-                          in the middle of a visual change idle handler, and if this happens,
-                          the queue_visual_change calls below modify the variables that the
-                          idle handler is working with.  This causes problems.  Hence the
-                          check above.  It ensures that we won't modify the pending visual change
-                          while a visual change idle handler is in progress.  It's not perfect,
-                          as it also means that we won't change these variables if an idle handler
-                          is merely pending but not executing.  But c'est la vie.
-                       */
-                          
-                       _editor->queue_visual_change (rx);
-                       _editor->queue_visual_change (_zoom_start * f);
+               if (_zoom_position == TOP || _zoom_position == LEFT_TOP || _zoom_position == RIGHT_TOP) {
+                       yr.first += dy;
+               } else if (_zoom_position == BOTTOM || _zoom_position == LEFT_BOTTOM || _zoom_position == RIGHT_BOTTOM) {
+                       yr.second += dy;
                }
+
+               set_overlays_dirty ();
+               set_cursor (_zoom_position);
+               set_editor (xr, yr);
+
+       } else {
+
+               set_cursor (get_position (ev->x, ev->y));
+
        }
-               
+
        return true;
 }
 
 bool
-EditorSummary::on_button_release_event (GdkEventButton* ev)
+EditorSummary::on_button_release_event (GdkEventButton*)
 {
-       if (_move_dragging && !_moved) {
-               centre_on_click (ev);
-       }
-
        _move_dragging = false;
        _zoom_dragging = false;
        _editor->_dragging_playhead = false;
@@ -437,36 +529,253 @@ bool
 EditorSummary::on_scroll_event (GdkEventScroll* ev)
 {
        /* mouse wheel */
-       
+
        pair<double, double> xr;
        pair<double, double> yr;
-       editor_view (&xr, &yr);
-               
+       get_editor (&xr, &yr);
+       double y = yr.first;
+
+       double amount = 8;
+
+       if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
+               amount = 64;
+       } else if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
+               amount = 1;
+       }
+
        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-               
-               double x = xr.first;
-               
+
+               /* primary-wheel == left-right scrolling */
+
                if (ev->direction == GDK_SCROLL_UP) {
-                       x += 16;
-               } else {
-                       x -= 16;
+                       xr.first += amount;
+                       xr.second += amount;
+               } else if (ev->direction == GDK_SCROLL_DOWN) {
+                       xr.first -= amount;
+                       xr.second -= amount;
                }
-               
-               _editor->reset_x_origin (x / _x_scale);
-               
+
        } else {
+
+               if (ev->direction == GDK_SCROLL_DOWN) {
+                       y += amount;
+               } else if (ev->direction == GDK_SCROLL_UP) {
+                       y -= amount;
+               } else if (ev->direction == GDK_SCROLL_LEFT) {
+                       xr.first -= amount;
+                       xr.second -= amount;
+               } else if (ev->direction == GDK_SCROLL_RIGHT) {
+                       xr.first += amount;
+                       xr.second += amount;
+               }
+       }
+
+       set_editor (xr, y);
+       return true;
+}
+
+/** Set the editor to display a given x range and a y range with the top at a given position.
+ *  The editor's x zoom is adjusted if necessary, but the y zoom is not changed.
+ *  x and y parameters are specified in summary coordinates.
+ */
+void
+EditorSummary::set_editor (pair<double,double> const & x, double const y)
+{
+       if (_editor->pending_visual_change.idle_handler_id >= 0) {
+
+               /* As a side-effect, the Editor's visual change idle handler processes
+                  pending GTK events.  Hence this motion notify handler can be called
+                  in the middle of a visual change idle handler, and if this happens,
+                  the queue_visual_change calls below modify the variables that the
+                  idle handler is working with.  This causes problems.  Hence this
+                  check.  It ensures that we won't modify the pending visual change
+                  while a visual change idle handler is in progress.  It's not perfect,
+                  as it also means that we won't change these variables if an idle handler
+                  is merely pending but not executing.  But c'est la vie.
+               */
+
+               return;
+       }
+       
+       set_editor_x (x);
+       set_editor_y (y);
+}
+
+/** Set the editor to display given x and y ranges.  x zoom and track heights are
+ *  adjusted if necessary.
+ *  x and y parameters are specified in summary coordinates.
+ */
+void
+EditorSummary::set_editor (pair<double,double> const & x, pair<double, double> const & y)
+{
+       if (_editor->pending_visual_change.idle_handler_id >= 0) {
+               /* see comment in other set_editor () */
+               return;
+       }
+       
+       set_editor_x (x);
+       set_editor_y (y);
+}
+
+/** Set the x range visible in the editor.
+ *  Caller should have checked that Editor::pending_visual_change.idle_handler_id is < 0
+ *  @param x new x range in summary coordinates.
+ */
+void
+EditorSummary::set_editor_x (pair<double, double> const & x)
+{
+       _editor->reset_x_origin (x.first / _x_scale + _start);
+
+       double const nx = (
+               ((x.second - x.first) / _x_scale) /
+               _editor->frame_to_unit (_editor->current_page_frames())
+               );
+       
+       if (nx != _editor->get_current_zoom ()) {
+               _editor->reset_zoom (nx);
+       }       
+}
+
+/** Set the top of the y range visible in the editor.
+ *  Caller should have checked that Editor::pending_visual_change.idle_handler_id is < 0
+ *  @param y new editor top in summary coodinates.
+ */
+void
+EditorSummary::set_editor_y (double const y)
+{
+       double y1 = summary_y_to_editor (y);
+       double const eh = _editor->canvas_height() - _editor->get_canvas_timebars_vsize ();
+       double y2 = y1 + eh;
+       
+       double const full_editor_height = _editor->full_canvas_height - _editor->get_canvas_timebars_vsize();
+
+       if (y2 > full_editor_height) {
+               y1 -= y2 - full_editor_height;
+       }
+       
+       if (y1 < 0) {
+               y1 = 0;
+       }
+
+       _editor->reset_y_origin (y1);
+}
+
+/** Set the y range visible in the editor.  This is achieved by scaling track heights,
+ *  if necessary.
+ *  Caller should have checked that Editor::pending_visual_change.idle_handler_id is < 0
+ *  @param y new editor range in summary coodinates.
+ */
+void
+EditorSummary::set_editor_y (pair<double, double> const & y)
+{
+       /* Compute current height of tracks between y.first and y.second.  We add up
+          the total height into `total_height' and the height of complete tracks into
+          `scale height'.
+       */
+       pair<double, double> yc = y;
+       double total_height = 0;
+       double scale_height = 0;
+       
+       _editor->_routes->suspend_redisplay ();
+
+       for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+
+               if ((*i)->hidden()) {
+                       continue;
+               }
                
-               double y = yr.first;
+               double const h = (*i)->effective_height ();
+
+               if (yc.first >= 0 && yc.first < _track_height) {
+                       total_height += (_track_height - yc.first) * h / _track_height;
+               } else if (yc.first < 0 && yc.second > _track_height) {
+                       total_height += h;
+                       scale_height += h;
+               } else if (yc.second >= 0 && yc.second < _track_height) {
+                       total_height += yc.second * h / _track_height;
+                       break;
+               }
+
+               yc.first -= _track_height;
+               yc.second -= _track_height;
+       }
+       
+       /* hence required scale factor of the complete tracks to fit the required y range */
+       double const scale = ((_editor->canvas_height() - _editor->get_canvas_timebars_vsize()) - (total_height - scale_height)) / scale_height;
+
+       yc = y;
+
+       /* Scale complete tracks within the range to make it fit */
+       
+       for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+
+               if ((*i)->hidden()) {
+                       continue;
+               }
+
+               if (yc.first < 0 && yc.second > _track_height) {
+                       (*i)->set_height (max (TimeAxisView::preset_height (HeightSmall), (uint32_t) ((*i)->effective_height() * scale)));
+               }
+
+               yc.first -= _track_height;
+               yc.second -= _track_height;
+       }
+
+       _editor->_routes->resume_redisplay ();
+       
+        set_editor_y (y.first);
+}
+
+void
+EditorSummary::playhead_position_changed (framepos_t p)
+{
+       if (_session && int (p * _x_scale) != int (_last_playhead)) {
+               set_overlays_dirty ();
+       }
+}
+
+double
+EditorSummary::summary_y_to_editor (double y) const
+{
+       double ey = 0;
+       for (TrackViewList::const_iterator i = _editor->track_views.begin (); i != _editor->track_views.end(); ++i) {
                
-               if (ev->direction == GDK_SCROLL_DOWN) {
-                       y += 16;
-               } else {
-                       y -= 16;
+               if ((*i)->hidden()) {
+                       continue;
                }
                
+               double const h = (*i)->effective_height ();
+               if (y < _track_height) {
+                       /* in this track */
+                       return ey + y * h / _track_height;
+               }
+
+               ey += h;
+               y -= _track_height;
+       }
+
+       return ey;
+}
+
+double
+EditorSummary::editor_y_to_summary (double y) const
+{
+       double sy = 0;
+       for (TrackViewList::const_iterator i = _editor->track_views.begin (); i != _editor->track_views.end(); ++i) {
                
-               _editor->reset_y_origin (y / _y_scale);
+               if ((*i)->hidden()) {
+                       continue;
+               }
+
+               double const h = (*i)->effective_height ();
+               if (y < h) {
+                       /* in this track */
+                       return sy + y * _track_height / h;
+               }
+
+               sy += _track_height;
+               y -= h;
        }
-       
-       return true;
+
+       return sy;
 }