add theme files to default target, and install using target names

[ardour.git] / gtk2_ardour / canvas-midi-event.cc

diff --git a/gtk2_ardour/canvas-midi-event.cc b/gtk2_ardour/canvas-midi-event.cc
index 73c2b2992523e98b364af568294ac24b76606b32..fca3a1618bf0d6a776781bab3fc4cb87d9c93024 100644 (file)
--- a/gtk2_ardour/canvas-midi-event.cc
+++ b/gtk2_ardour/canvas-midi-event.cc
@@ -25,15 +25,17 @@
 #include "keyboard.h"
 
 using namespace std;
+using ARDOUR::MidiModel;
 
 namespace Gnome {
 namespace Canvas {
 
 
-CanvasMidiEvent::CanvasMidiEvent(MidiRegionView& region, Item* item)
+CanvasMidiEvent::CanvasMidiEvent(MidiRegionView& region, Item* item, const ARDOUR::MidiModel::Note* note)
        : _region(region)
        , _item(item)
        , _state(None)
+       , _note(note)
 {      
 }
 
@@ -41,30 +43,37 @@ CanvasMidiEvent::CanvasMidiEvent(MidiRegionView& region, Item* item)
 bool
 CanvasMidiEvent::on_event(GdkEvent* ev)
 {
+       static uint8_t drag_delta_note = 0;
+       static double  drag_delta_x = 0;
        static double last_x, last_y;
-       double event_x, event_y;
+       double event_x, event_y, dx, dy;
 
        if (_region.get_time_axis_view().editor.current_mouse_mode() != Editing::MouseNote)
                return false;
 
        switch (ev->type) {
+       case GDK_KEY_PRESS:
+               if (_note && ev->key.keyval == GDK_Delete) {
+                       _region.start_remove_command();
+                       _region.command_remove_note(this);
+               }
+               break;
+       
+       case GDK_KEY_RELEASE:
+               if (ev->key.keyval == GDK_Delete) {
+                       _region.apply_command();
+               }
+               break;
+       
        case GDK_ENTER_NOTIFY:
-               cerr << "ENTERED: " << ev->crossing.state << endl;
                Keyboard::magic_widget_grab_focus();
                _item->grab_focus();
-               /*if ( (ev->crossing.state & GDK_BUTTON2_MASK) ) {
-
-               }*/
+               _region.note_entered(this);
                break;
 
        case GDK_LEAVE_NOTIFY:
-               cerr << "LEAVE: " << ev->crossing.state << endl;
                Keyboard::magic_widget_drop_focus();
-               //_item->drop_focus();
-               break;
-       
-       case GDK_KEY_PRESS:
-               cerr << "EVENT KEY PRESS\n"; // doesn't work :/
+               _region.get_canvas_group()->grab_focus();
                break;
 
        case GDK_BUTTON_PRESS:
@@ -78,14 +87,17 @@ CanvasMidiEvent::on_event(GdkEvent* ev)
                _item->property_parent().get_value()->w2i(event_x, event_y);
 
                switch (_state) {
-               case Pressed:
+               case Pressed: // Drag begin
                        _item->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
                                        Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
                        _state = Dragging;
                        last_x = event_x;
                        last_y = event_y;
+                       drag_delta_x = 0;
+                       drag_delta_note = 0;
                        return true;
-               case Dragging:
+
+               case Dragging: // Drag motion
                        if (ev->motion.is_hint) {
                                int t_x;
                                int t_y;
@@ -95,10 +107,28 @@ CanvasMidiEvent::on_event(GdkEvent* ev)
                                event_y = t_y;
                        }
 
-                       _item->move(event_x - last_x, event_y - last_y);
-
+                       dx = event_x - last_x;
+                       dy = event_y - last_y;
+                       
                        last_x = event_x;
-                       last_y = event_y;
+
+                       drag_delta_x += dx;
+
+                       // Snap to note rows
+                       if (abs(dy) < _region.note_height()) {
+                               dy = 0.0;
+                       } else {
+                               int8_t this_delta_note;
+                               if (dy > 0)
+                                       this_delta_note = (int8_t)ceil(dy / _region.note_height());
+                               else
+                                       this_delta_note = (int8_t)floor(dy / _region.note_height());
+                               drag_delta_note -= this_delta_note;
+                               dy = _region.note_height() * this_delta_note;
+                               last_y = last_y + dy;
+                       }
+
+                       _item->move(dx, dy);
 
                        return true;
                default:
@@ -107,6 +137,10 @@ CanvasMidiEvent::on_event(GdkEvent* ev)
                break;
        
        case GDK_BUTTON_RELEASE:
+               event_x = ev->button.x;
+               event_y = ev->button.y;
+               _item->property_parent().get_value()->w2i(event_x, event_y);
+
                switch (_state) {
                case Pressed: // Clicked
                        _state = None;
@@ -114,6 +148,23 @@ CanvasMidiEvent::on_event(GdkEvent* ev)
                case Dragging: // Dropped
                        _item->ungrab(ev->button.time);
                        _state = None;
+                       if (_note) {
+                               // This would be nicer with a MoveCommand that doesn't need to copy...
+                               _region.start_delta_command();
+                               _region.command_remove_note(this);
+                               MidiModel::Note copy(*_note); 
+                               
+                               double delta_t = _region.midi_view()->editor.pixel_to_frame(
+                                               abs(drag_delta_x));
+                               if (drag_delta_x < 0)
+                                       delta_t *= -1;
+
+                               copy.set_time(_note->time() + delta_t);
+                               copy.set_note(_note->note() + drag_delta_note);
+
+                               _region.command_add_note(copy);
+                               _region.apply_command();
+                       }
                        return true;
                default:
                        break;