X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;h=db07d5e9d57f33436688db8741d2a4442d519760;hb=6d1dd804ce022f0fbc3cebc853edcab5c81d5abc;hp=fb54b95ea4c6c72575ee30f971dde29252324c12;hpb=7e2ab4eb3ab1fc670d9a0150996d682e7f55f183;p=scherzo

diff --git a/score.c b/score.c
index fb54b95..db07d5e 100644
--- a/score.c
+++ b/score.c
@@ -18,6 +18,8 @@
  * along with this program.  If not, see http://www.gnu.org/licenses/ .
  */
 
+#include <string.h>
+
 #include "score.h"
 
 struct score_staff
@@ -26,6 +28,13 @@ struct score_staff
 
     score_note_t **notes;
     int num_notes;
+
+    /* How many ledger lines are needed for current notes */
+    int upper_ledger_lines;
+    int lower_ledger_lines;
+
+    /* Y position of top full line of staff */
+    int y_pos;
 };
 
 typedef struct score_brace
@@ -36,7 +45,7 @@ typedef struct score_brace
 
 struct score
 {
-    /* Height of a single staff */
+    /* Nominal height of a single staff (ledger lines may make it larger) */
     int staff_height;
 
     /* Height of one space within a staff */
@@ -56,13 +65,6 @@ struct score
     int num_staves;
 };
 
-typedef struct score_note
-{
-    score_pitch_t pitch;
-    int octave;
-    score_duration_t duration;
-} score_note_t;
-
 score_t *
 score_create (void *ctx)
 {
@@ -73,10 +75,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;
@@ -113,9 +115,16 @@ _draw_brace (score_t *score, cairo_t *cr,
 {
     cairo_glyph_t brace_glyph;
     cairo_text_extents_t brace_extents;
+    double top, bottom;
+
+    if (brace->num_staves == 0)
+	return;
 
     cairo_save (cr);
 
+    top = score->staves[brace->first_staff]->y_pos;
+    bottom = score->staves[brace->first_staff + brace->num_staves - 1]->y_pos + score->staff_height;
+
     cairo_select_font_face (cr, "Gonville-Brace", 0, 0);
 
     /* XXX: This hard-coded glyph index is pretty ugly. We should
@@ -125,13 +134,13 @@ _draw_brace (score_t *score, cairo_t *cr,
      * than just the bare index here). */
     brace_glyph.index = 300;
     brace_glyph.x = 0;
-    brace_glyph.y = score->staff_height * (brace->first_staff + (2 * brace->num_staves - 1) / 2.0) + 1;
+    brace_glyph.y = top + (bottom - top) / 2.0 + score->line_width / 2.0;
 
     /* XXX: This font size (in conjunction with the glyph selection)
      * is a rough guess at best. We should figure out how the brace
      * font is intended to be used and actually measure to find the
      * correctly-sized glyph. */
-    cairo_set_font_size (cr, (score->staff_height * 3) / 3.85);
+    cairo_set_font_size (cr, (bottom - top) / 3.85);
 
     cairo_glyph_extents (cr, &brace_glyph, 1, &brace_extents);
 
@@ -146,15 +155,114 @@ _draw_brace (score_t *score, cairo_t *cr,
     *brace_width = (int) -brace_extents.x_bearing;
 }
 
+/* Line containing middle C for the given clef. */
+static int
+_score_clef_c_line (score_clef_t clef)
+{
+    switch (clef)
+    {
+    default:
+    case SCORE_CLEF_G:
+	return 5;
+    case SCORE_CLEF_F:
+	return -1;
+    }
+}
+
+static double
+_score_note_to_line (score_staff_t *staff, score_note_t *note)
+{
+    score_pitch_name_t name = SCORE_PITCH_NAME (note->pitch);
+    int c_line = _score_clef_c_line (staff->clef);
+
+    return c_line - (name - SCORE_PITCH_NAME_C) / 2.0 - 3.5 * (note->octave - 4);
+}
+
+static void
+_draw_note (score_t *score, cairo_t *cr,
+	    score_staff_t *staff, score_note_t *note)
+{
+    double line;
+    cairo_glyph_t note_glyph;
+    static double extend_factor = 0.25;
+
+    void _draw_ledger_line (double line, double width) {
+	cairo_move_to (cr,
+		       - width * extend_factor / 2.0,
+		       score->space_height * line + score->line_width / 2.0);
+	cairo_rel_line_to (cr, (1 + extend_factor) * width, 0);
+	cairo_stroke (cr);
+    }
+
+    cairo_save (cr);
+
+    /* Which line should the note appear on? Line 0 is the top line of
+     * the staff and increasing downwards. (Negative values indicate a
+     * note on a ledger line above the staff). Values half way between
+     * integers indicate notes appearing on a space between two staff
+     * lines (or ledger lines). */
+    line = _score_note_to_line (staff, note);
+
+    cairo_select_font_face (cr, "Gonville-26", 0, 0);
+    cairo_set_font_size (cr, score->staff_height);
+
+    /* XXX: The hard-coded glyph indices here are very ugly. We should
+     * figure out how to lookup glyphs by name from this font. */
+    switch (note->duration) {
+    case SCORE_DURATION_1:
+	note_glyph.index = 127;
+	break;
+    case SCORE_DURATION_2:
+	note_glyph.index = 85;
+	break;
+    case SCORE_DURATION_4:
+    case SCORE_DURATION_8:
+    case SCORE_DURATION_16:
+    case SCORE_DURATION_32:
+    case SCORE_DURATION_64:
+    case SCORE_DURATION_128:
+    default:
+	note_glyph.index = 84;
+    }
+
+    note_glyph.x = 0;
+    note_glyph.y = score->space_height * line;
+
+    if (line < 0 || line > 4) {
+	int i;
+	cairo_text_extents_t note_extents;
+
+	cairo_glyph_extents (cr, &note_glyph, 1, &note_extents);
+
+	if (line < 0) {
+	    for (i = -1; i >= line; i--)
+		_draw_ledger_line (i, note_extents.width);
+	} else {
+	    for (i = 5; i <= line; i++)
+		_draw_ledger_line (i, note_extents.width);
+	}
+    }
+
+    cairo_set_source_rgb (cr,
+			  note->color.r,
+			  note->color.g,
+			  note->color.b);
+    cairo_show_glyphs (cr, &note_glyph, 1);
+
+    cairo_restore (cr);
+}
+
 static void
 _draw_staff (score_t *score, cairo_t *cr,
 	     score_staff_t *staff, int staff_width)
 {
     int i;
-    cairo_glyph_t glyph;
+    cairo_glyph_t clef_glyph;
 
     cairo_save (cr);
 
+    cairo_translate (cr, 0, staff->y_pos);
+
     cairo_select_font_face (cr, "Gonville-26", 0, 0);
 
     cairo_set_font_size (cr, score->staff_height);
@@ -164,27 +272,22 @@ _draw_staff (score_t *score, cairo_t *cr,
     switch (staff->clef) {
     case SCORE_CLEF_G:
     default:
-	glyph.index = 46;
-	glyph.y = 3 * score->space_height;
+	clef_glyph.index = 46;
+	clef_glyph.y = 3 * score->space_height;
 	break;
     case SCORE_CLEF_F:
-	glyph.index = 45;
-	glyph.y = 1 * score->space_height;
+	clef_glyph.index = 45;
+	clef_glyph.y = 1 * score->space_height;
 	break;
     }
-    glyph.x = 3 * score->line_width;
-    glyph.y += 1;
+    clef_glyph.x = 3 * score->line_width;
+    clef_glyph.y += score->line_width / 2.0;
 
     cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
-    cairo_show_glyphs (cr, &glyph, 1);
+    cairo_show_glyphs (cr, &clef_glyph, 1);
 
-    cairo_rectangle (cr,
-		     score->line_width / 2.0,
-		     score->line_width / 2.0,
-		     staff_width - score->line_width,
-		     score->space_height * 4);
-    
-    for (i = 1; i < 4; i++) {
+    /* Draw staff lines */
+    for (i = 0; i < 5; i++) {
 	cairo_move_to (cr, 0, i * score->space_height + score->line_width / 2.0);
 	cairo_rel_line_to (cr, staff_width, 0);
     }
@@ -194,6 +297,17 @@ _draw_staff (score_t *score, cairo_t *cr,
     cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
     cairo_stroke (cr);
 
+    /* Make space for clef before drawing notes */
+    cairo_translate (cr, (int) (4 * score->space_height), 0);
+
+    /* Draw notes */
+    for (i = 0; i < staff->num_notes; i++) {
+	_draw_note (score, cr, staff, staff->notes[i]);
+	/* Draw all notes concurrent for now (as a chord)
+	cairo_translate (cr, score->space_height * 2.0, 0);
+	*/
+    }
+
     cairo_restore (cr);
 }
 
@@ -202,9 +316,25 @@ score_draw (score_t *score, cairo_t *cr)
 {
     int i;
     int staff_width = score->width;
+    int staff_y_pos;
+
+    if (score->num_staves == 0)
+	return;
 
     cairo_save (cr);
 
+    /* Before drawing anything, position each staff based on the size
+     * of each (including ledger lines) */
+    staff_y_pos = 0;
+    for (i = 0; i < score->num_staves; i++) {
+	score_staff_t *staff = score->staves[i];
+	staff_y_pos += staff->upper_ledger_lines * score->space_height;
+	staff->y_pos = staff_y_pos;
+	staff_y_pos += (score->staff_height +
+			staff->lower_ledger_lines * score->space_height +
+			score->staff_height);
+    }
+
     if (score->num_braces)
     {
 	int brace_width;
@@ -224,16 +354,16 @@ score_draw (score_t *score, cairo_t *cr)
     /* Vertical lines at each end */
     cairo_rectangle (cr,
 		     score->line_width / 2.0,
-		     score->line_width / 2.0,
+		     score->staves[0]->y_pos + score->line_width / 2.0,
 		     staff_width - score->line_width,
-		     score->staff_height * 3);
+		     score->staves[score->num_staves-1]->y_pos + score->staff_height - score->staves[0]->y_pos);
     cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
     cairo_set_line_width (cr, score->line_width);
     cairo_stroke (cr);
 
     for (i = 0; i < score->num_staves; i++) {
-	_draw_staff (score, cr, score->staves[i], staff_width);
-	cairo_translate (cr, 0, 2 * score->staff_height);
+	score_staff_t *staff = score->staves[i];
+	_draw_staff (score, cr, staff, staff_width);
     }
 
     cairo_restore (cr);
@@ -279,6 +409,9 @@ score_add_staff (score_t *score, score_clef_t clef)
     staff->notes = NULL;
     staff->num_notes = 0;
 
+    staff->upper_ledger_lines = 0;
+    staff->lower_ledger_lines = 0;
+
     score->num_staves++;
     score->staves = talloc_realloc (score,
 				    score->staves,
@@ -295,21 +428,38 @@ score_add_staff (score_t *score, score_clef_t clef)
 }
 
 score_note_t *
-score_staff_add_note (score_staff_t *staff,
-		      score_pitch_t pitch,
-		      int octave,
-		      score_duration_t duration)
+score_add_note (score_staff_t *staff,
+		score_pitch_t pitch,
+		int octave,
+		score_duration_t duration)
 {
     score_note_t *note;
+    double line;
 
     note = talloc (staff, score_note_t);
     if (note == NULL)
 	return NULL;
 
+    note->staff = staff;
     note->pitch = pitch;
     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);
+	if (lines > staff->upper_ledger_lines)
+	    staff->upper_ledger_lines = lines;
+    } else {
+	int lines = (int) (line - 4);
+	if (lines > staff->lower_ledger_lines)
+	    staff->lower_ledger_lines = lines;
+    }
+
     staff->num_notes++;
     staff->notes = talloc_realloc (staff,
 				   staff->notes,
@@ -325,3 +475,64 @@ score_staff_add_note (score_staff_t *staff,
     return note;
 }
 
+void
+score_remove_note (score_note_t *note)
+{
+    score_staff_t *staff = note->staff;
+    int i;
+
+    for (i = 0; i < staff->num_notes; i++)
+	if (staff->notes[i] == note)
+	    break;
+
+    if (i == staff->num_notes)
+	return;
+
+    if (i < staff->num_notes - 1)
+    {
+	memmove (staff->notes + i,
+		 staff->notes + i + 1, 
+		 (staff->num_notes - 1 - i) * sizeof (score_note_t *));
+    }
+
+    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 *
+score_staff_find_note (score_staff_t *staff,
+		       score_pitch_t pitch,
+		       int octave,
+		       score_duration_t duration)
+{
+    int i;
+    score_note_t *note;
+
+    for (i = 0; i < staff->num_notes; i++) {
+	note = staff->notes[i];
+	if (note->pitch == pitch &&
+	    note->octave == octave &&
+	    note->duration == duration)
+	{
+	    return note;
+	}
+    }
+
+    return NULL;
+}
+