namespace Canvas {
-CanvasMidiEvent::CanvasMidiEvent(MidiRegionView& region, Item* item, const ARDOUR::MidiModel::Note* note)
+CanvasMidiEvent::CanvasMidiEvent(MidiRegionView& region, Item* item,
+ const boost::shared_ptr<ARDOUR::Note> note)
: _region(region)
, _item(item)
, _state(None)
, _selected(false)
{
}
-
+
+
void
CanvasMidiEvent::selected(bool yn)
{
static double last_x, last_y;
double event_x, event_y, dx, dy;
nframes_t event_frame;
- bool select_mod = false;
+ bool select_mod;
if (_region.get_time_axis_view().editor.current_mouse_mode() != Editing::MouseNote)
return false;
switch (ev->type) {
case GDK_KEY_PRESS:
+ cerr << "EV KEY PRESS\n";
if (_note && ev->key.keyval == GDK_Delete) {
+ cerr << "EV DELETE KEY\n";
selected(true);
_region.start_remove_command();
_region.command_remove_note(this);
break;
case GDK_KEY_RELEASE:
+ cerr << "EV KEY RELEASE\n";
if (ev->key.keyval == GDK_Delete) {
_region.apply_command();
}
break;
case GDK_ENTER_NOTIFY:
- select_mod = (ev->motion.state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
- cerr << "ENTER: " << select_mod << " - " << ev->motion.state << endl;
- if (select_mod) {
- _region.note_selected(this, true);
- }
- Keyboard::magic_widget_grab_focus();
- _item->grab_focus();
_region.note_entered(this);
+ _item->grab_focus();
+ Keyboard::magic_widget_grab_focus();
break;
case GDK_LEAVE_NOTIFY:
return true;
case GDK_MOTION_NOTIFY:
- select_mod = (ev->motion.state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
event_x = ev->motion.x;
event_y = ev->motion.y;
//cerr << "MOTION @ " << event_x << ", " << event_y << endl;
switch (_state) {
case Pressed: // Drag begin
- if (!select_mod) {
+ if (_region.mouse_state() != MidiRegionView::SelectTouchDragging) {
_item->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
_state = Dragging;
last_y = event_y;
drag_delta_x = 0;
drag_delta_note = 0;
+ _region.note_selected(this, true);
}
return true;
switch (_state) {
case Pressed: // Clicked
- _state = None;
-
- if (_selected && !select_mod && _region.selection_size() > 1)
- _region.unique_select(this);
- else if (_selected)
- _region.note_deselected(this, select_mod);
- else
- _region.note_selected(this, select_mod);
+ if (_region.midi_view()->editor.current_midi_edit_mode() == Editing::MidiEditSelect) {
+ _state = None;
+
+ if (_selected && !select_mod && _region.selection_size() > 1)
+ _region.unique_select(this);
+ else if (_selected)
+ _region.note_deselected(this, select_mod);
+ else
+ _region.note_selected(this, select_mod);
+ } else if (_region.midi_view()->editor.current_midi_edit_mode() == Editing::MidiEditErase) {
+ _region.start_remove_command();
+ _region.command_remove_note(this);
+ _region.apply_command();
+ }
return true;
case Dragging: // Dropped