X-Git-Url: https://git.cworth.org/git?p=scherzo;a=blobdiff_plain;f=scherzo.c;h=b9a463368b86129dd1eee0cdd74cdabcecf7b561;hp=ae95d647ff5f393769858b08455f495721afdc30;hb=5a43b0324c6353c1541a3c1fad52e2f040ab389d;hpb=265293b2749e886423099c3ead8825464bcd759a

diff --git a/scherzo.c b/scherzo.c
index ae95d64..b9a4633 100644
--- a/scherzo.c
+++ b/scherzo.c
@@ -60,9 +60,11 @@ typedef struct scherzo
     score_staff_t *bass;
     score_chord_t *chord;
 
-    /* This is for a "computer keyboard". Any "piano keyboard" key
-     * knows its own octave. */
+    /* The word "keyboard" here is referring to a "computer
+     * keyboard". Any "piano keyboard" key knows its own octave and
+     * accidental already. */
     int keyboard_octave;
+    score_pitch_accidental_t keyboard_accidental;
 
     int midi_fd;
     snd_midi_event_t *snd_midi_event;
@@ -145,6 +147,7 @@ on_key_press_event (GtkWidget *widget,
 {
     scherzo_t *scherzo = user_data;
     int octave;
+    score_pitch_name_t pitch_name;
     score_pitch_t pitch;
 
     if (scherzo->challenge.note)
@@ -174,31 +177,31 @@ on_key_press_event (GtkWidget *widget,
 	return FALSE;
     case GDK_KEY_c:
     case GDK_KEY_C:
-	pitch = SCORE_PITCH_C;
+	pitch_name = SCORE_PITCH_NAME_C;
 	break;
     case GDK_KEY_d:
     case GDK_KEY_D:
-	pitch = SCORE_PITCH_D;
+	pitch_name = SCORE_PITCH_NAME_D;
 	break;
     case GDK_KEY_e:
     case GDK_KEY_E:
-	pitch = SCORE_PITCH_E;
+	pitch_name = SCORE_PITCH_NAME_E;
 	break;
     case GDK_KEY_f:
     case GDK_KEY_F:
-	pitch = SCORE_PITCH_F;
+	pitch_name = SCORE_PITCH_NAME_F;
 	break;
     case GDK_KEY_g:
     case GDK_KEY_G:
-	pitch = SCORE_PITCH_G;
+	pitch_name = SCORE_PITCH_NAME_G;
 	break;
     case GDK_KEY_a:
     case GDK_KEY_A:
-	pitch = SCORE_PITCH_A;
+	pitch_name = SCORE_PITCH_NAME_A;
 	break;
     case GDK_KEY_b:
     case GDK_KEY_B:
-	pitch = SCORE_PITCH_B;
+	pitch_name = SCORE_PITCH_NAME_B;
 	break;
     case GDK_KEY_0:
     case GDK_KEY_1:
@@ -214,8 +217,18 @@ on_key_press_event (GtkWidget *widget,
     case GDK_KEY_space:
 	scherzo_press_pedal (scherzo);
 	break;
+    case GDK_KEY_Up:
+	if (scherzo->keyboard_accidental < SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP)
+	    scherzo->keyboard_accidental++;
+	break;
+    case GDK_KEY_Down:
+	if (scherzo->keyboard_accidental > SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT)
+	    scherzo->keyboard_accidental--;
+	break;
     }
 
+    pitch = SCORE_PITCH (pitch_name, scherzo->keyboard_accidental);
+
     if ((key->keyval >= GDK_KEY_A && key->keyval <= GDK_KEY_G) ||
 	(key->keyval >= GDK_KEY_a && key->keyval <= GDK_KEY_g))
     {
@@ -240,6 +253,7 @@ on_key_release_event (unused (GtkWidget *widget),
 {
     scherzo_t *scherzo = user_data;
     int octave;
+    score_pitch_name_t pitch_name;
     score_pitch_t pitch;
 
     if (scherzo->challenge.note)
@@ -250,37 +264,39 @@ on_key_release_event (unused (GtkWidget *widget),
     switch (key->keyval) {
     case GDK_KEY_c:
     case GDK_KEY_C:
-	pitch = SCORE_PITCH_C;
+	pitch_name = SCORE_PITCH_NAME_C;
 	break;
     case GDK_KEY_d:
     case GDK_KEY_D:
-	pitch = SCORE_PITCH_D;
+	pitch_name = SCORE_PITCH_NAME_D;
 	break;
     case GDK_KEY_e:
     case GDK_KEY_E:
-	pitch = SCORE_PITCH_E;
+	pitch_name = SCORE_PITCH_NAME_E;
 	break;
     case GDK_KEY_f:
     case GDK_KEY_F:
-	pitch = SCORE_PITCH_F;
+	pitch_name = SCORE_PITCH_NAME_F;
 	break;
     case GDK_KEY_g:
     case GDK_KEY_G:
-	pitch = SCORE_PITCH_G;
+	pitch_name = SCORE_PITCH_NAME_G;
 	break;
     case GDK_KEY_a:
     case GDK_KEY_A:
-	pitch = SCORE_PITCH_A;
+	pitch_name = SCORE_PITCH_NAME_A;
 	break;
     case GDK_KEY_b:
     case GDK_KEY_B:
-	pitch = SCORE_PITCH_B;
+	pitch_name = SCORE_PITCH_NAME_B;
 	break;
     case GDK_KEY_space:
 	scherzo_release_pedal (scherzo);
 	break;
     }
 
+    pitch = SCORE_PITCH (pitch_name, scherzo->keyboard_accidental);
+
     if ((key->keyval >= GDK_KEY_A && key->keyval <= GDK_KEY_G) ||
 	(key->keyval >= GDK_KEY_a && key->keyval <= GDK_KEY_g))
     {
@@ -484,14 +500,14 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 
     struct { int pitches[4]; const char *name; } sevenths[] = {
 	{ {0, 4, 8, 11}, "Augmented/major 7" },
+	{ {0, 4, 8, 10}, "Augmented 7" },
 	{ {0, 4, 7, 11}, "Major 7" },
 	{ {0, 4, 7, 10}, "Dominant 7" },
 	{ {0, 3, 7, 11}, "Minor/major 7" },
 	{ {0, 3, 7, 10}, "Minor 7" },
-	{ {0, 3, 6, 10}, "Half-diminished 7" },
-	{ {0, 3, 6, 9},  "Diminished 7" },
-	{ {0, 4, 8, 10}, "Augmented 7" },
 	{ {0, 3, 6, 11}, "Diminished/major 7" },
+	{ {0, 3, 6, 10}, "Half-diminished 7" },
+	{ {0, 3, 6, 9},  "Diminished 7" }
     };
 
     if (scherzo->chord) {
@@ -556,24 +572,31 @@ scherzo_analyze_chord (scherzo_t *scherzo)
 	    }
     }
 
-    for (i = 0; i < ARRAY_SIZE (octaves); i++) {
-	if (_chord_signature_matches (notes, num_notes, octaves[i].pitches, 1))
-	    chord_name = octaves[i].name;
-    }
-
-    for (i = 0; i < ARRAY_SIZE (intervals); i++) {
-	if (_chord_signature_matches (notes, num_notes, intervals[i].pitches, 2))
-	    chord_name = intervals[i].name;
-    }
-
-    for (i = 0; i < ARRAY_SIZE (triads); i++) {
-	if (_chord_signature_matches (notes, num_notes, triads[i].pitches, 3))
-	    chord_name = triads[i].name;
-    }
-
-    for (i = 0; i < ARRAY_SIZE(sevenths); i++) {
-	if (_chord_signature_matches (notes, num_notes, sevenths[i].pitches, 4))
-	    chord_name = sevenths[i].name;
+    switch (num_notes) {
+    case 1:
+	for (i = 0; i < ARRAY_SIZE (octaves); i++) {
+	    if (_chord_signature_matches (notes, num_notes, octaves[i].pitches, 1))
+		chord_name = octaves[i].name;
+	}
+	break;
+    case 2:
+	for (i = 0; i < ARRAY_SIZE (intervals); i++) {
+	    if (_chord_signature_matches (notes, num_notes, intervals[i].pitches, 2))
+		chord_name = intervals[i].name;
+	}
+	break;
+    case 3:
+	for (i = 0; i < ARRAY_SIZE (triads); i++) {
+	    if (_chord_signature_matches (notes, num_notes, triads[i].pitches, 3))
+		chord_name = triads[i].name;
+	}
+	break;
+    case 4:
+	for (i = 0; i < ARRAY_SIZE(sevenths); i++) {
+	    if (_chord_signature_matches (notes, num_notes, sevenths[i].pitches, 4))
+		chord_name = sevenths[i].name;
+	}
+	break;
     }
 
     if (chord_name)
@@ -800,25 +823,25 @@ _select_challenge (scherzo_t *scherzo)
 
     switch (*s) {
     case 'C':
-	pitch = SCORE_PITCH_VALUE(C, NATURAL);
+	pitch = SCORE_PITCH_C;
 	break;
     case 'D':
-	pitch = SCORE_PITCH_VALUE(D, NATURAL);
+	pitch = SCORE_PITCH_D;
 	break;
     case 'E':
-	pitch = SCORE_PITCH_VALUE(E, NATURAL);
+	pitch = SCORE_PITCH_E;
 	break;
     case 'F':
-	pitch = SCORE_PITCH_VALUE(F, NATURAL);
+	pitch = SCORE_PITCH_F;
 	break;
     case 'G':
-	pitch = SCORE_PITCH_VALUE(G, NATURAL);
+	pitch = SCORE_PITCH_G;
 	break;
     case 'A':
-	pitch = SCORE_PITCH_VALUE(A, NATURAL);
+	pitch = SCORE_PITCH_A;
 	break;
     case 'B':
-	pitch = SCORE_PITCH_VALUE(B, NATURAL);
+	pitch = SCORE_PITCH_B;
 	break;
     default:
 	fprintf (stderr, "Malformed pitch name: %s (expected 'A' - 'G')\n", s);
@@ -976,8 +999,9 @@ main (int argc, char *argv[])
 
     scherzo.chord = NULL;
 
-    /* Default to octave 4 for computer keyboard keypresses. */
+    /* Default to octave 4 and natural for computer keyboard keypresses. */
     scherzo.keyboard_octave = 4;
+    scherzo.keyboard_accidental = SCORE_PITCH_ACCIDENTAL_NATURAL;
 
     note_group_init (scherzo.ctx, &scherzo.notes_pressed);
     note_group_init (scherzo.ctx, &scherzo.notes_pedaled);