X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;h=ac0d346522715896fc3c2e478a3a215a2b32619e;hb=d28562d25616842549f30b3d5c402aba20548970;hp=6530a503c7731fe43508dacf0b2fc2d9db543628;hpb=0d91a08ddeea3e07edb853e01f3b3dfde18ea7d7;p=scherzo

diff --git a/score.c b/score.c
index 6530a50..ac0d346 100644
--- a/score.c
+++ b/score.c
@@ -26,6 +26,9 @@ struct score_staff
 {
     score_clef_t clef;
 
+    score_chord_t **chords;
+    int num_chords;
+
     score_note_t **notes;
     int num_notes;
 
@@ -75,10 +78,10 @@ score_create (void *ctx)
 	return NULL;
 
     /* Also sets space_height and line_width */
-    score_set_staff_height (score, 24);
+    score_set_staff_height (score, 76);
 
     /* Just to have some nominal width. */
-    score->width = 800;
+    score->width = 1000;
 
     score->braces = NULL;
     score->num_braces = 0;
@@ -178,6 +181,38 @@ _score_note_to_line (score_staff_t *staff, score_note_t *note)
     return c_line - (name - SCORE_PITCH_NAME_C) / 2.0 - 3.5 * (note->octave - 4);
 }
 
+/* chord->width is updated as a side effect */
+static void
+_draw_chord (score_t *score, cairo_t *cr,
+	     score_staff_t *staff, score_chord_t *chord)
+{
+    cairo_text_extents_t chord_extents;
+    double total_staff_height;
+
+    /* XXX: The staff should manage this height itself. */
+    total_staff_height = (staff->upper_ledger_lines * score->space_height +
+			  score->staff_height +
+			  staff->lower_ledger_lines * score->space_height);
+
+    cairo_save (cr);
+
+    cairo_text_extents (cr, chord->name, &chord_extents);
+
+    cairo_select_font_face (cr, "serif", 0, 0);
+    cairo_set_font_size (cr, score->space_height * 3);
+
+    if (staff->clef == SCORE_CLEF_G)
+	cairo_move_to (cr, 0, - score->space_height * 0.5);
+    else
+	cairo_move_to (cr, 0, score->space_height * 0.5 + total_staff_height + chord_extents.y_bearing);
+
+    cairo_show_text (cr, chord->name);
+
+    chord->width = chord_extents.x_advance;
+
+    cairo_restore (cr);
+}
+
 static void
 _draw_note (score_t *score, cairo_t *cr,
 	    score_staff_t *staff, score_note_t *note)
@@ -243,7 +278,10 @@ _draw_note (score_t *score, cairo_t *cr,
 	}
     }
 
-    cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
+    cairo_set_source_rgb (cr,
+			  note->color.r,
+			  note->color.g,
+			  note->color.b);
     cairo_show_glyphs (cr, &note_glyph, 1);
 
     cairo_restore (cr);
@@ -297,6 +335,16 @@ _draw_staff (score_t *score, cairo_t *cr,
     /* Make space for clef before drawing notes */
     cairo_translate (cr, (int) (4 * score->space_height), 0);
 
+    /* Draw chord symbols */
+    cairo_save (cr);
+    {
+	for (i = 0; i < staff->num_chords; i++) {
+	    _draw_chord (score, cr, staff, staff->chords[i]);
+	    cairo_translate (cr, staff->chords[i]->width, 0.0);
+	}
+    }
+    cairo_restore (cr);
+
     /* Draw notes */
     for (i = 0; i < staff->num_notes; i++) {
 	_draw_note (score, cr, staff, staff->notes[i]);
@@ -406,6 +454,9 @@ score_add_staff (score_t *score, score_clef_t clef)
     staff->notes = NULL;
     staff->num_notes = 0;
 
+    staff->chords = NULL;
+    staff->num_chords = 0;
+
     staff->upper_ledger_lines = 0;
     staff->lower_ledger_lines = 0;
 
@@ -424,6 +475,61 @@ score_add_staff (score_t *score, score_clef_t clef)
     return staff;
 }
 
+score_chord_t *
+score_add_chord (score_staff_t *staff,
+		 const char *name)
+{
+    score_chord_t *chord;
+
+    chord = talloc (staff, score_chord_t);
+    if (chord == NULL)
+	return NULL;
+
+    chord->staff = staff;
+    chord->name = talloc_strdup (chord, name);
+
+    /* The width will get set correctly the first time _draw_chord is
+     * called. */
+    chord->width = 0.0;
+
+    staff->num_chords++;
+    staff->chords = talloc_realloc (staff,
+				    staff->chords,
+				    score_chord_t*,
+				    staff->num_chords);
+    if (staff->chords == NULL) {
+	staff->num_chords = 0;
+	return NULL;
+    }
+
+    staff->chords[staff->num_chords - 1] = chord;
+
+    return chord;
+}
+
+void
+score_remove_chord (score_chord_t *chord)
+{
+    score_staff_t *staff = chord->staff;
+    int i;
+
+    for (i = 0; i < staff->num_chords; i++)
+	if (staff->chords[i] == chord)
+	    break;
+
+    if (i == staff->num_chords)
+	return;
+
+    if (i < staff->num_chords - 1)
+    {
+	memmove (staff->chords + i,
+		 staff->chords + i + 1, 
+		 (staff->num_chords - 1 - i) * sizeof (score_chord_t *));
+    }
+
+    staff->num_chords -= 1;
+}
+
 score_note_t *
 score_add_note (score_staff_t *staff,
 		score_pitch_t pitch,
@@ -432,6 +538,18 @@ score_add_note (score_staff_t *staff,
 {
     score_note_t *note;
     double line;
+    int i;
+
+    /* Return existing note if already present. */
+    for (i = 0; i < staff->num_notes; i++) {
+	note = staff->notes[i];
+	if (note->pitch == pitch &&
+	    note->octave == octave &&
+	    note->duration == duration)
+	{
+	    return note;
+	}
+    }
 
     note = talloc (staff, score_note_t);
     if (note == NULL)
@@ -442,6 +560,10 @@ score_add_note (score_staff_t *staff,
     note->octave = octave;
     note->duration = duration;
 
+    note->color.r = 0.0;
+    note->color.g = 0.0;
+    note->color.b = 0.0;
+
     line = _score_note_to_line (staff, note);
     if (line < 0) {
 	int lines = (int) (- line);
@@ -489,6 +611,22 @@ score_remove_note (score_note_t *note)
     }
 
     staff->num_notes -= 1;
+
+    if (staff->num_notes == 0) {
+	staff->upper_ledger_lines = 0;
+	staff->lower_ledger_lines = 0;
+    }
+}
+
+void
+score_set_note_color_rgb (score_note_t *note,
+			  double r,
+			  double g,
+			  double b)
+{
+    note->color.r = r;
+    note->color.g = g;
+    note->color.b = b;
 }
 
 score_note_t *