change note colors on the fly, to permit user-definition of colors more easily; remov...

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

diff --git a/gtk2_ardour/canvas-note-event.cc b/gtk2_ardour/canvas-note-event.cc
index b3c6b49ee0eb5f0617026c139361464fb8ea4808..c85cdc39d237095d3ba9644e8a0940b6f4030686 100644 (file)
--- a/gtk2_ardour/canvas-note-event.cc
+++ b/gtk2_ardour/canvas-note-event.cc
@@ -18,6 +18,9 @@
 */
 
 #include <iostream>
+
+#include "gtkmm2ext/keyboard.h"
+
 #include "canvas-note-event.h"
 #include "midi_region_view.h"
 #include "public_editor.h"
@@ -25,21 +28,23 @@
 #include "keyboard.h"
 
 using namespace std;
+using namespace Gtkmm2ext;
 using ARDOUR::MidiModel;
 
 namespace Gnome {
 namespace Canvas {
 
+PBD::Signal1<void,CanvasNoteEvent*> CanvasNoteEvent::CanvasNoteEventDeleted;
+
 /// dividing the hue circle in 16 parts, hand adjusted for equal look, courtesy Thorsten Wilms
 const uint32_t CanvasNoteEvent::midi_channel_colors[16] = {
-         0xd32d2dff,  0xd36b2dff,  0xd3972dff,  0xd3d12dff,  
-         0xa0d32dff,  0x7dd32dff,  0x2dd45eff,  0x2dd3c4ff,  
-         0x2da5d3ff,  0x2d6fd3ff,  0x432dd3ff,  0x662dd3ff,  
+         0xd32d2dff,  0xd36b2dff,  0xd3972dff,  0xd3d12dff,
+         0xa0d32dff,  0x7dd32dff,  0x2dd45eff,  0x2dd3c4ff,
+         0x2da5d3ff,  0x2d6fd3ff,  0x432dd3ff,  0x662dd3ff,
          0x832dd3ff,  0xa92dd3ff,  0xd32dbfff,  0xd32d67ff
        };
 
-CanvasNoteEvent::CanvasNoteEvent(MidiRegionView& region, Item* item,
-               const boost::shared_ptr<NoteType> note)
+CanvasNoteEvent::CanvasNoteEvent(MidiRegionView& region, Item* item, const boost::shared_ptr<NoteType> note)
        : _region(region)
        , _item(item)
        , _text(0)
@@ -51,13 +56,15 @@ CanvasNoteEvent::CanvasNoteEvent(MidiRegionView& region, Item* item,
 {
 }
 
-CanvasNoteEvent::~CanvasNoteEvent() 
-{ 
+CanvasNoteEvent::~CanvasNoteEvent()
+{
+        CanvasNoteEventDeleted (this);
+
        if (_text) {
                _text->hide();
                delete _text;
        }
-       
+
        delete _channel_selector_widget;
 }
 
@@ -77,15 +84,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();
 }
@@ -100,7 +108,7 @@ CanvasNoteEvent::hide_velocity()
        }
 }
 
-void 
+void
 CanvasNoteEvent::on_channel_selection_change(uint16_t selection)
 {
        // make note change its color if its channel is not marked active
@@ -109,14 +117,14 @@ 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();
        _item->show();
 }
 
-void 
+void
 CanvasNoteEvent::on_channel_change(uint8_t channel)
 {
        _region.note_selected(this, true);
@@ -134,11 +142,11 @@ CanvasNoteEvent::show_channel_selector(void)
                _channel_selector->channel_selected.connect(
                        sigc::mem_fun(this, &CanvasNoteEvent::on_channel_change));
 
-               _channel_selector_widget = new Widget(*(_item->property_parent()), 
-                               x1(), 
-                               y2() + 2, 
+               _channel_selector_widget = new Widget(*(_item->property_parent()),
+                               x1(),
+                               y2() + 2,
                                (Gtk::Widget &) *_channel_selector);
-               
+
                _channel_selector_widget->hide();
                _channel_selector_widget->property_height() = 100;
                _channel_selector_widget->property_width() = 100;
@@ -160,7 +168,7 @@ CanvasNoteEvent::hide_channel_selector(void)
 }
 
 void
-CanvasNoteEvent::selected(bool selected)
+CanvasNoteEvent::set_selected(bool selected)
 {
        if (!_note) {
                return;
@@ -179,70 +187,64 @@ CanvasNoteEvent::selected(bool selected)
 
 #define SCALE_USHORT_TO_UINT8_T(x) ((x) / 257)
 
-uint32_t 
+uint32_t
 CanvasNoteEvent::base_color()
 {
        using namespace ARDOUR;
-       
+
        ColorMode mode = _region.color_mode();
-       
+
        const uint8_t min_opacity = 15;
        uint8_t       opacity = std::max(min_opacity, uint8_t(_note->velocity() + _note->velocity()));
-       
+
        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()), 
+                                       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);
                }
-               
+
        case ChannelColors:
-               return UINT_RGBA_CHANGE_A(CanvasNoteEvent::midi_channel_colors[_note->channel()], 
+               return UINT_RGBA_CHANGE_A(CanvasNoteEvent::midi_channel_colors[_note->channel()],
                                                  opacity);
-               
+
        default:
                return meter_style_fill_color(_note->velocity());
        };
-       
+
        return 0;
 }
 
 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();
                break;
 
        case GDK_LEAVE_NOTIFY:
-               //Keyboard::magic_widget_drop_focus();
                _region.note_left (this);
-               if (!selected()) {
-                       hide_velocity();
-               }
                break;
 
        case GDK_BUTTON_PRESS:
-               if (ev->button.button == 3) {
-                       show_channel_selector();
+                cerr << "button press, bton = " << ev->button.button << endl;
+               if (ev->button.button == 3 && Keyboard::no_modifiers_active (ev->button.state)) {
+                        show_channel_selector();
                        return true;
                }
                break;
 
        case GDK_BUTTON_RELEASE:
-               if (ev->button.button == 3) {
+               if (ev->button.button == 3 && Keyboard::no_modifiers_active (ev->button.state)) {
                        return true;
                }
                break;