X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;h=fe7622d85e4acd5c4fc45cd707df961017995380;hb=73ba6a9e9a9308747fd0fa301e1a349746eaf47c;hp=26c5a02818e6ba60ad6f77c7e00141719ff16ddb;hpb=dd9b9d386cfb63002f3e8d1521b25abfa58b76e5;p=scherzo diff --git a/score.c b/score.c index 26c5a02..fe7622d 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,17 +181,50 @@ _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) { double line; - cairo_glyph_t note_glyph; + cairo_glyph_t note_glyph[2]; static double extend_factor = 0.25; + cairo_text_extents_t extents; + int num_glyphs = 0; - void _draw_ledger_line (double line, double width) { - cairo_move_to (cr, - - width * extend_factor / 2.0, + void _draw_ledger_line (double line, double offset, double width) { + cairo_move_to (cr, offset - extend_factor * width / 2.0, score->space_height * line + score->line_width / 2.0); cairo_rel_line_to (cr, (1 + extend_factor) * width, 0); cairo_stroke (cr); @@ -196,6 +232,11 @@ _draw_note (score_t *score, cairo_t *cr, cairo_save (cr); + /* Move right so that X==0 is natural position for non-displaced + * noteheads. + */ + cairo_translate (cr, score->space_height, 0); + /* 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 @@ -208,12 +249,45 @@ _draw_note (score_t *score, cairo_t *cr, /* XXX: The hard-coded glyph indices here are very ugly. We should * figure out how to lookup glyphs by name from this font. */ + switch (SCORE_PITCH_ACCIDENTAL (note->pitch)) { + case SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT: + note_glyph[num_glyphs].index = 77; + break; + case SCORE_PITCH_ACCIDENTAL_FLAT: + note_glyph[num_glyphs].index = 68; + break; + case SCORE_PITCH_ACCIDENTAL_NATURAL: + note_glyph[num_glyphs].index = 101; + break; + case SCORE_PITCH_ACCIDENTAL_SHARP: + note_glyph[num_glyphs].index = 134; + break; + case SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP: + note_glyph[num_glyphs].index = 142; + break; + } + + if (SCORE_PITCH_ACCIDENTAL (note->pitch) != SCORE_PITCH_ACCIDENTAL_NATURAL) + { + note_glyph[num_glyphs].x = 0; + + note_glyph[num_glyphs].y = score->space_height * line; + + num_glyphs++; + + cairo_glyph_extents (cr, note_glyph, num_glyphs, &extents); + +#define ACCIDENTAL_NOTE_SPACING (score->space_height * .15) + + note_glyph[0].x = - (extents.width + ACCIDENTAL_NOTE_SPACING); + } + switch (note->duration) { case SCORE_DURATION_1: - note_glyph.index = 127; + note_glyph[num_glyphs].index = 127; break; case SCORE_DURATION_2: - note_glyph.index = 85; + note_glyph[num_glyphs].index = 85; break; case SCORE_DURATION_4: case SCORE_DURATION_8: @@ -222,29 +296,36 @@ _draw_note (score_t *score, cairo_t *cr, case SCORE_DURATION_64: case SCORE_DURATION_128: default: - note_glyph.index = 84; + note_glyph[num_glyphs].index = 84; } - note_glyph.x = 0; - note_glyph.y = score->space_height * line; + note_glyph[num_glyphs].x = 0; + note_glyph[num_glyphs].y = score->space_height * line; + + num_glyphs++; if (line < 0 || line > 4) { + double offset, width; int i; - cairo_text_extents_t note_extents; - cairo_glyph_extents (cr, ¬e_glyph, 1, ¬e_extents); + cairo_glyph_extents (cr, note_glyph, num_glyphs, &extents); + offset = note_glyph[0].x + extents.x_bearing; + width = extents.width; if (line < 0) { for (i = -1; i >= line; i--) - _draw_ledger_line (i, note_extents.width); + _draw_ledger_line (i, offset, width); } else { for (i = 5; i <= line; i++) - _draw_ledger_line (i, note_extents.width); + _draw_ledger_line (i, offset, width); } } - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ - cairo_show_glyphs (cr, ¬e_glyph, 1); + cairo_set_source_rgb (cr, + note->color.r, + note->color.g, + note->color.b); + cairo_show_glyphs (cr, note_glyph, num_glyphs); cairo_restore (cr); } @@ -297,6 +378,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 +497,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 +518,63 @@ 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; + + talloc_steal (chord, name); + + 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 +583,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 +605,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); @@ -496,6 +663,17 @@ score_remove_note (score_note_t *note) } } +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,