clear_history -> clear_changes and some comments.
[ardour.git] / gtk2_ardour / midi_region_view.cc
index 361b020b18ebe1d0665fb93272b6f8e99a126908..6aa83acf1140b5b2642d75e97ee47b6f9fd8f83c 100644 (file)
 
 #include <sigc++/signal.h>
 
+#include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
+
 #include "ardour/playlist.h"
 #include "ardour/tempo.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
-#include "ardour/midi_diskstream.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_patch_manager.h"
+#include "ardour/session.h"
 
 #include "evoral/Parameter.hpp"
+#include "evoral/MIDIParameters.hpp"
 #include "evoral/Control.hpp"
+#include "evoral/midi_util.h"
 
-#include "streamview.h"
-#include "midi_region_view.h"
-#include "midi_streamview.h"
-#include "midi_time_axis.h"
-#include "simpleline.h"
+#include "automation_region_view.h"
+#include "automation_time_axis.h"
 #include "canvas-hit.h"
 #include "canvas-note.h"
 #include "canvas-program-change.h"
-#include "public_editor.h"
 #include "ghostregion.h"
-#include "midi_time_axis.h"
-#include "automation_time_axis.h"
-#include "automation_region_view.h"
-#include "utils.h"
-#include "midi_util.h"
 #include "gui_thread.h"
 #include "keyboard.h"
+#include "midi_cut_buffer.h"
+#include "midi_list_editor.h"
+#include "midi_region_view.h"
+#include "midi_streamview.h"
+#include "midi_time_axis.h"
+#include "midi_time_axis.h"
+#include "midi_util.h"
+#include "public_editor.h"
+#include "rgb_macros.h"
+#include "selection.h"
+#include "simpleline.h"
+#include "streamview.h"
+#include "utils.h"
 
 #include "i18n.h"
 
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
 using namespace ArdourCanvas;
+using Gtkmm2ext::Keyboard;
 
-MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisViewPtr tv,
+MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
                boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color const & basic_color)
        : RegionView (parent, tv, r, spu, basic_color)
        , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _default_note_length(1.0)
        , _current_range_min(0)
        , _current_range_max(0)
        , _model_name(string())
        , _custom_device_mode(string())
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*parent))
-       , _delta_command(NULL)
+       , _diff_command(0)
+       , _ghost_note(0)
+        , _drag_rect (0)
+        , _step_edit_cursor (0)
+        , _step_edit_cursor_width (1.0)
+        , _step_edit_cursor_position (0.0)
        , _mouse_state(None)
        , _pressed_button(0)
+       , _sort_needed (true)
+       , _optimization_iterator (_events.end())
+       , _list_editor (0)
+       , no_sound_notes (false)
 {
        _note_group->raise_to_top();
+        PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
 }
 
-MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisViewPtr tv,
+MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
                boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color,
                TimeAxisViewItem::Visibility visibility)
        : RegionView (parent, tv, r, spu, basic_color, false, visibility)
        , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _default_note_length(1.0)
        , _model_name(string())
        , _custom_device_mode(string())
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*parent))
-       , _delta_command(NULL)
+       , _diff_command(0)
+       , _ghost_note(0)
+        , _drag_rect (0)
        , _mouse_state(None)
        , _pressed_button(0)
-       
+       , _sort_needed (true)
+       , _optimization_iterator (_events.end())
+       , _list_editor (0)
+       , no_sound_notes (false)
 {
        _note_group->raise_to_top();
+        PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
 }
 
-
 MidiRegionView::MidiRegionView (const MidiRegionView& other)
        : sigc::trackable(other)
        , RegionView (other)
        , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _default_note_length(1.0)
        , _model_name(string())
        , _custom_device_mode(string())
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*get_canvas_group()))
-       , _delta_command(NULL)
+       , _diff_command(0)
+       , _ghost_note(0)
+        , _drag_rect (0)
        , _mouse_state(None)
        , _pressed_button(0)
+       , _sort_needed (true)
+       , _optimization_iterator (_events.end())
+       , _list_editor (0)
+       , no_sound_notes (false)
 {
        Gdk::Color c;
        int r,g,b,a;
 
        UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a);
        c.set_rgb_p (r/255.0, g/255.0, b/255.0);
-       
+
        init (c, false);
 }
 
@@ -131,14 +158,19 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<M
        : RegionView (other, boost::shared_ptr<Region> (region))
        , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _default_note_length(1.0)
        , _model_name(string())
        , _custom_device_mode(string())
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*get_canvas_group()))
-       , _delta_command(NULL)
+       , _diff_command(0)
+       , _ghost_note(0)
+        , _drag_rect (0)
        , _mouse_state(None)
        , _pressed_button(0)
+       , _sort_needed (true)
+       , _optimization_iterator (_events.end())
+       , _list_editor (0)
+       , no_sound_notes (false)
 {
        Gdk::Color c;
        int r,g,b,a;
@@ -152,6 +184,12 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<M
 void
 MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
 {
+        PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
+
+        CanvasNoteEvent::CanvasNoteEventDeleted.connect (note_delete_connection, MISSING_INVALIDATOR, 
+                                                         ui_bind (&MidiRegionView::maybe_remove_deleted_note_from_selection, this, _1),
+                                                         gui_context());
+
        if (wfd) {
                midi_region()->midi_source(0)->load_model();
        }
@@ -163,13 +201,13 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
        compute_colors (basic_color);
 
-       set_height (trackview->current_height());
+       set_height (trackview.current_height());
 
        region_muted ();
        region_sync_changed ();
-       region_resized (BoundsChanged);
+       region_resized (ARDOUR::bounds_change);
        region_locked ();
-       
+
        reset_width_dependent_items (_pixel_width);
 
        set_colors ();
@@ -177,240 +215,443 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
        _enable_display = true;
        if (_model) {
                if (wfd) {
-                       redisplay_model();
+                       display_model (_model);
                }
-               _model->ContentsChanged.connect(sigc::mem_fun(this, &MidiRegionView::redisplay_model));
        }
 
        group->raise_to_top();
-       group->signal_event().connect (mem_fun (this, &MidiRegionView::canvas_event), false);
+       group->signal_event().connect (sigc::mem_fun (this, &MidiRegionView::canvas_event), false);
 
        midi_view()->signal_channel_mode_changed().connect(
-                       mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
-       
+                       sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
+
        midi_view()->signal_midi_patch_settings_changed().connect(
-                       mem_fun(this, &MidiRegionView::midi_patch_settings_changed));
+                       sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed));
+
+       trackview.editor().SnapChanged.connect (snap_changed_connection, invalidator (*this), ui_bind (&MidiRegionView::snap_changed, this), gui_context ());
 }
 
 bool
 MidiRegionView::canvas_event(GdkEvent* ev)
 {
-       static double drag_start_x, drag_start_y;
-       static double last_x, last_y;
-       double event_x, event_y;
-       nframes64_t event_frame = 0;
-
-       static ArdourCanvas::SimpleRect* drag_rect = NULL;
-
-       if (trackview->editor().current_mouse_mode() != MouseNote)
+       if (!trackview.editor().internal_editing()) {
                return false;
-       
-       const Editing::MidiEditMode midi_edit_mode = trackview->editor().current_midi_edit_mode();
+       }
+
+       /* XXX: note that until version 2.30, the GnomeCanvas did not propagate scroll events
+          to its items, which means that ev->type == GDK_SCROLL will never be seen
+       */
 
        switch (ev->type) {
+       case GDK_SCROLL:
+                return scroll (&ev->scroll);
+
        case GDK_KEY_PRESS:
-               if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) {
-                       _mouse_state = SelectTouchDragging;
-                       return true;
-               } else if (ev->key.keyval == GDK_Escape) {
-                       clear_selection();
-                       _mouse_state = None;
-               }
-               return false;
+                return key_press (&ev->key);
 
        case GDK_KEY_RELEASE:
-               if (ev->key.keyval == GDK_Delete) {
-                       delete_selection();
-                       apply_command();
-                       return true;
-               } else if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) {
-                       _mouse_state = None;
-                       return true;
-               }
-               return false;
+                return key_release (&ev->key);
 
        case GDK_BUTTON_PRESS:
-               if (_mouse_state != SelectTouchDragging && ev->button.button == 1) {
-                       _pressed_button = ev->button.button;
-                       _mouse_state = Pressed;
-                       return true;
-               }
-               _pressed_button = ev->button.button;
-               return true;
+                return button_press (&ev->button);
 
        case GDK_2BUTTON_PRESS:
                return true;
 
+       case GDK_BUTTON_RELEASE:
+                return button_release (&ev->button);
+               
        case GDK_ENTER_NOTIFY:
-               /* FIXME: do this on switch to note tool, too, if the pointer is already in */
-               Keyboard::magic_widget_grab_focus();
-               group->grab_focus();
-               break;
+                return enter_notify (&ev->crossing);
+
+       case GDK_LEAVE_NOTIFY:
+                return leave_notify (&ev->crossing);
 
        case GDK_MOTION_NOTIFY:
-               event_x = ev->motion.x;
-               event_y = ev->motion.y;
-               group->w2i(event_x, event_y);
-
-               // convert event_x to global frame
-               event_frame = trackview->editor().pixel_to_frame(event_x) + _region->position();
-               trackview->editor().snap_to(event_frame);
-               // convert event_frame back to local coordinates relative to position
-               event_frame -= _region->position();
-
-               switch (_mouse_state) {
-               case Pressed: // Drag start
-
-                       // Select drag start
-                       if (_pressed_button == 1 && midi_edit_mode == MidiEditSelect) {
-                               group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
-                                               Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
-                               last_x = event_x;
-                               last_y = event_y;
-                               drag_start_x = event_x;
-                               drag_start_y = event_y;
-
-                               drag_rect = new ArdourCanvas::SimpleRect(*group);
-                               drag_rect->property_x1() = event_x;
-                               drag_rect->property_y1() = event_y;
-                               drag_rect->property_x2() = event_x;
-                               drag_rect->property_y2() = event_y;
-                               drag_rect->property_outline_what() = 0xFF;
-                               drag_rect->property_outline_color_rgba()
-                                       = ARDOUR_UI::config()->canvasvar_MidiSelectRectOutline.get();
-                               drag_rect->property_fill_color_rgba()
-                                       = ARDOUR_UI::config()->canvasvar_MidiSelectRectFill.get();
-
-                               _mouse_state = SelectRectDragging;
-                               return true;
+                return motion (&ev->motion);
 
-                       // Add note drag start
-                       } else if (midi_edit_mode == MidiEditPencil) {
-                               group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
-                                               Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
-                               last_x = event_x;
-                               last_y = event_y;
-                               drag_start_x = event_x;
-                               drag_start_y = event_y;
-
-                               drag_rect = new ArdourCanvas::SimpleRect(*group);
-                               drag_rect->property_x1() = trackview->editor().frame_to_pixel(event_frame);
-
-                               drag_rect->property_y1() = midi_stream_view()->note_to_y(
-                                               midi_stream_view()->y_to_note(event_y));
-                               drag_rect->property_x2() = event_x;
-                               drag_rect->property_y2() = drag_rect->property_y1()
-                                                        + floor(midi_stream_view()->note_height());
-                               drag_rect->property_outline_what() = 0xFF;
-                               drag_rect->property_outline_color_rgba() = 0xFFFFFF99;
-                               drag_rect->property_fill_color_rgba()    = 0xFFFFFF66;
-
-                               _mouse_state = AddDragging;
-                               return true;
-                       }
+       default: 
+                break;
+       }
 
-                       return false;
-
-               case SelectRectDragging: // Select drag motion
-               case AddDragging: // Add note drag motion
-                       if (ev->motion.is_hint) {
-                               int t_x;
-                               int t_y;
-                               GdkModifierType state;
-                               gdk_window_get_pointer(ev->motion.window, &t_x, &t_y, &state);
-                               event_x = t_x;
-                               event_y = t_y;
-                       }
+       return false;
+}
 
-                       if (_mouse_state == AddDragging)
-                               event_x = trackview->editor().frame_to_pixel(event_frame);
+bool
+MidiRegionView::enter_notify (GdkEventCrossing* ev)
+{
+        /* FIXME: do this on switch to note tool, too, if the pointer is already in */
 
-                       if (drag_rect) {
-                               if (event_x > drag_start_x)
-                                       drag_rect->property_x2() = event_x;
-                               else
-                                       drag_rect->property_x1() = event_x;
-                       }
+        Keyboard::magic_widget_grab_focus();
+        group->grab_focus();
+        
+        if (trackview.editor().current_mouse_mode() == MouseRange) {
+                create_ghost_note (ev->x, ev->y);
+        }
+
+        return false;
+}
 
-                       if (drag_rect && _mouse_state == SelectRectDragging) {
-                               if (event_y > drag_start_y)
-                                       drag_rect->property_y2() = event_y;
-                               else
-                                       drag_rect->property_y1() = event_y;
+bool
+MidiRegionView::leave_notify (GdkEventCrossing* ev)
+{
+        trackview.editor().hide_verbose_canvas_cursor ();
+        delete _ghost_note;
+        _ghost_note = 0;
+        return false;
+}
 
-                               update_drag_selection(drag_start_x, event_x, drag_start_y, event_y);
-                       }
+bool
+MidiRegionView::button_press (GdkEventButton* ev)
+{
+        _last_x = ev->x;
+        _last_y = ev->y;
+        group->w2i (_last_x, _last_y);
+        
+        if (_mouse_state != SelectTouchDragging && ev->button == 1) {
+                _pressed_button = ev->button;
+                _mouse_state = Pressed;
+                return true;
+        }
+        
+        _pressed_button = ev->button;
+
+        return true;
+}
 
-                       last_x = event_x;
-                       last_y = event_y;
+bool
+MidiRegionView::button_release (GdkEventButton* ev)
+{
+       double event_x, event_y;
+       nframes64_t event_frame = 0;
 
-               case SelectTouchDragging:
-                       return false;
+        event_x = ev->x;
+        event_y = ev->y;
+        group->w2i(event_x, event_y);
+        group->ungrab(ev->time);
+        event_frame = trackview.editor().pixel_to_frame(event_x);
+
+        if (ev->button == 3) {
+                return false;
+        } else if (_pressed_button != 1) {
+                return false;
+        }
+
+        switch (_mouse_state) {
+        case Pressed: // Clicked
+                switch (trackview.editor().current_mouse_mode()) {
+                case MouseObject:
+                case MouseTimeFX:
+                        clear_selection();
+                        maybe_select_by_position (ev, event_x, event_y);
+                        break;
+
+                case MouseRange:
+                {
+                        bool success;
+                        Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x));
+                        if (!success) {
+                                beats = 1;
+                        }
+                        create_note_at (event_x, event_y, beats, true);
+                        break;
+                }
+                default:
+                        break;
+                }
+                _mouse_state = None;
+                break;
+        case SelectRectDragging: // Select drag done
+                _mouse_state = None;
+                delete _drag_rect;
+                _drag_rect = 0;
+                break;
+
+        case AddDragging: // Add drag done
+                _mouse_state = None;
+                if (_drag_rect->property_x2() > _drag_rect->property_x1() + 2) {
+                        const double x      = _drag_rect->property_x1();
+                        const double length = trackview.editor().pixel_to_frame 
+                                (_drag_rect->property_x2() - _drag_rect->property_x1());
+
+                        create_note_at (x, _drag_rect->property_y1(), frames_to_beats(length), false);
+                }
+
+                delete _drag_rect;
+                _drag_rect = 0;
+
+                create_ghost_note (ev->x, ev->y);
+
+        default:
+                break;
+        }
+
+        return false;
+}
 
-               default:
-                       break;
-               }
-               break;
+bool
+MidiRegionView::motion (GdkEventMotion* ev)
+{
+       double event_x, event_y;
+       nframes64_t event_frame = 0;
 
-       case GDK_BUTTON_RELEASE:
-               event_x = ev->motion.x;
-               event_y = ev->motion.y;
-               group->w2i(event_x, event_y);
-               group->ungrab(ev->button.time);
-               event_frame = trackview->editor().pixel_to_frame(event_x);
-
-               if (_pressed_button != 1) {
-                       return false;
-               }
-                       
-               switch (_mouse_state) {
-               case Pressed: // Clicked
-                       switch (midi_edit_mode) {
-                       case MidiEditSelect:
-                       case MidiEditResize:
-                               clear_selection();
-                               break;
-                       case MidiEditPencil:
-                               create_note_at(event_x, event_y, _default_note_length);
-                       default: break;
-                       }
-                       _mouse_state = None;
-                       break;
-               case SelectRectDragging: // Select drag done
-                       _mouse_state = None;
-                       delete drag_rect;
-                       drag_rect = NULL;
-                       break;
-               case AddDragging: // Add drag done
-                       _mouse_state = None;
-                       if (drag_rect->property_x2() > drag_rect->property_x1() + 2) {
-                               const double x      = drag_rect->property_x1();
-                               const double length = trackview->editor().pixel_to_frame(
-                                                       drag_rect->property_x2() - drag_rect->property_x1());
-                                       
-                               create_note_at(x, drag_rect->property_y1(), frames_to_beats(length));
-                       }
+        event_x = ev->x;
+        event_y = ev->y;
+        group->w2i(event_x, event_y);
 
-                       delete drag_rect;
-                       drag_rect = NULL;
-               default: break;
-               }
+        // convert event_x to global frame
+        event_frame = trackview.editor().pixel_to_frame(event_x) + _region->position();
+        trackview.editor().snap_to(event_frame);
+        // convert event_frame back to local coordinates relative to position
+        event_frame -= _region->position();
 
-       default: break;
-       }
+        if (_ghost_note) {
+                update_ghost_note (ev->x, ev->y);
+        }
 
-       return false;
+        /* any motion immediately hides velocity text that may have been visible */
+               
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               (*i)->hide_velocity ();
+       }
+
+        switch (_mouse_state) {
+        case Pressed: // Maybe start a drag, if we've moved a bit
+
+                if (fabs (event_x - _last_x) < 1 && fabs (event_y - _last_y) < 1) {
+                        /* no appreciable movement since the button was pressed */
+                        return false;
+                }
+
+                // Select drag start
+                if (_pressed_button == 1 && trackview.editor().current_mouse_mode() == MouseObject) {
+                        group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
+                                    Gdk::Cursor(Gdk::FLEUR), ev->time);
+                        _last_x = event_x;
+                        _last_y = event_y;
+                        _drag_start_x = event_x;
+                        _drag_start_y = event_y;
+
+                        _drag_rect = new ArdourCanvas::SimpleRect(*group);
+                        _drag_rect->property_x1() = event_x;
+                        _drag_rect->property_y1() = event_y;
+                        _drag_rect->property_x2() = event_x;
+                        _drag_rect->property_y2() = event_y;
+                        _drag_rect->property_outline_what() = 0xFF;
+                        _drag_rect->property_outline_color_rgba()
+                                = ARDOUR_UI::config()->canvasvar_MidiSelectRectOutline.get();
+                        _drag_rect->property_fill_color_rgba()
+                                = ARDOUR_UI::config()->canvasvar_MidiSelectRectFill.get();
+
+                        _mouse_state = SelectRectDragging;
+                        return true;
+
+                       // Add note drag start
+                } else if (trackview.editor().internal_editing()) {
+
+                        delete _ghost_note;
+                        _ghost_note = 0;
+                               
+                        group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
+                                    Gdk::Cursor(Gdk::FLEUR), ev->time);
+                        _last_x = event_x;
+                        _last_y = event_y;
+                        _drag_start_x = event_x;
+                        _drag_start_y = event_y;
+
+                        _drag_rect = new ArdourCanvas::SimpleRect(*group);
+                        _drag_rect->property_x1() = trackview.editor().frame_to_pixel(event_frame);
+
+                        _drag_rect->property_y1() = midi_stream_view()->note_to_y(
+                                midi_stream_view()->y_to_note(event_y));
+                        _drag_rect->property_x2() = trackview.editor().frame_to_pixel(event_frame);
+                        _drag_rect->property_y2() = _drag_rect->property_y1()
+                                + floor(midi_stream_view()->note_height());
+                        _drag_rect->property_outline_what() = 0xFF;
+                        _drag_rect->property_outline_color_rgba() = 0xFFFFFF99;
+                        _drag_rect->property_fill_color_rgba()    = 0xFFFFFF66;
+
+                        _mouse_state = AddDragging;
+                        return true;
+                }
+
+                return false;
+
+        case SelectRectDragging: // Select drag motion
+        case AddDragging: // Add note drag motion
+                if (ev->is_hint) {
+                        int t_x;
+                        int t_y;
+                        GdkModifierType state;
+                        gdk_window_get_pointer(ev->window, &t_x, &t_y, &state);
+                        event_x = t_x;
+                        event_y = t_y;
+                }
+
+                if (_mouse_state == AddDragging)
+                        event_x = trackview.editor().frame_to_pixel(event_frame);
+
+                if (_drag_rect) {
+                        if (event_x > _drag_start_x)
+                                _drag_rect->property_x2() = event_x;
+                        else
+                                _drag_rect->property_x1() = event_x;
+                }
+
+                if (_drag_rect && _mouse_state == SelectRectDragging) {
+                        if (event_y > _drag_start_y)
+                                _drag_rect->property_y2() = event_y;
+                        else
+                                _drag_rect->property_y1() = event_y;
+
+                        update_drag_selection(_drag_start_x, event_x, _drag_start_y, event_y);
+                }
+
+                _last_x = event_x;
+                _last_y = event_y;
+
+        case SelectTouchDragging:
+                return false;
+
+        default:
+                break;
+        }
+
+        return false;
+}
+
+
+bool
+MidiRegionView::scroll (GdkEventScroll* ev)
+{
+        if (_selection.empty()) {
+                return false;
+        }
+
+       trackview.editor().hide_verbose_canvas_cursor ();
+
+        bool fine = !Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier);
+        
+        if (ev->direction == GDK_SCROLL_UP) {
+                change_velocities (true, fine, false);
+        } else if (ev->direction == GDK_SCROLL_DOWN) {
+                change_velocities (false, fine, false);
+        } 
+        return true;
+}
+
+bool
+MidiRegionView::key_press (GdkEventKey* ev)
+{ 
+        /* since GTK bindings are generally activated on press, and since
+           detectable auto-repeat is the name of the game and only sends
+           repeated presses, carry out key actions at key press, not release.
+        */
+        
+        if (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R){
+                _mouse_state = SelectTouchDragging;
+                return true;
+                
+        } else if (ev->keyval == GDK_Escape) {
+                clear_selection();
+                _mouse_state = None;
+                
+        } else if (ev->keyval == GDK_comma || ev->keyval == GDK_period) {
+                
+                bool start = (ev->keyval == GDK_comma);
+                bool end = (ev->keyval == GDK_period);
+                bool shorter = Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier);
+                bool fine = Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+                
+                change_note_lengths (fine, shorter, 0.0, start, end);
+                
+                return true;
+                
+        } else if (ev->keyval == GDK_Delete) {
+                
+                delete_selection();
+                return true;
+                
+        } else if (ev->keyval == GDK_Tab) {
+                
+                if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                        goto_previous_note ();
+                } else {
+                        goto_next_note ();
+                }
+                return true;
+                
+        } else if (ev->keyval == GDK_Up) {
+                
+                bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
+                bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+                
+                if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+                        change_velocities (true, fine, allow_smush);
+                } else {
+                        transpose (true, fine, allow_smush);
+                }
+                return true;
+                
+        } else if (ev->keyval == GDK_Down) {
+                
+                bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
+                bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+                
+                if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+                        change_velocities (false, fine, allow_smush);
+                } else {
+                        transpose (false, fine, allow_smush);
+                }
+                return true;
+                
+        } else if (ev->keyval == GDK_Left) {
+                
+                nudge_notes (false);
+                return true;
+                
+        } else if (ev->keyval == GDK_Right) {
+                
+                nudge_notes (true);
+                return true;
+                
+        } else if (ev->keyval == GDK_Control_L) {
+                return true;
+
+        }
+        
+        return false;
+}
+
+bool
+MidiRegionView::key_release (GdkEventKey* ev)
+{
+        if (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R) {
+                _mouse_state = None;
+                return true;
+        }
+        return false;
 }
 
+void
+MidiRegionView::show_list_editor ()
+{
+       if (!_list_editor) {
+               _list_editor = new MidiListEditor (trackview.session(), midi_region());
+       }
+       _list_editor->present ();
+}
 
 /** Add a note to the model, and the view, at a canvas (click) coordinate.
  * \param x horizontal position in pixels
  * \param y vertical position in pixels
- * \param length duration of the note in beats */
+ * \param length duration of the note in beats, which will be snapped to the grid
+ * \param sh true to make the note 1 frame shorter than the snapped version of \a length.
+ */
 void
-MidiRegionView::create_note_at(double x, double y, double length)
+MidiRegionView::create_note_at(double x, double y, double length, bool sh)
 {
-       MidiTimeAxisViewPtr mtv = boost::dynamic_pointer_cast<MidiTimeAxisView> (trackview);
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
        MidiStreamView* const view = mtv->midi_view();
 
        double note = midi_stream_view()->y_to_note(y);
@@ -419,24 +660,54 @@ MidiRegionView::create_note_at(double x, double y, double length)
        assert(note <= 127.0);
 
        // Start of note in frames relative to region start
-       nframes64_t start_frames = snap_frame_to_frame(trackview->editor().pixel_to_frame(x));
+       nframes64_t const start_frames = snap_frame_to_frame(trackview.editor().pixel_to_frame(x));
        assert(start_frames >= 0);
 
        // Snap length
        length = frames_to_beats(
                        snap_frame_to_frame(start_frames + beats_to_frames(length)) - start_frames);
 
-       const boost::shared_ptr<NoteType> new_note(new NoteType(0,
-                       frames_to_beats(start_frames + _region->start()), length,
-                       (uint8_t)note, 0x40));
+       assert (length != 0);
+
+       if (sh) {
+               length = frames_to_beats (beats_to_frames (length) - 1);
+       }
+
+       uint16_t chn_mask = mtv->channel_selector().get_selected_channels();
+        int chn_cnt = 0;
+        uint8_t channel = 0;
+
+        /* pick the highest selected channel, unless all channels are selected,
+           which is interpreted to mean channel 1 (zero)
+        */
+
+        for (uint16_t i = 0; i < 16; ++i) {
+                if (chn_mask & (1<<i)) {
+                        channel = i;
+                        chn_cnt++;
+                }
+        }
+
+        if (chn_cnt == 16) {
+                channel = 0;
+        }
+
+       const boost::shared_ptr<NoteType> new_note (new NoteType (channel,
+                                                                  frames_to_beats(start_frames + _region->start()), length,
+                                                                  (uint8_t)note, 0x40));
+
+        if (_model->contains (new_note)) {
+                return;
+        }
 
        view->update_note_range(new_note->note());
 
-       MidiModel::DeltaCommand* cmd = _model->new_delta_command("add note");
+       MidiModel::DiffCommand* cmd = _model->new_diff_command("add note");
        cmd->add(new_note);
-       _model->apply_command(trackview->session(), cmd);
-}
+       _model->apply_command(*trackview.session(), cmd);
 
+       play_midi_note (new_note);
+}
 
 void
 MidiRegionView::clear_events()
@@ -457,6 +728,7 @@ MidiRegionView::clear_events()
        _events.clear();
        _pgm_changes.clear();
        _sys_exes.clear();
+       _optimization_iterator = _events.end();
 }
 
 
@@ -464,25 +736,29 @@ void
 MidiRegionView::display_model(boost::shared_ptr<MidiModel> model)
 {
        _model = model;
+       content_connection.disconnect ();
+       _model->ContentsChanged.connect (content_connection, invalidator (*this), boost::bind (&MidiRegionView::redisplay_model, this), gui_context());
+
+       clear_events ();
+
        if (_enable_display) {
                redisplay_model();
        }
 }
-       
-       
+
 void
-MidiRegionView::start_delta_command(string name)
+MidiRegionView::start_diff_command(string name)
 {
-       if (!_delta_command) {
-               _delta_command = _model->new_delta_command(name);
+       if (!_diff_command) {
+               _diff_command = _model->new_diff_command(name);
        }
 }
 
 void
-MidiRegionView::command_add_note(const boost::shared_ptr<NoteType> note, bool selected, bool show_velocity)
+MidiRegionView::diff_add_note(const boost::shared_ptr<NoteType> note, bool selected, bool show_velocity)
 {
-       if (_delta_command) {
-               _delta_command->add(note);
+       if (_diff_command) {
+               _diff_command->add(note);
        }
        if (selected) {
                _marked_for_selection.insert(note);
@@ -493,42 +769,128 @@ MidiRegionView::command_add_note(const boost::shared_ptr<NoteType> note, bool se
 }
 
 void
-MidiRegionView::command_remove_note(ArdourCanvas::CanvasNoteEvent* ev)
+MidiRegionView::diff_remove_note(ArdourCanvas::CanvasNoteEvent* ev)
 {
-       if (_delta_command && ev->note()) {
-               _delta_command->remove(ev->note());
+       if (_diff_command && ev->note()) {
+               _diff_command->remove(ev->note());
        }
 }
-       
+
+void
+MidiRegionView::diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
+                                MidiModel::DiffCommand::Property property,
+                                uint8_t val)
+{
+       if (_diff_command) {
+               _diff_command->change (ev->note(), property, val);
+       }
+}
+
+void
+MidiRegionView::diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
+                                MidiModel::DiffCommand::Property property,
+                                Evoral::MusicalTime val)
+{
+       if (_diff_command) {
+               _diff_command->change (ev->note(), property, val);
+       }
+}
+
 void
-MidiRegionView::apply_command()
+MidiRegionView::apply_diff ()
 {
-       if (!_delta_command) {
+        bool add_or_remove;
+
+       if (!_diff_command) {
                return;
        }
 
-       // Mark all selected notes for selection when model reloads
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               _marked_for_selection.insert((*i)->note());
+        if ((add_or_remove = _diff_command->adds_or_removes())) {
+                // Mark all selected notes for selection when model reloads
+                for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                        _marked_for_selection.insert((*i)->note());
+                }
+        }
+
+       _model->apply_command(*trackview.session(), _diff_command);
+       _diff_command = 0;
+       midi_view()->midi_track()->playlist_modified();
+        
+        if (add_or_remove) {
+               _marked_for_selection.clear();
+        }
+
+       _marked_for_velocity.clear();
+}
+
+void
+MidiRegionView::apply_diff_as_subcommand()
+{
+        bool add_or_remove;
+
+       if (!_diff_command) {
+               return;
        }
-       
-       _model->apply_command(trackview->session(), _delta_command);
-       _delta_command = NULL; 
-       midi_view()->midi_track()->diskstream()->playlist_modified();
 
-       _marked_for_selection.clear();
+        if ((add_or_remove = _diff_command->adds_or_removes())) {
+                // Mark all selected notes for selection when model reloads
+                for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                        _marked_for_selection.insert((*i)->note());
+                }
+        }
+
+       _model->apply_command_as_subcommand(*trackview.session(), _diff_command);
+       _diff_command = 0;
+       midi_view()->midi_track()->playlist_modified();
+
+        if (add_or_remove) {
+                _marked_for_selection.clear();
+        }
        _marked_for_velocity.clear();
 }
-       
+
 
 void
 MidiRegionView::abort_command()
 {
-       delete _delta_command;
-       _delta_command = NULL;
+       delete _diff_command;
+       _diff_command = 0;
        clear_selection();
 }
 
+CanvasNoteEvent*
+MidiRegionView::find_canvas_note (boost::shared_ptr<NoteType> note)
+{
+       if (_optimization_iterator != _events.end()) {
+               ++_optimization_iterator;
+       }
+
+       if (_optimization_iterator != _events.end() && (*_optimization_iterator)->note() == note) {
+               return *_optimization_iterator;
+       }
+
+       for (_optimization_iterator = _events.begin(); _optimization_iterator != _events.end(); ++_optimization_iterator) {
+               if ((*_optimization_iterator)->note() == note) {
+                       return *_optimization_iterator;
+               }
+       }
+
+       return 0;
+}
+
+void
+MidiRegionView::get_events (Events& e, Evoral::Sequence<Evoral::MusicalTime>::NoteOperator op, uint8_t val, int chan_mask)
+{
+        MidiModel::Notes notes;
+        _model->get_notes (notes, op, val, chan_mask);
+
+        for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+                CanvasNoteEvent* cne = find_canvas_note (*n);
+                if (cne) {
+                        e.push_back (cne);
+                }
+        }
+}
 
 void
 MidiRegionView::redisplay_model()
@@ -538,39 +900,115 @@ MidiRegionView::redisplay_model()
                return;
        }
 
-       if (_model) {
-               clear_events();
-               _model->read_lock();
-               
-               MidiModel::Notes notes = _model->notes();
-               
-               for (size_t i = 0; i < _model->n_notes(); ++i) {
-                       add_note(_model->note_at(i));
+       if (!_model) {
+               cerr << "MidiRegionView::redisplay_model called without a model" << endmsg;
+               return;
+       }
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               (*i)->invalidate ();
+       }
+
+       MidiModel::ReadLock lock(_model->read_lock());
+
+       MidiModel::Notes& notes (_model->notes());
+       _optimization_iterator = _events.begin();
+
+       for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+
+               boost::shared_ptr<NoteType> note (*n);
+               CanvasNoteEvent* cne;
+               bool visible;
+
+               if (note_in_region_range (note, visible)) {
+
+                       if ((cne = find_canvas_note (note)) != 0) {
+
+                               cne->validate ();
+
+                               CanvasNote* cn;
+                               CanvasHit* ch;
+
+                               if ((cn = dynamic_cast<CanvasNote*>(cne)) != 0) {
+                                       update_note (cn);
+                               } else if ((ch = dynamic_cast<CanvasHit*>(cne)) != 0) {
+                                       update_hit (ch);
+                               }
+
+                               if (visible) {
+                                       cne->show ();
+                               } else {
+                                       cne->hide ();
+                               }
+
+                       } else {
+
+                               add_note (note, visible);
+                       }
+
+               } else {
+
+                       if ((cne = find_canvas_note (note)) != 0) {
+                               cne->validate ();
+                               cne->hide ();
+                       }
                }
-               
-               display_sysexes();
+       }
 
-               display_program_changes();
 
-               _model->read_unlock();
+       /* remove note items that are no longer valid */
 
-       } else {
-               cerr << "MidiRegionView::redisplay_model called without a model" << endmsg;
+       for (Events::iterator i = _events.begin(); i != _events.end(); ) {
+               if (!(*i)->valid ()) {
+                       delete *i;
+                       i = _events.erase (i);
+               } else {
+                       ++i;
+               }
        }
+
+       _pgm_changes.clear();
+       _sys_exes.clear();
+       
+       display_sysexes();
+       display_program_changes();
+
+       _marked_for_selection.clear ();
+       _marked_for_velocity.clear ();
+
+       /* we may have caused _events to contain things out of order (e.g. if a note
+          moved earlier or later). we don't generally need them in time order, but
+          make a note that a sort is required for those cases that require it.
+       */
+
+       _sort_needed = true;
 }
 
 void
 MidiRegionView::display_program_changes()
 {
-       boost::shared_ptr<Evoral::Control> control = _model->control(MidiPgmChangeAutomation);
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+       uint16_t chn_mask = mtv->channel_selector().get_selected_channels();
+
+        for (uint8_t i = 0; i < 16; ++i) {
+                if (chn_mask & (1<<i)) {
+                        display_program_changes_on_channel (i);
+                }
+        }
+}
+
+void
+MidiRegionView::display_program_changes_on_channel(uint8_t channel)
+{
+       boost::shared_ptr<Evoral::Control> control = 
+                _model->control(Evoral::MIDI::ProgramChange (MidiPgmChangeAutomation, channel));
+
        if (!control) {
                return;
        }
 
        Glib::Mutex::Lock lock (control->list()->lock());
 
-       uint8_t channel = control->parameter().channel();
-
        for (AutomationList::const_iterator event = control->list()->begin();
                        event != control->list()->end(); ++event) {
                double event_time     = (*event)->when;
@@ -581,7 +1019,7 @@ MidiRegionView::display_program_changes()
                boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
                uint8_t msb = 0;
                if (msb_control != 0) {
-                       msb = uint8_t(floor(msb_control->get_float(true, event_time) + 0.5));
+                       msb = uint8_t(floor(msb_control->get_double(true, event_time) + 0.5));
                }
 
                // Get current value of bank select LSB at time of the program change
@@ -589,12 +1027,12 @@ MidiRegionView::display_program_changes()
                boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
                uint8_t lsb = 0;
                if (lsb_control != 0) {
-                       lsb = uint8_t(floor(lsb_control->get_float(true, event_time) + 0.5));
+                       lsb = uint8_t(floor(lsb_control->get_double(true, event_time) + 0.5));
                }
 
                MIDI::Name::PatchPrimaryKey patch_key(msb, lsb, program_number);
 
-               boost::shared_ptr<MIDI::Name::Patch> patch = 
+               boost::shared_ptr<MIDI::Name::Patch> patch =
                        MIDI::Name::MidiPatchManager::instance().find_patch(
                                        _model_name, _custom_device_mode, channel, patch_key);
 
@@ -604,19 +1042,20 @@ MidiRegionView::display_program_changes()
                        add_pgm_change(program_change, patch->name());
                } else {
                        char buf[4];
-                       snprintf(buf, 4, "%d", int(program_number));
+                        // program_number is zero-based: convert to one-based
+                       snprintf(buf, 4, "%d", int(program_number+1));
                        add_pgm_change(program_change, buf);
                }
        }
 }
 
-void 
+void
 MidiRegionView::display_sysexes()
 {
        for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) {
-               ARDOUR::MidiModel::TimeType time = (*i)->time();
+               Evoral::MusicalTime time = (*i)->time();
                assert(time >= 0);
-               
+
                ostringstream str;
                str << hex;
                for (uint32_t b = 0; b < (*i)->size(); ++b) {
@@ -626,22 +1065,23 @@ MidiRegionView::display_sysexes()
                        }
                }
                string text = str.str();
-               
+
                ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
-               const double x = trackview->editor().frame_to_pixel(beats_to_frames(time));
-               
+
+               const double x = trackview.editor().frame_to_pixel(beats_to_frames(time));
+
                double height = midi_stream_view()->contents_height();
-               
+
                boost::shared_ptr<CanvasSysEx> sysex = boost::shared_ptr<CanvasSysEx>(
                                new CanvasSysEx(*this, *group, text, height, x, 1.0));
-               
+
                // Show unless program change is beyond the region bounds
                if (time - _region->start() >= _region->length() || time < _region->start()) {
                        sysex->hide();
                } else {
                        sysex->show();
                }
-               
+
                _sys_exes.push_back(sysex);
        }
 }
@@ -651,6 +1091,12 @@ MidiRegionView::~MidiRegionView ()
 {
        in_destructor = true;
 
+       trackview.editor().hide_verbose_canvas_cursor ();
+
+        note_delete_connection.disconnect ();
+
+       delete _list_editor;
+
        RegionViewGoingAway (this); /* EMIT_SIGNAL */
 
        if (_active_notes) {
@@ -659,22 +1105,23 @@ MidiRegionView::~MidiRegionView ()
 
        _selection.clear();
        clear_events();
+
        delete _note_group;
-       delete _delta_command;
+       delete _diff_command;
+        delete _step_edit_cursor;
 }
 
-
 void
-MidiRegionView::region_resized (Change what_changed)
+MidiRegionView::region_resized (const PropertyChange& what_changed)
 {
        RegionView::region_resized(what_changed);
-       
-       if (what_changed & ARDOUR::PositionChanged) {
+
+       if (what_changed.contains (ARDOUR::Properties::position)) {
                set_duration(_region->length(), 0);
                if (_enable_display) {
                        redisplay_model();
                }
-       } 
+       }
 }
 
 void
@@ -686,6 +1133,9 @@ MidiRegionView::reset_width_dependent_items (double pixel_width)
        if (_enable_display) {
                redisplay_model();
        }
+        
+        move_step_edit_cursor (_step_edit_cursor_position);
+        set_step_edit_cursor_width (_step_edit_cursor_width);
 }
 
 void
@@ -695,14 +1145,22 @@ MidiRegionView::set_height (double height)
        const double old_height = _height;
        RegionView::set_height(height);
        _height = height - FUDGE;
-       
+
        apply_note_range(midi_stream_view()->lowest_note(),
                         midi_stream_view()->highest_note(),
                         height != old_height + FUDGE);
-       
+
        if (name_pixbuf) {
                name_pixbuf->raise_to_top();
        }
+        
+        for (PgmChanges::iterator x = _pgm_changes.begin(); x != _pgm_changes.end(); ++x) {
+                (*x)->set_height (midi_stream_view()->contents_height());
+        }
+
+        if (_step_edit_cursor) {
+                _step_edit_cursor->property_y2() = midi_stream_view()->contents_height();
+        }
 }
 
 
@@ -719,55 +1177,51 @@ MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force)
        if (!force && _current_range_min == min && _current_range_max == max) {
                return;
        }
-       
+
        _current_range_min = min;
        _current_range_max = max;
 
        for (Events::const_iterator i = _events.begin(); i != _events.end(); ++i) {
                CanvasNoteEvent* event = *i;
-               Item* item = dynamic_cast<Item*>(event);
-               assert(item);
-               if (event && event->note()) {
-                       if (event->note()->note() < _current_range_min
-                                       || event->note()->note() > _current_range_max) {
-                               if (canvas_item_visible(item)) {
-                                       item->hide();
-                               }
-                       } else {
-                               if (!canvas_item_visible(item)) {
-                                       item->show();
-                               }
+               boost::shared_ptr<NoteType> note (event->note());
 
-                               if (CanvasNote* note = dynamic_cast<CanvasNote*>(event)) {
-                                       const double y1 = midi_stream_view()->note_to_y(event->note()->note());
-                                       const double y2 = y1 + floor(midi_stream_view()->note_height());
-
-                                       note->property_y1() = y1;
-                                       note->property_y2() = y2;
-                               } else if (CanvasHit* hit = dynamic_cast<CanvasHit*>(event)) {
-                                       double x = trackview->editor().frame_to_pixel(
-                                                       beats_to_frames(event->note()->time()) - _region->start());
-                                       const double diamond_size = midi_stream_view()->note_height() / 2.0;
-                                       double y = midi_stream_view()->note_to_y(event->note()->note()) 
-                                                        + ((diamond_size-2.0) / 4.0);
-                                       
-                                       hit->set_height(diamond_size);
-                                       hit->move(x-hit->x1(), y-hit->y1());
-                                       hit->show();
-                               }
-                       }
+               if (note->note() < _current_range_min ||
+                   note->note() > _current_range_max) {
+                       event->hide();
+               } else {
+                       event->show();
                }
-       }
-       
+
+               if (CanvasNote* cnote = dynamic_cast<CanvasNote*>(event)) {
+
+                       const double y1 = midi_stream_view()->note_to_y(note->note());
+                       const double y2 = y1 + floor(midi_stream_view()->note_height());
+
+                       cnote->property_y1() = y1;
+                       cnote->property_y2() = y2;
+
+               } else if (CanvasHit* chit = dynamic_cast<CanvasHit*>(event)) {
+
+                       double x = trackview.editor().frame_to_pixel(
+                               beats_to_frames(note->time()) - _region->start());
+                       const double diamond_size = midi_stream_view()->note_height() / 2.0;
+                       double y = midi_stream_view()->note_to_y(event->note()->note())
+                               + ((diamond_size-2.0) / 4.0);
+
+                       chit->set_height (diamond_size);
+                       chit->move (x - chit->x1(), y - chit->y1());
+                       chit->show ();
+               }
+       }
 }
 
 GhostRegion*
-MidiRegionView::add_ghost (TimeAxisViewPtr tv)
+MidiRegionView::add_ghost (TimeAxisView& tv)
 {
        CanvasNote* note;
 
        double unit_position = _region->position () / samples_per_unit;
-       MidiTimeAxisViewPtr mtv = boost::dynamic_pointer_cast<MidiTimeAxisView> (tv);
+       MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(&tv);
        MidiGhostRegion* ghost;
 
        if (mtv && mtv->midi_view()) {
@@ -789,7 +1243,7 @@ MidiRegionView::add_ghost (TimeAxisViewPtr tv)
                }
        }
 
-       ghost->GoingAway.connect (mem_fun(*this, &MidiRegionView::remove_ghost));
+       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
 
        return ghost;
 }
@@ -803,7 +1257,7 @@ MidiRegionView::begin_write()
        assert(!_active_notes);
        _active_notes = new CanvasNote*[128];
        for (unsigned i=0; i < 128; ++i) {
-               _active_notes[i] = NULL;
+               _active_notes[i] = 0;
        }
 }
 
@@ -814,7 +1268,7 @@ void
 MidiRegionView::end_write()
 {
        delete[] _active_notes;
-       _active_notes = NULL;
+       _active_notes = 0;
        _marked_for_selection.clear();
        _marked_for_velocity.clear();
 }
@@ -831,9 +1285,9 @@ MidiRegionView::resolve_note(uint8_t note, double end_time)
 
        if (_active_notes && _active_notes[note]) {
                const nframes64_t end_time_frames = beats_to_frames(end_time);
-               _active_notes[note]->property_x2() = trackview->editor().frame_to_pixel(end_time_frames);
+               _active_notes[note]->property_x2() = trackview.editor().frame_to_pixel(end_time_frames);
                _active_notes[note]->property_outline_what() = (guint32) 0xF; // all edges
-               _active_notes[note] = NULL;
+               _active_notes[note] = 0;
        }
 }
 
@@ -849,37 +1303,37 @@ MidiRegionView::extend_active_notes()
 
        for (unsigned i=0; i < 128; ++i) {
                if (_active_notes[i]) {
-                       _active_notes[i]->property_x2() = trackview->editor().frame_to_pixel(_region->length());
+                       _active_notes[i]->property_x2() = trackview.editor().frame_to_pixel(_region->length());
                }
        }
 }
 
-void 
+void
 MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
 {
-       if (!trackview->editor().sound_notes()) {
+       if (no_sound_notes || !trackview.editor().sound_notes()) {
                return;
        }
 
-       boost::shared_ptr<RouteUI> route_ui = boost::dynamic_pointer_cast<RouteUI> (trackview);
+       RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
        assert(route_ui);
-       
+
        route_ui->midi_track()->write_immediate_event(
                        note->on_event().size(), note->on_event().buffer());
-       
+
        const double note_length_beats = (note->off_event().time() - note->on_event().time());
        nframes_t note_length_ms = beats_to_frames(note_length_beats)
-                       * (1000 / (double)route_ui->session().nominal_frame_rate());
-       Glib::signal_timeout().connect(bind(mem_fun(this, &MidiRegionView::play_midi_note_off), note),
+                       * (1000 / (double)route_ui->session()->nominal_frame_rate());
+       Glib::signal_timeout().connect(sigc::bind(sigc::mem_fun(this, &MidiRegionView::play_midi_note_off), note),
                        note_length_ms, G_PRIORITY_DEFAULT);
 }
 
 bool
 MidiRegionView::play_midi_note_off(boost::shared_ptr<NoteType> note)
 {
-       boost::shared_ptr<RouteUI> route_ui = boost::dynamic_pointer_cast<RouteUI> (trackview);
+       RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
        assert(route_ui);
-       
+
        route_ui->midi_track()->write_immediate_event(
                        note->off_event().size(), note->off_event().buffer());
 
@@ -887,16 +1341,76 @@ MidiRegionView::play_midi_note_off(boost::shared_ptr<NoteType> note)
 }
 
 bool
-MidiRegionView::note_in_visible_range(const boost::shared_ptr<NoteType> note) const
+MidiRegionView::note_in_region_range(const boost::shared_ptr<NoteType> note, bool& visible) const
 {
        const nframes64_t note_start_frames = beats_to_frames(note->time());
-       bool outside = (note_start_frames - _region->start() >= _region->length())
-                       || (note_start_frames < _region->start())
-                       || (note->note() < midi_stream_view()->lowest_note())
-                       || (note->note() > midi_stream_view()->highest_note());
+
+       bool outside = (note_start_frames - _region->start() >= _region->length()) ||
+               (note_start_frames < _region->start());
+
+       visible = (note->note() >= midi_stream_view()->lowest_note()) &&
+               (note->note() <= midi_stream_view()->highest_note());
+
        return !outside;
 }
 
+void
+MidiRegionView::update_note (CanvasNote* ev)
+{
+       boost::shared_ptr<NoteType> note = ev->note();
+
+       const nframes64_t note_start_frames = beats_to_frames(note->time());
+
+       /* trim note display to not overlap the end of its region */
+       const nframes64_t note_end_frames = min (beats_to_frames (note->end_time()), _region->start() + _region->length());
+
+       const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start());
+       const double y1 = midi_stream_view()->note_to_y(note->note());
+       const double note_endpixel = trackview.editor().frame_to_pixel(note_end_frames - _region->start());
+
+       ev->property_x1() = x;
+       ev->property_y1() = y1;
+       if (note->length() > 0) {
+               ev->property_x2() = note_endpixel;
+       } else {
+               ev->property_x2() = trackview.editor().frame_to_pixel(_region->length());
+       }
+       ev->property_y2() = y1 + floor(midi_stream_view()->note_height());
+
+       if (note->length() == 0) {
+               if (_active_notes) {
+                       assert(note->note() < 128);
+                       // If this note is already active there's a stuck note,
+                       // finish the old note rectangle
+                       if (_active_notes[note->note()]) {
+                               CanvasNote* const old_rect = _active_notes[note->note()];
+                               boost::shared_ptr<NoteType> old_note = old_rect->note();
+                               old_rect->property_x2() = x;
+                               old_rect->property_outline_what() = (guint32) 0xF;
+                       }
+                       _active_notes[note->note()] = ev;
+               }
+               /* outline all but right edge */
+               ev->property_outline_what() = (guint32) (0x1 & 0x4 & 0x8);
+       } else {
+               /* outline all edges */
+               ev->property_outline_what() = (guint32) 0xF;
+       }
+}
+
+void
+MidiRegionView::update_hit (CanvasHit* ev)
+{
+       boost::shared_ptr<NoteType> note = ev->note();
+
+       const nframes64_t note_start_frames = beats_to_frames(note->time());
+       const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start());
+       const double diamond_size = midi_stream_view()->note_height() / 2.0;
+       const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0);
+
+       ev->move_to (x, y);
+}
+
 /** Add a MIDI note to the view (with length).
  *
  * If in sustained mode, notes with length 0 will be considered active
@@ -904,58 +1418,25 @@ MidiRegionView::note_in_visible_range(const boost::shared_ptr<NoteType> note) co
  * event arrives, to properly display the note.
  */
 void
-MidiRegionView::add_note(const boost::shared_ptr<NoteType> note)
+MidiRegionView::add_note(const boost::shared_ptr<NoteType> note, bool visible)
 {
+       CanvasNoteEvent* event = 0;
+
        assert(note->time() >= 0);
        assert(midi_view()->note_mode() == Sustained || midi_view()->note_mode() == Percussive);
-       
-       const nframes64_t note_start_frames = beats_to_frames(note->time());
-       const nframes64_t note_end_frames   = beats_to_frames(note->end_time());
 
        ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
 
-       CanvasNoteEvent* event = 0;
-       
-       const double x = trackview->editor().frame_to_pixel(note_start_frames - _region->start());
-       
        if (midi_view()->note_mode() == Sustained) {
-               const double y1 = midi_stream_view()->note_to_y(note->note());
-               const double note_endpixel = 
-                       trackview->editor().frame_to_pixel(note_end_frames - _region->start());
-               
+
                CanvasNote* ev_rect = new CanvasNote(*this, *group, note);
-               ev_rect->property_x1() = x;
-               ev_rect->property_y1() = y1;
-               if (note->length() > 0) {
-                       ev_rect->property_x2() = note_endpixel;
-               } else {
-                       ev_rect->property_x2() = trackview->editor().frame_to_pixel(_region->length());
-               }
-               ev_rect->property_y2() = y1 + floor(midi_stream_view()->note_height());
-
-               if (note->length() == 0) {
-                       if (_active_notes) {
-                               assert(note->note() < 128);
-                               // If this note is already active there's a stuck note,
-                               // finish the old note rectangle
-                               if (_active_notes[note->note()]) {
-                                       CanvasNote* const old_rect = _active_notes[note->note()];
-                                       boost::shared_ptr<NoteType> old_note = old_rect->note();
-                                       old_rect->property_x2() = x;
-                                       old_rect->property_outline_what() = (guint32) 0xF;
-                               }
-                               _active_notes[note->note()] = ev_rect;
-                       }
-                       /* outline all but right edge */
-                       ev_rect->property_outline_what() = (guint32) (0x1 & 0x4 & 0x8);
-               } else {
-                       /* outline all edges */
-                       ev_rect->property_outline_what() = (guint32) 0xF;
-               }
+
+               update_note (ev_rect);
 
                event = ev_rect;
 
                MidiGhostRegion* gr;
+
                for (std::vector<GhostRegion*>::iterator g = ghosts.begin(); g != ghosts.end(); ++g) {
                        if ((gr = dynamic_cast<MidiGhostRegion*>(*g)) != 0) {
                                gr->add_note(ev_rect);
@@ -963,12 +1444,15 @@ MidiRegionView::add_note(const boost::shared_ptr<NoteType> note)
                }
 
        } else if (midi_view()->note_mode() == Percussive) {
+
                const double diamond_size = midi_stream_view()->note_height() / 2.0;
-               const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0);
 
                CanvasHit* ev_diamond = new CanvasHit(*this, *group, diamond_size, note);
-               ev_diamond->move(x, y);
+
+               update_hit (ev_diamond);
+
                event = ev_diamond;
+
        } else {
                event = 0;
        }
@@ -976,77 +1460,106 @@ MidiRegionView::add_note(const boost::shared_ptr<NoteType> note)
        if (event) {
                if (_marked_for_selection.find(note) != _marked_for_selection.end()) {
                        note_selected(event, true);
-               }
+                }
+
                if (_marked_for_velocity.find(note) != _marked_for_velocity.end()) {
                        event->show_velocity();
                }
                event->on_channel_selection_change(_last_channel_selection);
                _events.push_back(event);
-               if (note_in_visible_range(note)) {
+
+               if (visible) {
                        event->show();
                } else {
-                       event->hide();
+                       event->hide ();
                }
        }
 }
 
+void
+MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity,
+                               Evoral::MusicalTime pos, Evoral::MusicalTime len)
+{
+       boost::shared_ptr<NoteType> new_note (new NoteType (channel, pos, len, number, velocity));
+
+       /* potentially extend region to hold new note */
+
+       nframes64_t end_frame = _region->position() + beats_to_frames (new_note->end_time());
+       nframes64_t region_end = _region->position() + _region->length() - 1;
+
+       if (end_frame > region_end) {
+               _region->set_length (end_frame - _region->position(), this);
+       }
+
+        _marked_for_selection.clear ();
+        clear_selection ();
+
+       start_diff_command (_("step add"));
+       diff_add_note (new_note, true, false);
+       apply_diff();
+
+        // last_step_edit_note = new_note;
+}
+
+void
+MidiRegionView::step_sustain (Evoral::MusicalTime beats)
+{
+        change_note_lengths (false, false, beats, false, true);
+}
+
 void
 MidiRegionView::add_pgm_change(PCEvent& program, const string& displaytext)
 {
        assert(program.time >= 0);
-       
+
        ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
-       const double x = trackview->editor().frame_to_pixel(beats_to_frames(program.time));
-       
+       const double x = trackview.editor().frame_to_pixel(beats_to_frames(program.time));
+
        double height = midi_stream_view()->contents_height();
-       
+
        boost::shared_ptr<CanvasProgramChange> pgm_change = boost::shared_ptr<CanvasProgramChange>(
                        new CanvasProgramChange(*this, *group,
-                                       displaytext, 
-                                       height, 
-                                       x, 1.0, 
-                                       _model_name, 
-                                       _custom_device_mode, 
+                                       displaytext,
+                                       height,
+                                       x, 1.0,
+                                       _model_name,
+                                       _custom_device_mode,
                                        program.time, program.channel, program.value));
-       
+
        // Show unless program change is beyond the region bounds
        if (program.time - _region->start() >= _region->length() || program.time < _region->start()) {
                pgm_change->hide();
        } else {
                pgm_change->show();
        }
-       
+
        _pgm_changes.push_back(pgm_change);
 }
 
 void
 MidiRegionView::get_patch_key_at(double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key)
 {
-       cerr << "getting patch key at " << time << " for channel " << channel << endl;
        Evoral::Parameter bank_select_msb(MidiCCAutomation, channel, MIDI_CTL_MSB_BANK);
        boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
-       float msb = -1.0;
+       double msb = 0.0;
        if (msb_control != 0) {
-               msb = int(msb_control->get_float(true, time));
-               cerr << "got msb " << msb;
+               msb = int(msb_control->get_double(true, time));
        }
 
        Evoral::Parameter bank_select_lsb(MidiCCAutomation, channel, MIDI_CTL_LSB_BANK);
        boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
-       float lsb = -1.0;
+       double lsb = 0.0;
        if (lsb_control != 0) {
-               lsb = lsb_control->get_float(true, time);
-               cerr << " got lsb " << lsb;
+               lsb = lsb_control->get_double(true, time);
        }
-       
+
        Evoral::Parameter program_change(MidiPgmChangeAutomation, channel, 0);
        boost::shared_ptr<Evoral::Control> program_control = _model->control(program_change);
-       float program_number = -1.0;
+       double program_number = -1.0;
        if (program_control != 0) {
-               program_number = program_control->get_float(true, time);
-               cerr << " got program " << program_number << endl;
+               program_number = program_control->get_double(true, time);
        }
-       
+
        key.msb = (int) floor(msb + 0.5);
        key.lsb = (int) floor(lsb + 0.5);
        key.program_number = (int) floor(program_number + 0.5);
@@ -1054,30 +1567,31 @@ MidiRegionView::get_patch_key_at(double time, uint8_t channel, MIDI::Name::Patch
 }
 
 
-void 
+void
 MidiRegionView::alter_program_change(PCEvent& old_program, const MIDI::Name::PatchPrimaryKey& new_patch)
 {
        // TODO: Get the real event here and alter them at the original times
        Evoral::Parameter bank_select_msb(MidiCCAutomation, old_program.channel, MIDI_CTL_MSB_BANK);
        boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
        if (msb_control != 0) {
-               msb_control->set_float(float(new_patch.msb), true, old_program.time);
+               msb_control->set_double(double(new_patch.msb), true, old_program.time);
        }
 
        // TODO: Get the real event here and alter them at the original times
        Evoral::Parameter bank_select_lsb(MidiCCAutomation, old_program.channel, MIDI_CTL_LSB_BANK);
        boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
        if (lsb_control != 0) {
-               lsb_control->set_float(float(new_patch.lsb), true, old_program.time);
+               lsb_control->set_double(double(new_patch.lsb), true, old_program.time);
        }
-       
+
        Evoral::Parameter program_change(MidiPgmChangeAutomation, old_program.channel, 0);
        boost::shared_ptr<Evoral::Control> program_control = _model->control(program_change);
-       
+
        assert(program_control != 0);
-       program_control->set_float(float(new_patch.program_number), true, old_program.time);
-       
-       redisplay_model();
+       program_control->set_double(float(new_patch.program_number), true, old_program.time);
+
+        _pgm_changes.clear ();
+        display_program_changes (); // XXX would be nice to limit to just old_program.channel
 }
 
 void
@@ -1087,42 +1601,42 @@ MidiRegionView::program_selected(CanvasProgramChange& program, const MIDI::Name:
        alter_program_change(program_change_event, new_patch);
 }
 
-void 
+void
 MidiRegionView::previous_program(CanvasProgramChange& program)
 {
-       MIDI::Name::PatchPrimaryKey key;
-       get_patch_key_at(program.event_time(), program.channel(), key);
-       
-       boost::shared_ptr<MIDI::Name::Patch> patch = 
-               MIDI::Name::MidiPatchManager::instance().previous_patch(
-                               _model_name,
-                               _custom_device_mode, 
-                               program.channel(), 
-                               key);
-       
-       PCEvent program_change_event(program.event_time(), program.program(), program.channel());
-       if (patch) {
-               alter_program_change(program_change_event, patch->patch_primary_key());
-       }
+        if (program.program() < 127) {
+                MIDI::Name::PatchPrimaryKey key;
+                get_patch_key_at(program.event_time(), program.channel(), key);
+                PCEvent program_change_event(program.event_time(), program.program(), program.channel());
+
+                key.program_number++;
+                alter_program_change(program_change_event, key);
+        }
 }
 
-void 
+void
 MidiRegionView::next_program(CanvasProgramChange& program)
 {
-       MIDI::Name::PatchPrimaryKey key;
-       get_patch_key_at(program.event_time(), program.channel(), key);
-       
-       boost::shared_ptr<MIDI::Name::Patch> patch = 
-               MIDI::Name::MidiPatchManager::instance().next_patch(
-                               _model_name,
-                               _custom_device_mode, 
-                               program.channel(), 
-                               key);   
+        if (program.program() > 0) {
+                MIDI::Name::PatchPrimaryKey key;
+                get_patch_key_at(program.event_time(), program.channel(), key);
+                PCEvent program_change_event(program.event_time(), program.program(), program.channel());
+
+                key.program_number--;
+                alter_program_change(program_change_event, key);
+        }
+}
 
-       PCEvent program_change_event(program.event_time(), program.program(), program.channel());
-       if (patch) {
-               alter_program_change(program_change_event, patch->patch_primary_key());
-       }
+void
+MidiRegionView::maybe_remove_deleted_note_from_selection (CanvasNoteEvent* cne)
+{
+        if (_selection.empty()) {
+                return;
+        }
+        if (_selection.erase (cne) > 0) {
+                cerr << "Erased a CNE from selection\n";
+        }
 }
 
 void
@@ -1132,17 +1646,27 @@ MidiRegionView::delete_selection()
                return;
        }
 
-       if (!_delta_command) {
-               _delta_command = _model->new_delta_command("delete selection");
-       }
+       start_diff_command (_("delete selection"));
 
        for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
                if ((*i)->selected()) {
-                       _delta_command->remove((*i)->note());
+                       _diff_command->remove((*i)->note());
                }
        }
 
        _selection.clear();
+
+       apply_diff ();
+}
+
+void
+MidiRegionView::delete_note (boost::shared_ptr<NoteType> n)
+{
+       start_diff_command (_("delete note"));
+       _diff_command->remove (n);
+       apply_diff ();
+
+       trackview.editor().hide_verbose_canvas_cursor ();
 }
 
 void
@@ -1150,7 +1674,7 @@ MidiRegionView::clear_selection_except(ArdourCanvas::CanvasNoteEvent* ev)
 {
        for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
                if ((*i)->selected() && (*i) != ev) {
-                       (*i)->selected(false);
+                       (*i)->set_selected(false);
                        (*i)->hide_velocity();
                }
        }
@@ -1161,110 +1685,267 @@ MidiRegionView::clear_selection_except(ArdourCanvas::CanvasNoteEvent* ev)
 void
 MidiRegionView::unique_select(ArdourCanvas::CanvasNoteEvent* ev)
 {
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
                if ((*i) != ev) {
-                       (*i)->selected(false);
-                       (*i)->hide_velocity();
+
+                       Selection::iterator tmp = i;
+                       ++tmp;
+
+                       (*i)->set_selected (false);
+                       _selection.erase (i);
+
+                       i = tmp;
+
+               } else {
+                       ++i;
                }
        }
 
-       _selection.clear();
-       _selection.insert(ev);
+       /* don't bother with removing this regionview from the editor selection,
+          since we're about to add another note, and thus put/keep this
+          regionview in the editor selection.
+       */
 
-       if ( ! ev->selected()) {
-               ev->selected(true);
+       if (!ev->selected()) {
+               add_to_selection (ev);
        }
 }
 
 void
-MidiRegionView::note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add)
+MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend)
 {
-       if ( ! add) {
-               clear_selection_except(ev);
+       uint8_t low_note = 127;
+       uint8_t high_note = 0;
+       MidiModel::Notes& notes (_model->notes());
+       _optimization_iterator = _events.begin();
+
+        if (!add) {
+                clear_selection ();
+        }
+
+       if (extend && _selection.empty()) {
+               extend = false;
        }
 
-       if (_selection.insert(ev).second) {
-               play_midi_note(ev->note());
+       if (extend) {
+
+               /* scan existing selection to get note range */
+
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       if ((*i)->note()->note() < low_note) {
+                               low_note = (*i)->note()->note();
+                       }
+                       if ((*i)->note()->note() > high_note) {
+                               high_note = (*i)->note()->note();
+                       }
+               }
+
+               low_note = min (low_note, notenum);
+               high_note = max (high_note, notenum);
        }
 
-       if ( ! ev->selected()) {
-               ev->selected(true);
+       no_sound_notes = true;
+
+       for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+
+               boost::shared_ptr<NoteType> note (*n);
+               CanvasNoteEvent* cne;
+               bool select = false;
+
+               if (((1 << note->channel()) & channel_mask) != 0) {
+                       if (extend) {
+                               if ((note->note() >= low_note && note->note() <= high_note)) {
+                                       select = true;
+                               }
+                       } else if (note->note() == notenum) {
+                               select = true;
+                       }
+               }
+
+               if (select) {
+                       if ((cne = find_canvas_note (note)) != 0) {
+                               // extend is false because we've taken care of it, 
+                               // since it extends by time range, not pitch.
+                               note_selected (cne, add, false);
+                       }
+               }
+               
+               add = true; // we need to add all remaining matching notes, even if the passed in value was false (for "set")
+
        }
+
+       no_sound_notes = false;
 }
 
+void
+MidiRegionView::toggle_matching_notes (uint8_t notenum, uint16_t channel_mask)
+{
+       MidiModel::Notes& notes (_model->notes());
+       _optimization_iterator = _events.begin();
+
+       for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+
+               boost::shared_ptr<NoteType> note (*n);
+               CanvasNoteEvent* cne;
+
+               if (note->note() == notenum && (((0x0001 << note->channel()) & channel_mask) != 0)) {
+                       if ((cne = find_canvas_note (note)) != 0) {
+                               if (cne->selected()) {
+                                       note_deselected (cne);
+                               } else {
+                                       note_selected (cne, true, false);
+                               }
+                       }
+               }
+       }
+}
 
 void
-MidiRegionView::note_deselected(ArdourCanvas::CanvasNoteEvent* ev, bool add)
+MidiRegionView::note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add, bool extend)
 {
-       if ( ! add) {
+       if (!add) {
                clear_selection_except(ev);
        }
 
-       _selection.erase(ev);
+       if (!extend) {
+
+               if (!ev->selected()) {
+                       add_to_selection (ev);
+               }
+
+       } else {
+               /* find end of latest note selected, select all between that and the start of "ev" */
+
+               Evoral::MusicalTime earliest = DBL_MAX;
+               Evoral::MusicalTime latest = 0;
+
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       if ((*i)->note()->end_time() > latest) {
+                               latest = (*i)->note()->end_time();
+                       }
+                       if ((*i)->note()->time() < earliest) {
+                               earliest = (*i)->note()->time();
+                       }
+               }
+
+               if (ev->note()->end_time() > latest) {
+                       latest = ev->note()->end_time();
+               }
+
+               if (ev->note()->time() < earliest) {
+                       earliest = ev->note()->time();
+               }
+
+               for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+
+                       /* find notes entirely within OR spanning the earliest..latest range */
+
+                       if (((*i)->note()->time() >= earliest && (*i)->note()->end_time() <= latest) ||
+                           ((*i)->note()->time() <= earliest && (*i)->note()->end_time() >= latest)) {
+                               add_to_selection (*i);
+                       }
+
+#if 0
+                       /* if events were guaranteed to be time sorted, we could do this.
+                          but as of sept 10th 2009, they no longer are.
+                       */
 
-       if (ev->selected()) {
-               ev->selected(false);
+                       if ((*i)->note()->time() > latest) {
+                               break;
+                       }
+#endif
+               }
        }
 }
 
+void
+MidiRegionView::note_deselected(ArdourCanvas::CanvasNoteEvent* ev)
+{
+       remove_from_selection (ev);
+}
 
 void
 MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2)
 {
-       const double last_y = std::min(y1, y2);
-       const double y      = std::max(y1, y2);
+       if (x1 > x2) {
+               swap (x1, x2);
+       }
+
+       if (y1 > y2) {
+               swap (y1, y2);
+       }
 
        // TODO: Make this faster by storing the last updated selection rect, and only
        // adjusting things that are in the area that appears/disappeared.
        // We probably need a tree to be able to find events in O(log(n)) time.
 
-#ifndef NDEBUG
-       double last_x1 = 0.0;
-#endif
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+
+               /* check if any corner of the note is inside the rect
+
+                  Notes:
+                    1) this is computing "touched by", not "contained by" the rect.
+                    2) this does not require that events be sorted in time.
+                */
+
+               const double ix1 = (*i)->x1();
+               const double ix2 = (*i)->x2();
+               const double iy1 = (*i)->y1();
+               const double iy2 = (*i)->y2();
+
+               if ((ix1 >= x1 && ix1 <= x2 && iy1 >= y1 && iy1 <= y2) ||
+                   (ix1 >= x1 && ix1 <= x2 && iy2 >= y1 && iy2 <= y2) ||
+                   (ix2 >= x1 && ix2 <= x2 && iy1 >= y1 && iy1 <= y2) ||
+                   (ix2 >= x1 && ix2 <= x2 && iy2 >= y1 && iy2 <= y2)) {
 
-       if (x1 < x2) {
-               for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
-#ifndef NDEBUG
-                       // Events should always be sorted by increasing x1() here
-                       assert((*i)->x1() >= last_x1);
-                       last_x1 = (*i)->x1();
-#endif
                        // Inside rectangle
-                       if ((*i)->x1() >= x1 && (*i)->x1() <= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) {
-                               if (!(*i)->selected()) {
-                                       (*i)->selected(true);
-                                       _selection.insert(*i);
-                                       play_midi_note((*i)->note());
-                               }
-                       // Not inside rectangle
-                       } else if ((*i)->selected()) {
-                               (*i)->selected(false);
-                               _selection.erase(*i);
+                       if (!(*i)->selected()) {
+                               add_to_selection (*i);
                        }
-               }
-       } else {
-               for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
-#ifndef NDEBUG
-                       // Events should always be sorted by increasing x1() here
-                       assert((*i)->x1() >= last_x1);
-                       last_x1 = (*i)->x1();
-#endif
-                       // Inside rectangle
-                       if ((*i)->x2() <= x1 && (*i)->x2() >= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) {
-                               if (!(*i)->selected()) {
-                                       (*i)->selected(true);
-                                       _selection.insert(*i);
-                                       play_midi_note((*i)->note());
-                               }
+               } else if ((*i)->selected()) {
                        // Not inside rectangle
-                       } else if ((*i)->selected()) {
-                               (*i)->selected(false);
-                               _selection.erase(*i);
-                       }
+                       remove_from_selection (*i);
                }
        }
 }
 
+void
+MidiRegionView::remove_from_selection (CanvasNoteEvent* ev)
+{
+       Selection::iterator i = _selection.find (ev);
+
+       if (i != _selection.end()) {
+               _selection.erase (i);
+       }
+
+       ev->set_selected (false);
+       ev->hide_velocity ();
+
+       if (_selection.empty()) {
+               PublicEditor& editor (trackview.editor());
+               editor.get_selection().remove (this);
+       }
+}
+
+void
+MidiRegionView::add_to_selection (CanvasNoteEvent* ev)
+{
+       bool add_mrv_selection = false;
+
+       if (_selection.empty()) {
+               add_mrv_selection = true;
+       }
+
+       if (_selection.insert (ev).second) {
+               ev->set_selected (true);
+               play_midi_note ((ev)->note());
+       }
+
+       if (add_mrv_selection) {
+               PublicEditor& editor (trackview.editor());
+               editor.get_selection().add (this);
+       }
+}
 
 void
 MidiRegionView::move_selection(double dx, double dy)
@@ -1274,64 +1955,56 @@ MidiRegionView::move_selection(double dx, double dy)
        }
 }
 
-
 void
-MidiRegionView::note_dropped(CanvasNoteEvent* ev, double dt, uint8_t dnote)
+MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote)
 {
-       // TODO: This would be faster/nicer with a MoveCommand that doesn't need to copy...
-       if (_selection.find(ev) == _selection.end()) {
-               return;
-       }
+       assert (!_selection.empty());
 
-       uint8_t lowest_note_in_selection  = midi_stream_view()->lowest_note();
-       uint8_t highest_note_in_selection = midi_stream_view()->highest_note();
+       uint8_t lowest_note_in_selection  = 127;
+       uint8_t highest_note_in_selection = 0;
        uint8_t highest_note_difference = 0;
 
        // find highest and lowest notes first
+
        for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
                uint8_t pitch = (*i)->note()->note();
                lowest_note_in_selection  = std::min(lowest_note_in_selection,  pitch);
                highest_note_in_selection = std::max(highest_note_in_selection, pitch);
        }
-       
+
        /*
        cerr << "dnote: " << (int) dnote << endl;
-       cerr << "lowest note (streamview): " << int(midi_stream_view()->lowest_note()) 
+       cerr << "lowest note (streamview): " << int(midi_stream_view()->lowest_note())
             << " highest note (streamview): " << int(midi_stream_view()->highest_note()) << endl;
-       cerr << "lowest note (selection): " << int(lowest_note_in_selection) << " highest note(selection): " 
+       cerr << "lowest note (selection): " << int(lowest_note_in_selection) << " highest note(selection): "
             << int(highest_note_in_selection) << endl;
        cerr << "selection size: " << _selection.size() << endl;
        cerr << "Highest note in selection: " << (int) highest_note_in_selection << endl;
        */
-       
+
        // Make sure the note pitch does not exceed the MIDI standard range
-       if (dnote <= 127 && (highest_note_in_selection + dnote > 127)) {
+       if (highest_note_in_selection + dnote > 127) {
                highest_note_difference = highest_note_in_selection - 127;
        }
-       
-       start_delta_command(_("move notes"));
 
-       for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ) {
-               Selection::iterator next = i;
-               ++next;
+       start_diff_command(_("move notes"));
 
-               const boost::shared_ptr<NoteType> copy(new NoteType(*(*i)->note().get()));
+       for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) {
 
-               nframes64_t start_frames = beats_to_frames((*i)->note()->time());
-               if (dt >= 0) {
-                       start_frames += snap_frame_to_frame(trackview->editor().pixel_to_frame(dt));
-               } else {
-                       start_frames -= snap_frame_to_frame(trackview->editor().pixel_to_frame(-dt));
+               Evoral::MusicalTime new_time = frames_to_beats (beats_to_frames ((*i)->note()->time()) + dt);
+
+               if (new_time < 0) {
+                       continue;
                }
 
-               copy->set_time(frames_to_beats(start_frames));
+               diff_add_change (*i, MidiModel::DiffCommand::StartTime, new_time);
 
                uint8_t original_pitch = (*i)->note()->note();
                uint8_t new_pitch      = original_pitch + dnote - highest_note_difference;
-               
+
                // keep notes in standard midi range
                clamp_to_0_127(new_pitch);
-               
+
                // keep original pitch if note is dragged outside valid midi range
                if ((original_pitch != 0 && new_pitch == 0)
                                || (original_pitch != 127 && new_pitch == 127)) {
@@ -1341,19 +2014,14 @@ MidiRegionView::note_dropped(CanvasNoteEvent* ev, double dt, uint8_t dnote)
                lowest_note_in_selection  = std::min(lowest_note_in_selection,  new_pitch);
                highest_note_in_selection = std::max(highest_note_in_selection, new_pitch);
 
-               copy->set_note(new_pitch);
-               
-               command_remove_note(*i);
-               command_add_note(copy, (*i)->selected());
-
-               i = next;
+               diff_add_change (*i, MidiModel::DiffCommand::NoteNumber, new_pitch);
        }
 
-       apply_command();
-       
+       apply_diff();
+
        // care about notes being moved beyond the upper/lower bounds on the canvas
        if (lowest_note_in_selection  < midi_stream_view()->lowest_note() ||
-                       highest_note_in_selection > midi_stream_view()->highest_note()) {
+           highest_note_in_selection > midi_stream_view()->highest_note()) {
                midi_stream_view()->set_note_range(MidiStreamView::ContentsRange);
        }
 }
@@ -1361,7 +2029,7 @@ MidiRegionView::note_dropped(CanvasNoteEvent* ev, double dt, uint8_t dnote)
 nframes64_t
 MidiRegionView::snap_pixel_to_frame(double x)
 {
-       PublicEditor& editor = trackview->editor();
+       PublicEditor& editor = trackview.editor();
        // x is region relative, convert it to global absolute frames
        nframes64_t frame = editor.pixel_to_frame(x) + _region->position();
        editor.snap_to(frame);
@@ -1371,7 +2039,7 @@ MidiRegionView::snap_pixel_to_frame(double x)
 nframes64_t
 MidiRegionView::snap_frame_to_frame(nframes64_t x)
 {
-       PublicEditor& editor = trackview->editor();
+       PublicEditor& editor = trackview.editor();
        // x is region relative, convert it to global absolute frames
        nframes64_t frame = x + _region->position();
        editor.snap_to(frame);
@@ -1381,14 +2049,21 @@ MidiRegionView::snap_frame_to_frame(nframes64_t x)
 double
 MidiRegionView::snap_to_pixel(double x)
 {
-       return (double) trackview->editor().frame_to_pixel(snap_pixel_to_frame(x));
+       return (double) trackview.editor().frame_to_pixel(snap_pixel_to_frame(x));
 }
 
 double
 MidiRegionView::get_position_pixels()
 {
        nframes64_t region_frame = get_position();
-       return trackview->editor().frame_to_pixel(region_frame);
+       return trackview.editor().frame_to_pixel(region_frame);
+}
+
+double
+MidiRegionView::get_end_position_pixels()
+{
+       nframes64_t frame = get_position() + get_duration ();
+       return trackview.editor().frame_to_pixel(frame);
 }
 
 nframes64_t
@@ -1404,7 +2079,7 @@ MidiRegionView::frames_to_beats(nframes64_t frames) const
 }
 
 void
-MidiRegionView::begin_resizing(CanvasNote::NoteEnd note_end)
+MidiRegionView::begin_resizing (bool /*at_front*/)
 {
        _resize_data.clear();
 
@@ -1430,7 +2105,7 @@ MidiRegionView::begin_resizing(CanvasNote::NoteEnd note_end)
 
                        // calculate color based on note velocity
                        resize_rect->property_fill_color_rgba() = UINT_INTERPOLATE(
-                                       CanvasNoteEvent::meter_style_fill_color(note->note()->velocity()),
+                                CanvasNoteEvent::meter_style_fill_color(note->note()->velocity(), note->selected()),
                                        fill_color,
                                        0.85);
 
@@ -1438,81 +2113,135 @@ MidiRegionView::begin_resizing(CanvasNote::NoteEnd note_end)
                                        ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get());
 
                        resize_data->resize_rect = resize_rect;
-
-                       if (note_end == CanvasNote::NOTE_ON) {
-                               resize_data->current_x = note->x1();
-                       } else { // NOTE_OFF
-                               resize_data->current_x = note->x2();
-                       }
-
                        _resize_data.push_back(resize_data);
                }
        }
 }
 
+/** Update resizing notes while user drags.
+ * @param primary `primary' note for the drag; ie the one that is used as the reference in non-relative mode.
+ * @param at_front which end of the note (true == note on, false == note off)
+ * @param delta_x change in mouse position since the start of the drag 
+ * @param relative true if relative resizing is taking place, false if absolute resizing.  This only makes
+ * a difference when multiple notes are being resized; in relative mode, each note's length is changed by the
+ * amount of the drag.  In non-relative mode, all selected notes are set to have the same start or end point
+ * as the \a primary note.
+ */
 void
-MidiRegionView::update_resizing(CanvasNote::NoteEnd note_end, double x, bool relative)
+MidiRegionView::update_resizing (ArdourCanvas::CanvasNote* primary, bool at_front, double delta_x, bool relative)
 {
+        bool cursor_set = false;
+
        for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
                SimpleRect* resize_rect = (*i)->resize_rect;
                CanvasNote* canvas_note = (*i)->canvas_note;
+               double current_x;
 
-               const double region_start = get_position_pixels();
-
-               if (relative) {
-                       (*i)->current_x = (*i)->current_x + x;
+               if (at_front) {
+                       if (relative) {
+                               current_x = canvas_note->x1() + delta_x;
+                       } else {
+                               current_x = primary->x1() + delta_x;
+                       }
                } else {
-                       // x is in track relative, transform it to region relative
-                       (*i)->current_x = x - region_start;
+                       if (relative) {
+                               current_x = canvas_note->x2() + delta_x;
+                       } else {
+                               current_x = primary->x2() + delta_x;
+                       }
                }
 
-               double current_x = (*i)->current_x;
-
-               if (note_end == CanvasNote::NOTE_ON) {
+               if (at_front) {
                        resize_rect->property_x1() = snap_to_pixel(current_x);
                        resize_rect->property_x2() = canvas_note->x2();
                } else {
                        resize_rect->property_x2() = snap_to_pixel(current_x);
                        resize_rect->property_x1() = canvas_note->x1();
                }
+
+                if (!cursor_set) {
+                        double beats;
+
+                        beats = snap_pixel_to_frame (current_x);
+                        beats = frames_to_beats (beats);
+                        
+                        double len;
+
+                        if (at_front) {
+                                if (beats < canvas_note->note()->end_time()) {
+                                        len = canvas_note->note()->time() - beats;
+                                        len += canvas_note->note()->length();
+                                } else {
+                                        len = 0;
+                                }
+                        } else {
+                                if (beats >= canvas_note->note()->end_time()) { 
+                                        len = beats - canvas_note->note()->time();
+                                } else {
+                                        len = 0;
+                                }
+                        }
+
+                        char buf[16];
+                        snprintf (buf, sizeof (buf), "%.3g beats", len);
+                        trackview.editor().show_verbose_canvas_cursor_with (buf);
+
+                        cursor_set = true;
+                }
+
        }
 }
 
+
+/** Finish resizing notes when the user releases the mouse button.
+ *  Parameters the same as for \a update_resizing().
+ */
 void
-MidiRegionView::commit_resizing(CanvasNote::NoteEnd note_end, double event_x, bool relative)
+MidiRegionView::commit_resizing (ArdourCanvas::CanvasNote* primary, bool at_front, double delta_x, bool relative)
 {
-       start_delta_command(_("resize notes"));
+       start_diff_command(_("resize notes"));
 
        for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
                CanvasNote*  canvas_note = (*i)->canvas_note;
                SimpleRect*  resize_rect = (*i)->resize_rect;
-               double       current_x   = (*i)->current_x;
-               const double position    = get_position_pixels();
+               double current_x;
 
-               if (!relative) {
-                       // event_x is in track relative, transform it to region relative
-                       current_x = event_x - position;
+               if (at_front) {
+                       if (relative) {
+                               current_x = canvas_note->x1() + delta_x;
+                       } else {
+                               current_x = primary->x1() + delta_x;
+                       }
+               } else {
+                       if (relative) {
+                               current_x = canvas_note->x2() + delta_x;
+                       } else {
+                               current_x = primary->x2() + delta_x;
+                       }
                }
 
-               // because snapping works on world coordinates we have to transform current_x
-               // to world coordinates before snapping and transform it back afterwards
-               nframes64_t current_frame = snap_pixel_to_frame(current_x);
-               // transform to region start relative
-               current_frame += _region->start();
-               
-               const boost::shared_ptr<NoteType> copy(new NoteType(*(canvas_note->note().get())));
+               current_x = snap_pixel_to_frame (current_x);
+               current_x = frames_to_beats (current_x);
+
+               if (at_front && current_x < canvas_note->note()->end_time()) {
+                       diff_add_change (canvas_note, MidiModel::DiffCommand::StartTime, current_x);
+
+                       double len = canvas_note->note()->time() - current_x;
+                       len += canvas_note->note()->length();
 
-               // resize beginning of note
-               if (note_end == CanvasNote::NOTE_ON && current_frame < copy->end_time()) {
-                       command_remove_note(canvas_note);
-                       copy->on_event().time() = current_frame;
-                       command_add_note(copy, _selection.find(canvas_note) != _selection.end());
+                       if (len > 0) {
+                               /* XXX convert to beats */
+                               diff_add_change (canvas_note, MidiModel::DiffCommand::Length, len);
+                       }
                }
-               // resize end of note
-               if (note_end == CanvasNote::NOTE_OFF && current_frame > copy->time()) {
-                       command_remove_note(canvas_note);
-                       copy->off_event().time() = current_frame;
-                       command_add_note(copy, _selection.find(canvas_note) != _selection.end());
+
+               if (!at_front) {
+                       double len = current_x - canvas_note->note()->time();
+
+                       if (len > 0) {
+                               /* XXX convert to beats */
+                               diff_add_change (canvas_note, MidiModel::DiffCommand::Length, len);
+                       }
                }
 
                delete resize_rect;
@@ -1520,65 +2249,350 @@ MidiRegionView::commit_resizing(CanvasNote::NoteEnd note_end, double event_x, bo
        }
 
        _resize_data.clear();
-       apply_command();
+       apply_diff();
+}
+
+void
+MidiRegionView::change_note_channel (CanvasNoteEvent* event, int8_t channel)
+{
+       diff_add_change (event, MidiModel::DiffCommand::Channel, (uint8_t) channel);
 }
 
 void
 MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bool relative)
 {
-       const boost::shared_ptr<NoteType> copy(new NoteType(*(event->note().get())));
+       uint8_t new_velocity;
 
        if (relative) {
-               uint8_t new_velocity = copy->velocity() + velocity;
+               new_velocity = event->note()->velocity() + velocity;
                clamp_to_0_127(new_velocity);
-               copy->set_velocity(new_velocity);
        } else {
-               copy->set_velocity(velocity);                   
+               new_velocity = velocity;
        }
 
-       command_remove_note(event);
-       command_add_note(copy, event->selected(), true);
+        event->set_selected (event->selected()); // change color 
+        
+       diff_add_change (event, MidiModel::DiffCommand::Velocity, new_velocity);
 }
 
 void
-MidiRegionView::change_velocity(CanvasNoteEvent* ev, int8_t velocity, bool relative)
+MidiRegionView::change_note_note (CanvasNoteEvent* event, int8_t note, bool relative)
 {
-       start_delta_command(_("change velocity"));
-       
-       change_note_velocity(ev, velocity, relative);
+       uint8_t new_note;
+
+       if (relative) {
+               new_note = event->note()->note() + note;
+       } else {
+               new_note = note;
+       }
+
+       clamp_to_0_127 (new_note);
+       diff_add_change (event, MidiModel::DiffCommand::NoteNumber, new_note);
+}
+
+void
+MidiRegionView::trim_note (CanvasNoteEvent* event, Evoral::MusicalTime front_delta, Evoral::MusicalTime end_delta)
+{
+       bool change_start = false;
+       bool change_length = false;
+       Evoral::MusicalTime new_start = 0;
+       Evoral::MusicalTime new_length = 0;
+
+       /* NOTE: the semantics of the two delta arguments are slightly subtle:
+
+          front_delta: if positive - move the start of the note later in time (shortening it)
+                       if negative - move the start of the note earlier in time (lengthening it)
+
+          end_delta:   if positive - move the end of the note later in time (lengthening it)
+                       if negative - move the end of the note earlier in time (shortening it)
+        */
+
+       if (front_delta) {
+               if (front_delta < 0) {
+
+                       if (event->note()->time() < -front_delta) {
+                               new_start = 0;
+                       } else {
+                               new_start = event->note()->time() + front_delta; // moves earlier
+                       }
+
+                       /* start moved toward zero, so move the end point out to where it used to be.
+                          Note that front_delta is negative, so this increases the length.
+                       */
+
+                       new_length = event->note()->length() - front_delta;
+                       change_start = true;
+                       change_length = true;
+
+               } else {
+
+                       Evoral::MusicalTime new_pos = event->note()->time() + front_delta;
+
+                       if (new_pos < event->note()->end_time()) {
+                               new_start = event->note()->time() + front_delta;
+                               /* start moved toward the end, so move the end point back to where it used to be */
+                               new_length = event->note()->length() - front_delta;
+                               change_start = true;
+                               change_length = true;
+                       }
+               }
+
+       }
+
+       if (end_delta) {
+               bool can_change = true;
+               if (end_delta < 0) {
+                       if (event->note()->length() < -end_delta) {
+                               can_change = false;
+                       }
+               }
+
+               if (can_change) {
+                       new_length = event->note()->length() + end_delta;
+                       change_length = true;
+               }
+       }
+
+       if (change_start) {
+               diff_add_change (event, MidiModel::DiffCommand::StartTime, new_start);
+       }
+
+       if (change_length) {
+               diff_add_change (event, MidiModel::DiffCommand::Length, new_length);
+       }
+}
+
+void
+MidiRegionView::change_note_time (CanvasNoteEvent* event, Evoral::MusicalTime delta, bool relative)
+{
+       Evoral::MusicalTime new_time;
+
+       if (relative) {
+               if (delta < 0.0) {
+                       if (event->note()->time() < -delta) {
+                               new_time = 0;
+                       } else {
+                               new_time = event->note()->time() + delta;
+                       }
+               } else {
+                       new_time = event->note()->time() + delta;
+               }
+       } else {
+               new_time = delta;
+       }
+
+       diff_add_change (event, MidiModel::DiffCommand::StartTime, new_time);
+}
+
+void
+MidiRegionView::change_note_length (CanvasNoteEvent* event, Evoral::MusicalTime t)
+{
+       diff_add_change (event, MidiModel::DiffCommand::Length, t);
+}
+
+void
+MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush)
+{
+       int8_t delta;
+
+       if (_selection.empty()) {
+               return;
+       }
+
+       if (fine) {
+               delta = 1;
+       } else {
+               delta = 10;
+       }
+
+       if (!up) {
+               delta = -delta;
+       }
+
+       if (!allow_smush) {
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       if ((*i)->note()->velocity() + delta == 0 || (*i)->note()->velocity() + delta == 127) {
+                               return;
+                       }
+               }
+       }
+
+       start_diff_command(_("change velocities"));
 
        for (Selection::iterator i = _selection.begin(); i != _selection.end();) {
                Selection::iterator next = i;
                ++next;
-               if ( !(*((*i)->note()) == *(ev->note())) ) {
-                       change_note_velocity(*i, velocity, relative);
-               }
+               change_note_velocity (*i, delta, true);
                i = next;
        }
+
+       apply_diff();
        
-       apply_command();
+        if (!_selection.empty()) {
+                char buf[24];
+                snprintf (buf, sizeof (buf), "Vel %d", 
+                          (int) (*_selection.begin())->note()->velocity());
+                trackview.editor().show_verbose_canvas_cursor_with (buf);
+        }
 }
 
+
 void
-MidiRegionView::change_channel(uint8_t channel)
+MidiRegionView::transpose (bool up, bool fine, bool allow_smush)
 {
-       start_delta_command(_("change channel"));
-       for (Selection::iterator i = _selection.begin(); i != _selection.end();) {
+       if (_selection.empty()) {
+               return;
+       }
+
+       int8_t delta;
+
+       if (fine) {
+               delta = 1;
+       } else {
+               delta = 12;
+       }
+
+       if (!up) {
+               delta = -delta;
+       }
+
+       if (!allow_smush) {
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       if (!up) {
+                               if ((int8_t) (*i)->note()->note() + delta <= 0) {
+                                       return;
+                               }
+                       } else {
+                               if ((int8_t) (*i)->note()->note() + delta > 127) {
+                                       return;
+                               }
+                       }
+               }
+       }
+
+       start_diff_command (_("transpose"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
                Selection::iterator next = i;
                ++next;
+               change_note_note (*i, delta, true);
+               i = next;
+       }
 
-               CanvasNoteEvent* event = *i;
-               const boost::shared_ptr<NoteType> copy(new NoteType(*(event->note().get())));
+       apply_diff ();
+}
 
-               copy->set_channel(channel);
-               
-               command_remove_note(event);
-               command_add_note(copy, event->selected());
+void
+MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTime delta, bool start, bool end)
+{
+        if (delta == 0.0) {
+                if (fine) {
+                        delta = 1.0/128.0;
+                } else {
+                        /* grab the current grid distance */
+                        bool success;
+                        delta = trackview.editor().get_grid_type_as_beats (success, _region->position());
+                        if (!success) {
+                                /* XXX cannot get grid type as beats ... should always be possible ... FIX ME */
+                                cerr << "Grid type not available as beats - TO BE FIXED\n";
+                                return;
+                        }
+                }
+        }
+
+       if (shorter) {
+               delta = -delta;
+       }
+
+       start_diff_command (_("change note lengths"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+               Selection::iterator next = i;
+               ++next;
+
+               /* note the negation of the delta for start */
+
+               trim_note (*i, (start ? -delta : 0), (end ? delta : 0));
+               i = next;
+       }
+
+       apply_diff ();
+
+}
+
+void
+MidiRegionView::nudge_notes (bool forward)
+{
+       if (_selection.empty()) {
+               return;
+       }
+
+       /* pick a note as the point along the timeline to get the nudge distance.
+          its not necessarily the earliest note, so we may want to pull the notes out
+          into a vector and sort before using the first one.
+       */
+
+       nframes64_t ref_point = _region->position() + beats_to_frames ((*(_selection.begin()))->note()->time());
+       nframes64_t unused;
+       nframes64_t distance;
+
+       if (trackview.editor().snap_mode() == Editing::SnapOff) {
                
+               /* grid is off - use nudge distance */
+
+               distance = trackview.editor().get_nudge_distance (ref_point, unused);
+
+       } else {
+
+               /* use grid */
+
+               nframes64_t next_pos = ref_point;
+
+               if (forward) {
+                       /* XXX need check on max_frames, but that needs max_frames64 or something */
+                       next_pos += 1;
+               } else {
+                       if (next_pos == 0) {
+                               return;
+                       }
+                       next_pos -= 1;
+               }
+
+               trackview.editor().snap_to (next_pos, (forward ? 1 : -1), false);
+               distance = ref_point - next_pos;
+       }
+
+       if (distance == 0) {
+               return;
+       }
+
+       Evoral::MusicalTime delta = frames_to_beats (fabs (distance));
+
+       if (!forward) {
+               delta = -delta;
+       }
+
+       start_diff_command (_("nudge"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+               Selection::iterator next = i;
+               ++next;
+               change_note_time (*i, delta, true);
                i = next;
        }
-       
-       apply_command();
+
+       apply_diff ();
+}
+
+void
+MidiRegionView::change_channel(uint8_t channel)
+{
+       start_diff_command(_("change channel"));
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               diff_add_change (*i, MidiModel::DiffCommand::Channel, channel);
+       }
+
+       apply_diff();
 }
 
 
@@ -1586,10 +2600,21 @@ void
 MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev)
 {
        if (_mouse_state == SelectTouchDragging) {
-               note_selected(ev, true);
+               note_selected (ev, true);
        }
+
+       show_verbose_canvas_cursor (ev->note ());
 }
 
+void
+MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent* note)
+{
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               (*i)->hide_velocity ();
+       }
+
+       trackview.editor().hide_verbose_canvas_cursor ();
+}
 
 void
 MidiRegionView::switch_source(boost::shared_ptr<Source> src)
@@ -1611,7 +2636,7 @@ MidiRegionView::set_frame_color()
        }
 }
 
-void 
+void
 MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
 {
        switch (mode) {
@@ -1632,7 +2657,7 @@ MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
        _last_channel_selection = mask;
 }
 
-void 
+void
 MidiRegionView::midi_patch_settings_changed(std::string model, std::string custom_device_mode)
 {
        _model_name         = model;
@@ -1640,3 +2665,384 @@ MidiRegionView::midi_patch_settings_changed(std::string model, std::string custo
        redisplay_model();
 }
 
+void
+MidiRegionView::cut_copy_clear (Editing::CutCopyOp op)
+{
+       if (_selection.empty()) {
+               return;
+       }
+
+       PublicEditor& editor (trackview.editor());
+
+       switch (op) {
+       case Cut:
+       case Copy:
+               editor.get_cut_buffer().add (selection_as_cut_buffer());
+               break;
+       default:
+               break;
+       }
+
+        if (op != Copy) {
+
+                start_diff_command();
+                
+                for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                        switch (op) {
+                        case Copy:
+                                break;
+                        case Cut:
+                        case Clear:
+                                diff_remove_note (*i);
+                                break;
+                        }
+                }
+                
+                apply_diff();
+        }
+}
+
+MidiCutBuffer*
+MidiRegionView::selection_as_cut_buffer () const
+{
+       Notes notes;
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                NoteType* n = (*i)->note().get();
+               notes.insert (boost::shared_ptr<NoteType> (new NoteType (*n)));
+       }
+
+       MidiCutBuffer* cb = new MidiCutBuffer (trackview.session());
+       cb->set (notes);
+
+       return cb;
+}
+
+void
+MidiRegionView::paste (nframes64_t pos, float times, const MidiCutBuffer& mcb)
+{
+       if (mcb.empty()) {
+               return;
+       }
+
+       start_diff_command (_("paste"));
+
+       Evoral::MusicalTime beat_delta;
+       Evoral::MusicalTime paste_pos_beats;
+       Evoral::MusicalTime duration;
+       Evoral::MusicalTime end_point = 0;
+
+       duration = (*mcb.notes().rbegin())->end_time() - (*mcb.notes().begin())->time();
+       paste_pos_beats = frames_to_beats (pos - _region->position());
+       beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats;
+       paste_pos_beats = 0;
+
+       _selection.clear ();
+
+       for (int n = 0; n < (int) times; ++n) {
+
+               for (Notes::const_iterator i = mcb.notes().begin(); i != mcb.notes().end(); ++i) {
+
+                       boost::shared_ptr<NoteType> copied_note (new NoteType (*((*i).get())));
+                       copied_note->set_time (paste_pos_beats + copied_note->time() - beat_delta);
+
+                       /* make all newly added notes selected */
+
+                       diff_add_note (copied_note, true);
+                       end_point = copied_note->end_time();
+               }
+
+               paste_pos_beats += duration;
+       }
+
+       /* if we pasted past the current end of the region, extend the region */
+
+       nframes64_t end_frame = _region->position() + beats_to_frames (end_point);
+       nframes64_t region_end = _region->position() + _region->length() - 1;
+
+       if (end_frame > region_end) {
+
+               trackview.session()->begin_reversible_command (_("paste"));
+
+                _region->clear_changes ();
+               _region->set_length (end_frame, this);
+               trackview.session()->add_command (new StatefulDiffCommand (_region));
+       }
+
+       apply_diff ();
+}
+
+struct EventNoteTimeEarlyFirstComparator {
+    bool operator() (CanvasNoteEvent* a, CanvasNoteEvent* b) {
+           return a->note()->time() < b->note()->time();
+    }
+};
+
+void
+MidiRegionView::time_sort_events ()
+{
+       if (!_sort_needed) {
+               return;
+       }
+
+       EventNoteTimeEarlyFirstComparator cmp;
+       _events.sort (cmp);
+
+       _sort_needed = false;
+}
+
+void
+MidiRegionView::goto_next_note ()
+{
+       // nframes64_t pos = -1;
+       bool use_next = false;
+
+       if (_events.back()->selected()) {
+               return;
+       }
+
+       time_sort_events ();
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               if ((*i)->selected()) {
+                       use_next = true;
+                       continue;
+               } else if (use_next) {
+                       unique_select (*i);
+                       // pos = _region->position() + beats_to_frames ((*i)->note()->time());
+                       return;
+               }
+       }
+
+       /* use the first one */
+
+       unique_select (_events.front());
+
+}
+
+void
+MidiRegionView::goto_previous_note ()
+{
+       // nframes64_t pos = -1;
+       bool use_next = false;
+
+       if (_events.front()->selected()) {
+               return;
+       }
+
+       time_sort_events ();
+
+       for (Events::reverse_iterator i = _events.rbegin(); i != _events.rend(); ++i) {
+               if ((*i)->selected()) {
+                       use_next = true;
+                       continue;
+               } else if (use_next) {
+                       unique_select (*i);
+                       // pos = _region->position() + beats_to_frames ((*i)->note()->time());
+                       return;
+               }
+       }
+
+       /* use the last one */
+
+       unique_select (*(_events.rbegin()));
+}
+
+void
+MidiRegionView::selection_as_notelist (Notes& selected, bool allow_all_if_none_selected)
+{
+        bool had_selected = false;
+
+       time_sort_events ();
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               if ((*i)->selected()) {
+                       selected.insert ((*i)->note());
+                        had_selected = true;
+               }
+       }
+        
+        if (allow_all_if_none_selected && !had_selected) {
+                for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+                        selected.insert ((*i)->note());
+               }
+       }
+}
+
+void
+MidiRegionView::update_ghost_note (double x, double y)
+{
+       _last_ghost_x = x;
+       _last_ghost_y = y;
+       
+       group->w2i (x, y);
+       nframes64_t f = trackview.editor().pixel_to_frame (x) + _region->position ();
+       trackview.editor().snap_to (f);
+       f -= _region->position ();
+
+       bool success;
+       Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, f);
+       if (!success) {
+               beats = 1;
+       }
+       
+       double length = frames_to_beats (snap_frame_to_frame (f + beats_to_frames (beats)) - f);
+       
+       _ghost_note->note()->set_time (frames_to_beats (f + _region->start()));
+       _ghost_note->note()->set_length (length);
+       _ghost_note->note()->set_note (midi_stream_view()->y_to_note (y));
+
+       update_note (_ghost_note);
+
+       show_verbose_canvas_cursor (_ghost_note->note ());
+}
+
+void
+MidiRegionView::create_ghost_note (double x, double y)
+{
+       delete _ghost_note;
+       _ghost_note = 0;
+
+       boost::shared_ptr<NoteType> g (new NoteType);
+       _ghost_note = new NoEventCanvasNote (*this, *group, g);
+       update_ghost_note (x, y);
+       _ghost_note->show ();
+
+       _last_ghost_x = x;
+       _last_ghost_y = y;
+
+       show_verbose_canvas_cursor (_ghost_note->note ());
+}
+
+void
+MidiRegionView::snap_changed ()
+{
+       if (!_ghost_note) {
+               return;
+       }
+       
+       create_ghost_note (_last_ghost_x, _last_ghost_y);
+}
+
+void
+MidiRegionView::show_verbose_canvas_cursor (boost::shared_ptr<NoteType> n) const
+{
+       char buf[24];
+       snprintf (buf, sizeof (buf), "%s (%d)\nVel %d", 
+                  Evoral::midi_note_name (n->note()).c_str(), 
+                  (int) n->note (),
+                  (int) n->velocity());
+       trackview.editor().show_verbose_canvas_cursor_with (buf);
+}
+
+void
+MidiRegionView::drop_down_keys ()
+{
+        _mouse_state = None;
+}
+
+void
+MidiRegionView::maybe_select_by_position (GdkEventButton* ev, double x, double y)
+{
+       double note = midi_stream_view()->y_to_note(y);
+        Events e;
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+        
+        cerr << "Selecting by position\n";
+
+       uint16_t chn_mask = mtv->channel_selector().get_selected_channels();
+
+        if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+                get_events (e, Evoral::Sequence<Evoral::MusicalTime>::PitchGreaterThanOrEqual, (uint8_t) floor (note), chn_mask);
+        } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                get_events (e, Evoral::Sequence<Evoral::MusicalTime>::PitchLessThanOrEqual, (uint8_t) floor (note), chn_mask);
+        } else {
+                return;
+        }
+
+       bool add_mrv_selection = false;
+
+       if (_selection.empty()) {
+               add_mrv_selection = true;
+       }
+
+        for (Events::iterator i = e.begin(); i != e.end(); ++i) {
+                if (_selection.insert (*i).second) {
+                        (*i)->set_selected (true);
+                }
+       }
+
+       if (add_mrv_selection) {
+               PublicEditor& editor (trackview.editor());
+               editor.get_selection().add (this);
+       }
+}                
+
+void
+MidiRegionView::color_handler ()
+{
+        RegionView::color_handler ();
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+                (*i)->set_selected ((*i)->selected()); // will change color
+        }
+
+        /* XXX probably more to do here */
+}
+
+void
+MidiRegionView::enable_display (bool yn)
+{
+       RegionView::enable_display (yn);
+       if (yn) {
+               redisplay_model ();
+       }
+}
+
+void
+MidiRegionView::show_step_edit_cursor (Evoral::MusicalTime pos)
+{
+        if (_step_edit_cursor == 0) {
+                ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
+
+                _step_edit_cursor = new ArdourCanvas::SimpleRect (*group);
+                _step_edit_cursor->property_y1() = 0;
+                _step_edit_cursor->property_y2() = midi_stream_view()->contents_height();
+                _step_edit_cursor->property_fill_color_rgba() = RGBA_TO_UINT (45,0,0,90);
+                _step_edit_cursor->property_outline_color_rgba() = RGBA_TO_UINT (85,0,0,90);
+        }
+
+        move_step_edit_cursor (pos);
+        _step_edit_cursor->show ();
+}
+
+void
+MidiRegionView::move_step_edit_cursor (Evoral::MusicalTime pos)
+{
+        _step_edit_cursor_position = pos;
+
+        if (_step_edit_cursor) {
+                double pixel = trackview.editor().frame_to_pixel (beats_to_frames (pos));
+                _step_edit_cursor->property_x1() = pixel;
+                set_step_edit_cursor_width (_step_edit_cursor_width);
+        }
+}
+
+void
+MidiRegionView::hide_step_edit_cursor ()
+{
+        if (_step_edit_cursor) {
+                _step_edit_cursor->hide ();
+        }
+}
+
+void
+MidiRegionView::set_step_edit_cursor_width (Evoral::MusicalTime beats)
+{
+        _step_edit_cursor_width = beats;
+
+        if (_step_edit_cursor) {
+                _step_edit_cursor->property_x2() = _step_edit_cursor->property_x1() + trackview.editor().frame_to_pixel (beats_to_frames (beats));
+        }
+}
+