X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-note-event.cc;h=0e1afcc01774bcd6379d35e3209419a6b2b6b8fc;hb=04db4c788c8bf5070eb13b9165277ea81ab50070;hp=0ad6cd2be90f8e01b92b86875314e00f2784636a;hpb=37a34bb8b0568ad28fa6c3697a2eab296b0af7ae;p=ardour.git diff --git a/gtk2_ardour/canvas-note-event.cc b/gtk2_ardour/canvas-note-event.cc index 0ad6cd2be9..0e1afcc017 100644 --- a/gtk2_ardour/canvas-note-event.cc +++ b/gtk2_ardour/canvas-note-event.cc @@ -18,6 +18,9 @@ */ #include + +#include "gtkmm2ext/keyboard.h" + #include "canvas-note-event.h" #include "midi_region_view.h" #include "public_editor.h" @@ -25,6 +28,7 @@ #include "keyboard.h" using namespace std; +using namespace Gtkmm2ext; using ARDOUR::MidiModel; namespace Gnome { @@ -40,8 +44,7 @@ const uint32_t CanvasNoteEvent::midi_channel_colors[16] = { 0x832dd3ff, 0xa92dd3ff, 0xd32dbfff, 0xd32d67ff }; -CanvasNoteEvent::CanvasNoteEvent(MidiRegionView& region, Item* item, - const boost::shared_ptr note) +CanvasNoteEvent::CanvasNoteEvent(MidiRegionView& region, Item* item, const boost::shared_ptr note) : _region(region) , _item(item) , _text(0) @@ -50,12 +53,14 @@ CanvasNoteEvent::CanvasNoteEvent(MidiRegionView& region, Item* item, , _note(note) , _selected(false) , _valid (true) + , _mouse_x_fraction (-1.0) + , _mouse_y_fraction (-1.0) { } CanvasNoteEvent::~CanvasNoteEvent() { - CanvasNoteEventDeleted (this); + CanvasNoteEventDeleted (this); if (_text) { _text->hide(); @@ -81,15 +86,16 @@ void CanvasNoteEvent::show_velocity() { if (!_text) { - _text = new InteractiveText(*(_item->property_parent()), this); + _text = new NoEventText (*(_item->property_parent())); + _text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiNoteVelocityText.get(); + _text->property_justification() = Gtk::JUSTIFY_CENTER; } + _text->property_x() = (x1() + x2()) /2; _text->property_y() = (y1() + y2()) /2; ostringstream velo(ios::ate); velo << int(_note->velocity()); _text->property_text() = velo.str(); - _text->property_justification() = Gtk::JUSTIFY_CENTER; - _text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiNoteVelocityText.get(); _text->show(); _text->raise_to_top(); } @@ -113,7 +119,7 @@ CanvasNoteEvent::on_channel_selection_change(uint16_t selection) set_outline_color(calculate_outline(ARDOUR_UI::config()->canvasvar_MidiNoteInactiveChannel.get())); } else { // set the color according to the notes selection state - selected(_selected); + set_selected(_selected); } // this forces the item to update..... maybe slow... _item->hide(); @@ -132,22 +138,32 @@ void CanvasNoteEvent::show_channel_selector(void) { if (_channel_selector_widget == 0) { - cerr << "Note has channel: " << int(_note->channel()) << endl; + + if(_region.channel_selector_scoped_note() != 0){ + _region.channel_selector_scoped_note()->hide_channel_selector(); + _region.set_channel_selector_scoped_note(0); + } + SingleMidiChannelSelector* _channel_selector = new SingleMidiChannelSelector(_note->channel()); _channel_selector->show_all(); _channel_selector->channel_selected.connect( sigc::mem_fun(this, &CanvasNoteEvent::on_channel_change)); + _channel_selector->clicked.connect ( + sigc::mem_fun (this, &CanvasNoteEvent::hide_channel_selector)); + _channel_selector_widget = new Widget(*(_item->property_parent()), - x1(), - y2() + 2, - (Gtk::Widget &) *_channel_selector); + x1(), + y2() + 2, + (Gtk::Widget &) *_channel_selector); _channel_selector_widget->hide(); _channel_selector_widget->property_height() = 100; _channel_selector_widget->property_width() = 100; _channel_selector_widget->raise_to_top(); _channel_selector_widget->show(); + + _region.set_channel_selector_scoped_note(this); } else { hide_channel_selector(); } @@ -164,21 +180,27 @@ CanvasNoteEvent::hide_channel_selector(void) } void -CanvasNoteEvent::selected(bool selected) +CanvasNoteEvent::set_selected(bool selected) { if (!_note) { return; - } else if (selected) { - set_fill_color(UINT_INTERPOLATE(base_color(), - ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5)); - set_outline_color(calculate_outline( - ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get())); + } + + _selected = selected; + set_fill_color (base_color ()); + + if (_selected) { + set_outline_color(calculate_outline(ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get())); + + if(_region.channel_selector_scoped_note() != 0){ + _region.channel_selector_scoped_note()->hide_channel_selector(); + _region.set_channel_selector_scoped_note(0); + } } else { - set_fill_color(base_color()); set_outline_color(calculate_outline(base_color())); + hide_channel_selector(); } - _selected = selected; } #define SCALE_USHORT_TO_UINT8_T(x) ((x) / 257) @@ -195,58 +217,118 @@ CanvasNoteEvent::base_color() switch (mode) { case TrackColor: - { - Gdk::Color color = _region.midi_stream_view()->get_region_color(); - return RGBA_TO_UINT( - SCALE_USHORT_TO_UINT8_T(color.get_red()), - SCALE_USHORT_TO_UINT8_T(color.get_green()), - SCALE_USHORT_TO_UINT8_T(color.get_blue()), - opacity); - } + { + Gdk::Color color = _region.midi_stream_view()->get_region_color(); + return UINT_INTERPOLATE (RGBA_TO_UINT( + SCALE_USHORT_TO_UINT8_T(color.get_red()), + SCALE_USHORT_TO_UINT8_T(color.get_green()), + SCALE_USHORT_TO_UINT8_T(color.get_blue()), + opacity), + ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5); + } case ChannelColors: - return UINT_RGBA_CHANGE_A(CanvasNoteEvent::midi_channel_colors[_note->channel()], - opacity); + return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (CanvasNoteEvent::midi_channel_colors[_note->channel()], + opacity), + ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5); default: - return meter_style_fill_color(_note->velocity()); + return meter_style_fill_color(_note->velocity(), selected()); }; return 0; } +void +CanvasNoteEvent::set_mouse_fractions (GdkEvent* ev) +{ + double ix, iy; + double bx1, bx2, by1, by2; + bool set_cursor = false; + + switch (ev->type) { + case GDK_MOTION_NOTIFY: + ix = ev->motion.x; + iy = ev->motion.y; + set_cursor = true; + break; + case GDK_ENTER_NOTIFY: + ix = ev->crossing.x; + iy = ev->crossing.y; + set_cursor = true; + break; + case GDK_BUTTON_PRESS: + case GDK_BUTTON_RELEASE: + ix = ev->button.x; + iy = ev->button.y; + break; + default: + _mouse_x_fraction = -1.0; + _mouse_y_fraction = -1.0; + return; + } + + _item->get_bounds (bx1, by1, bx2, by2); + _item->w2i (ix, iy); + /* hmm, something wrong here. w2i should give item-local coordinates + but it doesn't. for now, finesse this. + */ + ix = ix - bx1; + iy = iy - by1; + + /* fraction of width/height */ + double xf; + double yf; + bool notify = false; + + xf = ix / (bx2 - bx1); + yf = iy / (by2 - by1); + + if (xf != _mouse_x_fraction || yf != _mouse_y_fraction) { + notify = true; + } + + _mouse_x_fraction = xf; + _mouse_y_fraction = yf; + + if (notify) { + _region.note_mouse_position (_mouse_x_fraction, _mouse_y_fraction, set_cursor); + } +} + bool CanvasNoteEvent::on_event(GdkEvent* ev) { - PublicEditor& editor (_region.get_time_axis_view().editor()); - - if (!editor.internal_editing()) { + if (!_region.get_time_axis_view().editor().internal_editing()) { return false; } switch (ev->type) { case GDK_ENTER_NOTIFY: - _region.note_entered(this); - //Keyboard::magic_widget_grab_focus(); + set_mouse_fractions (ev); + _region.note_entered (this); break; case GDK_LEAVE_NOTIFY: - //Keyboard::magic_widget_drop_focus(); + set_mouse_fractions (ev); _region.note_left (this); - if (!selected()) { - hide_velocity(); - } + break; + + case GDK_MOTION_NOTIFY: + set_mouse_fractions (ev); break; case GDK_BUTTON_PRESS: - if (ev->button.button == 3) { + set_mouse_fractions (ev); + if (ev->button.button == 3 && Keyboard::no_modifiers_active (ev->button.state) && _selected) { show_channel_selector(); return true; } break; case GDK_BUTTON_RELEASE: - if (ev->button.button == 3) { + set_mouse_fractions (ev); + if (ev->button.button == 3 && Keyboard::no_modifiers_active (ev->button.state)) { return true; } break; @@ -258,6 +340,13 @@ CanvasNoteEvent::on_event(GdkEvent* ev) return false; } +bool +CanvasNoteEvent::mouse_near_ends () const +{ + return (_mouse_x_fraction >= 0.0 && _mouse_x_fraction < 0.25) || + (_mouse_x_fraction >= 0.75 && _mouse_x_fraction < 1.0); +} + } // namespace Canvas } // namespace Gnome