X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpiano_roll_header.cc;h=6fb92d9be2fc254042c08a9de356ec7e39548ead;hb=711db34a81eed3748684bc52b17a56292ffe4092;hp=e946aa3dfbdbe45466b5e43b7aac872e9dfa0c7a;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc index e946aa3dfb..6fb92d9be2 100644 --- a/gtk2_ardour/piano_roll_header.cc +++ b/gtk2_ardour/piano_roll_header.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Paul Davis + Copyright (C) 2008 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,6 +20,8 @@ #include "evoral/midi_events.h" #include "ardour/midi_track.h" +#include "gtkmm2ext/keyboard.h" + #include "piano_roll_header.h" #include "midi_time_axis.h" #include "midi_streamview.h" @@ -27,6 +29,7 @@ const int no_note = 0xff; using namespace std; +using namespace Gtkmm2ext; PianoRollHeader::Color PianoRollHeader::white = PianoRollHeader::Color(0.77f, 0.78f, 0.76f); PianoRollHeader::Color PianoRollHeader::white_highlight = PianoRollHeader::Color(0.87f, 0.88f, 0.86f); @@ -60,8 +63,8 @@ PianoRollHeader::Color::set(const PianoRollHeader::Color& c) b = c.b; } -PianoRollHeader::PianoRollHeader(MidiStreamView& v) - : _view(v) +PianoRollHeader::PianoRollHeader(MidiStreamView& v) + : _view(v) , _highlighted_note(no_note) , _clicked_note(no_note) , _dragging(false) @@ -77,7 +80,7 @@ PianoRollHeader::PianoRollHeader(MidiStreamView& v) _active_notes[i] = false; } - _view.NoteRangeChanged.connect (mem_fun (*this, &PianoRollHeader::note_range_changed)); + _view.NoteRangeChanged.connect (sigc::mem_fun (*this, &PianoRollHeader::note_range_changed)); } inline void @@ -90,8 +93,8 @@ create_path(Cairo::RefPtr cr, double x[], double y[], int start, } } -inline void -render_rect(Cairo::RefPtr cr, int note, double x[], double y[], +inline void +render_rect(Cairo::RefPtr cr, int /*note*/, double x[], double y[], PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow) { cr->set_source_rgb(bg.r, bg.g, bg.b); @@ -108,7 +111,7 @@ render_rect(Cairo::RefPtr cr, int note, double x[], double y[], } inline void -render_cf(Cairo::RefPtr cr, int note, double x[], double y[], +render_cf(Cairo::RefPtr cr, int /*note*/, double x[], double y[], PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow) { cr->set_source_rgb(bg.r, bg.g, bg.b); @@ -125,7 +128,7 @@ render_cf(Cairo::RefPtr cr, int note, double x[], double y[], } inline void -render_eb(Cairo::RefPtr cr, int note, double x[], double y[], +render_eb(Cairo::RefPtr cr, int /*note*/, double x[], double y[], PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow) { cr->set_source_rgb(bg.r, bg.g, bg.b); @@ -146,7 +149,7 @@ render_eb(Cairo::RefPtr cr, int note, double x[], double y[], } inline void -render_dga(Cairo::RefPtr cr, int note, double x[], double y[], +render_dga(Cairo::RefPtr cr, int /*note*/, double x[], double y[], PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow) { cr->set_source_rgb(bg.r, bg.g, bg.b); @@ -441,10 +444,10 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) std::stringstream s; double y = floor(_view.note_to_y(i)) - 0.5f; double note_height = floor(_view.note_to_y(i - 1)) - y; - - int cn = i / 12; + + int cn = i / 12 - 1; s << "C" << cn; - + //cr->get_text_extents(s.str(), te); cr->set_source_rgb(0.30f, 0.30f, 0.30f); cr->move_to(2.0f, y + note_height - 1.0f - (note_height - font_size) / 2.0f); @@ -458,28 +461,31 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) bool PianoRollHeader::on_motion_notify_event (GdkEventMotion* ev) { - int note = _view.y_to_note(ev->y); - - if (_highlighted_note != no_note) { - if (note > _highlighted_note) { - invalidate_note_range(_highlighted_note, note); - } else { - invalidate_note_range(note, _highlighted_note); - } - - _highlighted_note = note; - } + if (_dragging) { - /* redraw already taken care of above */ - if (_clicked_note != no_note && _clicked_note != note) { - _active_notes[_clicked_note] = false; - send_note_off(_clicked_note); + int note = _view.y_to_note(ev->y); - _clicked_note = note; + if (_highlighted_note != no_note) { + if (note > _highlighted_note) { + invalidate_note_range(_highlighted_note, note); + } else { + invalidate_note_range(note, _highlighted_note); + } + + _highlighted_note = note; + } + + /* redraw already taken care of above */ + if (_clicked_note != no_note && _clicked_note != note) { + _active_notes[_clicked_note] = false; + send_note_off(_clicked_note); - if (!_active_notes[note]) { - _active_notes[note] = true; - send_note_on(note); + _clicked_note = note; + + if (!_active_notes[note]) { + _active_notes[note] = true; + send_note_on(note); + } } } @@ -493,18 +499,25 @@ PianoRollHeader::on_button_press_event (GdkEventButton* ev) { int note = _view.y_to_note(ev->y); - if (ev->type == GDK_BUTTON_PRESS && note >= 0 && note < 128) { - add_modal_grab(); - _dragging = true; - - if (!_active_notes[note]) { - _active_notes[note] = true; - _clicked_note = note; - send_note_on(note); + if (ev->button == 2) { + send_note_on (note); + /* relax till release */ + } else { + + if (ev->type == GDK_BUTTON_PRESS && note >= 0 && note < 128) { + + add_modal_grab(); + _dragging = true; - invalidate_note_range(note, note); - } else { - _clicked_note = no_note; + if (!_active_notes[note]) { + _active_notes[note] = true; + _clicked_note = note; + send_note_on(note); + + invalidate_note_range(note, note); + } else { + reset_clicked_note(note); + } } } @@ -516,17 +529,27 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev) { int note = _view.y_to_note(ev->y); - if (_dragging) { - remove_modal_grab(); - _dragging = false; + if (ev->button == 2) { + send_note_off (note); - if (note == _clicked_note) { - _active_notes[note] = false; - _clicked_note = no_note; - send_note_off(note); - - invalidate_note_range(note, note); + if (Keyboard::no_modifiers_active (ev->state)) { + AddNoteSelection (note); // EMIT SIGNAL + } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + ToggleNoteSelection (note); // EMIT SIGNAL + } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::RangeSelectModifier)) { + ExtendNoteSelection (note); // EMIT SIGNAL } + + } else { + + if (_dragging) { + remove_modal_grab(); + _dragging = false; + + if (note == _clicked_note) { + reset_clicked_note(note); + } + } } return true; @@ -545,16 +568,9 @@ bool PianoRollHeader::on_leave_notify_event (GdkEventCrossing*) { invalidate_note_range(_highlighted_note, _highlighted_note); - - if (_clicked_note != no_note) { - _active_notes[_clicked_note] = false; - send_note_off(_clicked_note); - - if (_clicked_note != _highlighted_note) { - invalidate_note_range(_clicked_note, _clicked_note); - } - _clicked_note = no_note; + if (_clicked_note != no_note) { + reset_clicked_note(_clicked_note, _clicked_note != _highlighted_note); } _highlighted_note = no_note; @@ -562,7 +578,7 @@ PianoRollHeader::on_leave_notify_event (GdkEventCrossing*) } bool -PianoRollHeader::on_scroll_event (GdkEventScroll* ev) +PianoRollHeader::on_scroll_event (GdkEventScroll*) { return true; } @@ -571,14 +587,7 @@ void PianoRollHeader::note_range_changed() { _note_height = floor(_view.note_height()) + 0.5f; - queue_draw(); - - Glib::RefPtr win = get_window(); - - if (win) { - win->process_updates(false); - } } void @@ -639,7 +648,7 @@ void PianoRollHeader::on_size_allocate(Gtk::Allocation& a) { DrawingArea::on_size_allocate(a); - + _black_note_width = floor(0.7 * get_width()) + 0.5f; } @@ -647,11 +656,12 @@ void PianoRollHeader::send_note_on(uint8_t note) { boost::shared_ptr track = _view.trackview().midi_track(); + MidiTimeAxisView* mtv = dynamic_cast (&_view.trackview ()); //cerr << "note on: " << (int) note << endl; if (track) { - _event[0] = MIDI_CMD_NOTE_ON; + _event[0] = (MIDI_CMD_NOTE_ON | mtv->get_channel_for_add ()); _event[1] = note; _event[2] = 100; @@ -663,12 +673,24 @@ void PianoRollHeader::send_note_off(uint8_t note) { boost::shared_ptr track = _view.trackview().midi_track(); + MidiTimeAxisView* mtv = dynamic_cast (&_view.trackview ()); if (track) { - _event[0] = MIDI_CMD_NOTE_OFF; + _event[0] = (MIDI_CMD_NOTE_OFF | mtv->get_channel_for_add ()); _event[1] = note; _event[2] = 100; track->write_immediate_event(3, _event); } } + +void +PianoRollHeader::reset_clicked_note (uint8_t note, bool invalidate) +{ + _active_notes[note] = false; + _clicked_note = no_note; + send_note_off (note); + if (invalidate) { + invalidate_note_range (note, note); + } +}