X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpiano_roll_header.cc;h=043f6c546e95a61d0ddf161b4faab79cf5671665;hb=9a45e0fde9eb6297ea4cc246aa2ef5d085ebe49b;hp=e784242ff1247319ab2bf0e56f641d466b262ccb;hpb=7000afdc66c9e0ae8dcf9ec080517dabba1e7f34;p=ardour.git

diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc
index e784242ff1..043f6c546e 100644
--- a/gtk2_ardour/piano_roll_header.cc
+++ b/gtk2_ardour/piano_roll_header.cc
@@ -28,18 +28,16 @@
 #include "midi_streamview.h"
 #include "public_editor.h"
 
-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);
+PianoRollHeader::Color PianoRollHeader::white_highlight = PianoRollHeader::Color(1.00f, 0.40f, 0.40f);
 PianoRollHeader::Color PianoRollHeader::white_shade_light = PianoRollHeader::Color(0.95f, 0.95f, 0.95f);
 PianoRollHeader::Color PianoRollHeader::white_shade_dark = PianoRollHeader::Color(0.56f, 0.56f, 0.56f);
 
 PianoRollHeader::Color PianoRollHeader::black = PianoRollHeader::Color(0.24f, 0.24f, 0.24f);
-PianoRollHeader::Color PianoRollHeader::black_highlight = PianoRollHeader::Color(0.30f, 0.30f, 0.30f);
+PianoRollHeader::Color PianoRollHeader::black_highlight = PianoRollHeader::Color(0.60f, 0.10f, 0.10f);
 PianoRollHeader::Color PianoRollHeader::black_shade_light = PianoRollHeader::Color(0.46f, 0.46f, 0.46f);
 PianoRollHeader::Color PianoRollHeader::black_shade_dark = PianoRollHeader::Color(0.1f, 0.1f, 0.1f);
 
@@ -67,8 +65,8 @@ PianoRollHeader::Color::set(const PianoRollHeader::Color& c)
 
 PianoRollHeader::PianoRollHeader(MidiStreamView& v)
 	: _view(v)
-	, _highlighted_note(no_note)
-	, _clicked_note(no_note)
+	, _highlighted_note(NO_MIDI_NOTE)
+	, _clicked_note(NO_MIDI_NOTE)
 	, _dragging(false)
 {
 	add_events (Gdk::BUTTON_PRESS_MASK |
@@ -174,16 +172,16 @@ render_dga(Cairo::RefPtr<Cairo::Context> cr, int /*note*/, double x[], double y[
 void
 PianoRollHeader::get_path(PianoRollHeader::ItemType note_type, int note, double x[], double y[])
 {
-	double y_pos = floor(_view.note_to_y(note)) - 0.5f;
+	double y_pos = floor(_view.note_to_y(note)) + 1.5f;
 	double note_height;
-	double other_y1 = floor(_view.note_to_y(note+1)) + floor(_note_height / 2.0f) + 0.5f;
-	double other_y2 = floor(_view.note_to_y(note-1)) + floor(_note_height / 2.0f) - 1.0f;
+	double other_y1 = floor(_view.note_to_y(note+1)) + floor(_note_height / 2.0f) + 2.5f;
+	double other_y2 = floor(_view.note_to_y(note-1)) + floor(_note_height / 2.0f) + 1.0f;
 	double width = get_width();
 
 	if (note == 0) {
-		note_height = floor(_view.contents_height()) - y_pos;
+		note_height = floor(_view.contents_height()) - y_pos + 2.;
 	} else {
-		note_height = floor(_view.note_to_y(note - 1)) - y_pos;
+		note_height = floor(_view.note_to_y(note - 1)) - y_pos + 2.;
 	}
 
 	switch (note_type) {
@@ -463,12 +461,13 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev)
 bool
 PianoRollHeader::on_motion_notify_event (GdkEventMotion* ev)
 {
+	int note = _view.y_to_note(ev->y);
+	set_note_highlight (note);
+
 	if (_dragging) {
 
-		int note = _view.y_to_note(ev->y);
+		if ( false /*editor().current_mouse_mode() == Editing::MouseRange*/ ) {   //ToDo:  fix this.  this mode is buggy, and of questionable utility anyway
 
-		if (editor().current_mouse_mode() == Editing::MouseRange) {
-			
 			/* select note range */
 
 			if (Keyboard::no_modifiers_active (ev->state)) {
@@ -476,26 +475,14 @@ PianoRollHeader::on_motion_notify_event (GdkEventMotion* ev)
 			}
 
 		} else {
-			
 			/* play notes */
-
-			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) {
+			/* redraw already taken care of above in set_note_highlight */
+			if (_clicked_note != NO_MIDI_NOTE && _clicked_note != note) {
 				_active_notes[_clicked_note] = false;
 				send_note_off(_clicked_note);
-				
+
 				_clicked_note = note;
-				
+
 				if (!_active_notes[note]) {
 					_active_notes[note] = true;
 					send_note_on(note);
@@ -513,25 +500,23 @@ bool
 PianoRollHeader::on_button_press_event (GdkEventButton* ev)
 {
 	int note = _view.y_to_note(ev->y);
-
-	if (ev->button == 2 && ev->type == GDK_BUTTON_PRESS) {
-		if (Keyboard::no_modifiers_active (ev->state)) {
-			SetNoteSelection (note); // EMIT SIGNAL
-			return true;
-		}
-		return false;
-	}
-	
-	if (ev->button == 1 && ev->type == GDK_BUTTON_PRESS && note >= 0 && note < 128) {
-		
+	bool tertiary = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
+
+	if (ev->button == 2 && Keyboard::no_modifiers_active (ev->state)) {
+		SetNoteSelection (note); // EMIT SIGNAL
+		return true;
+	} else if (tertiary && (ev->button == 1 || ev->button == 2)) {
+		ExtendNoteSelection (note); // EMIT SIGNAL
+		return true;
+	} else if (ev->button == 1 && note >= 0 && note < 128) {
 		add_modal_grab();
 		_dragging = true;
-		
+
 		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);
@@ -546,7 +531,7 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev)
 {
 	int note = _view.y_to_note(ev->y);
 
-	if (editor().current_mouse_mode() == Editing::MouseRange) {
+	if (false /*editor().current_mouse_mode() == Editing::MouseRange*/ ) {  //Todo:  this mode is buggy, and of questionable utility anyway
 
 		if (Keyboard::no_modifiers_active (ev->state)) {
 			AddNoteSelection (note); // EMIT SIGNAL
@@ -555,7 +540,7 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev)
 		} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::RangeSelectModifier)) {
 			ExtendNoteSelection (note); // EMIT SIGNAL
 		}
-		
+
 	} else {
 
 		if (_dragging) {
@@ -571,12 +556,31 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev)
 	return true;
 }
 
+void
+PianoRollHeader::set_note_highlight (uint8_t note) {
+	if (_highlighted_note == note) {
+		return;
+	}
+
+	if (_highlighted_note != NO_MIDI_NOTE) {
+		if (note > _highlighted_note) {
+			invalidate_note_range (_highlighted_note, note);
+		} else {
+			invalidate_note_range (note, _highlighted_note);
+		}
+	}
+
+	_highlighted_note = note;
+
+	if (_highlighted_note != NO_MIDI_NOTE) {
+		invalidate_note_range (_highlighted_note, _highlighted_note);
+	}
+}
+
 bool
 PianoRollHeader::on_enter_notify_event (GdkEventCrossing* ev)
 {
-	_highlighted_note = _view.y_to_note(ev->y);
-
-	invalidate_note_range(_highlighted_note, _highlighted_note);
+	set_note_highlight (_view.y_to_note(ev->y));
 	return true;
 }
 
@@ -585,11 +589,11 @@ PianoRollHeader::on_leave_notify_event (GdkEventCrossing*)
 {
 	invalidate_note_range(_highlighted_note, _highlighted_note);
 
-	if (_clicked_note != no_note) {
+	if (_clicked_note != NO_MIDI_NOTE) {
 		reset_clicked_note(_clicked_note, _clicked_note != _highlighted_note);
 	}
 
-	_highlighted_note = no_note;
+	_highlighted_note = NO_MIDI_NOTE;
 	return true;
 }
 
@@ -704,7 +708,7 @@ void
 PianoRollHeader::reset_clicked_note (uint8_t note, bool invalidate)
 {
 	_active_notes[note] = false;
-	_clicked_note = no_note;
+	_clicked_note = NO_MIDI_NOTE;
 	send_note_off (note);
 	if (invalidate) {
 		invalidate_note_range (note, note);