X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpiano_roll_header.cc;h=8a67ec75016c0e145359ee97b3e05960eeef4e52;hb=20ea90a186748f34061fec323faa74f084c7937c;hp=b041bb3a89aaeb31d00f4498219ba129145d2aa5;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git

diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc
index b041bb3a89..8a67ec7501 100644
--- a/gtk2_ardour/piano_roll_header.cc
+++ b/gtk2_ardour/piano_roll_header.cc
@@ -22,9 +22,11 @@
 
 #include "gtkmm2ext/keyboard.h"
 
+#include "editing.h"
 #include "piano_roll_header.h"
 #include "midi_time_axis.h"
 #include "midi_streamview.h"
+#include "public_editor.h"
 
 const int no_note = 0xff;
 
@@ -172,16 +174,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) {
@@ -465,26 +467,39 @@ 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 (editor().current_mouse_mode() == Editing::MouseRange) {
+			
+			/* select note range */
 
-		/* 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 (Keyboard::no_modifiers_active (ev->state)) {
+				AddNoteSelection (note); // EMIT SIGNAL
+			}
 
-			_clicked_note = note;
+		} else {
+			
+			/* play notes */
 
-			if (!_active_notes[note]) {
-				_active_notes[note] = true;
-				send_note_on(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);
+				
+				_clicked_note = note;
+				
+				if (!_active_notes[note]) {
+					_active_notes[note] = true;
+					send_note_on(note);
+				}
 			}
 		}
 	}
@@ -498,26 +513,26 @@ bool
 PianoRollHeader::on_button_press_event (GdkEventButton* ev)
 {
 	int note = _view.y_to_note(ev->y);
-
-	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;
-
-			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);
-			}
+	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);
 		}
 	}
 
@@ -529,8 +544,7 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev)
 {
 	int note = _view.y_to_note(ev->y);
 
-	if (ev->button == 2) {
-		send_note_off (note);
+	if (editor().current_mouse_mode() == Editing::MouseRange) {
 
 		if (Keyboard::no_modifiers_active (ev->state)) {
 			AddNoteSelection (note); // EMIT SIGNAL
@@ -539,12 +553,11 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev)
 		} 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);
@@ -552,6 +565,7 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev)
 		}
 	}
 
+	_dragging = false;
 	return true;
 }
 
@@ -694,3 +708,9 @@ PianoRollHeader::reset_clicked_note (uint8_t note, bool invalidate)
 		invalidate_note_range (note, note);
 	}
 }
+
+PublicEditor&
+PianoRollHeader::editor() const
+{
+	return _view.trackview().editor();
+}