X-Git-Url: https://git.cworth.org/git?p=scherzo;a=blobdiff_plain;f=score.c;h=f8373ab1ad1c949d7635d66693aa4c5f8494e0a4;hp=26c5a02818e6ba60ad6f77c7e00141719ff16ddb;hb=a53d70ed61f87a5a49426b1e3066dbba09907199;hpb=dd9b9d386cfb63002f3e8d1521b25abfa58b76e5 diff --git a/score.c b/score.c index 26c5a02..f8373ab 100644 --- a/score.c +++ b/score.c @@ -18,14 +18,35 @@ * along with this program. If not, see http://www.gnu.org/licenses/ . */ +#include + #include +#include #include "score.h" +#define ARRAY_SIZE(arr) ((int) (sizeof(arr) / sizeof(arr[0]))) + +typedef struct score_note +{ + score_staff_t *staff; + pitch_t pitch; + score_duration_t duration; + + struct { + double r; + double g; + double b; + } color; +} score_note_t; + struct score_staff { score_clef_t clef; + score_chord_t **chords; + int num_chords; + score_note_t **notes; int num_notes; @@ -57,6 +78,9 @@ struct score /* Full width of staff */ int width; + /* Current (diatonic) key */ + scherzo_key_t key; + score_brace_t **braces; int num_braces; int brace_width; @@ -75,10 +99,15 @@ 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; + + /* Default to C, of course */ + score->key.pitch = PITCH_CLASS_LITERAL (C, NATURAL); + score->key.num_sharps = 0; + score->key.num_flats = 0; score->braces = NULL; score->num_braces = 0; @@ -108,6 +137,13 @@ score_set_width (score_t *score, int width) score->width = width; } +void +score_set_key (score_t *score, pitch_t key) +{ + scherzo_key_init (&score->key, key); +} + + /* Returns in brace_width the width of the brace */ static void _draw_brace (score_t *score, cairo_t *cr, @@ -169,26 +205,95 @@ _score_clef_c_line (score_clef_t clef) } } +/* On which line would 'pitch' appear on 'staff'. + * + * Lines are numbered with line 0 as the top full line of the staff + * and increasing downward. So line values less than 0 will appear as + * ledger lines above the staff while line values greater than 4 will + * appear on ledger lines below the staff. + * + * A line value of 2 will be centered verticall on the staff. + * + * For notes appearing on a space, the line value will be half-way + * between two integers. */ static double -_score_note_to_line (score_staff_t *staff, score_note_t *note) +_score_staff_pitch_to_line (score_staff_t *staff, pitch_t pitch) { - score_pitch_name_t name = SCORE_PITCH_NAME (note->pitch); + pitch_name_t name = PITCH_NAME (pitch); + int octave = PITCH_OCTAVE (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); + return c_line - (name - PITCH_NAME_C) / 2.0 - 3.5 * (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) +{ + PangoRectangle ink_extents; + PangoRectangle logical_extents; + double total_staff_height; + PangoLayout *layout; + PangoFontDescription *font_description; + + /* 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); + + font_description = pango_font_description_new (); + pango_font_description_set_family (font_description, "serif"); + pango_font_description_set_absolute_size (font_description, + score->space_height * 3 * PANGO_SCALE); + + layout = pango_cairo_create_layout (cr); + pango_layout_set_font_description (layout, font_description); + pango_layout_set_markup (layout, chord->name, -1); + + pango_layout_line_get_pixel_extents (pango_layout_get_line (layout, 0), + &ink_extents, &logical_extents); + + 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 + + logical_extents.height); + + pango_cairo_show_layout_line (cr, pango_layout_get_line (layout, 0)); + + g_object_unref (layout); + pango_font_description_free (font_description); + + chord->width = logical_extents.width; + + cairo_restore (cr); +} + +/* Draw 'note' at its correct position on 'staff'. + * If the accidental of 'note' is not contained within the current + * key, then draw the accidental as well. + * + * As a special case, if the note's duration is 0, draw the accidental + * alone, regardless of the key. This is useful for drawing the + * accidentals of the key signature. + * + * Returns the width of the drawn glyphs. + */ +static double _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,57 +301,191 @@ _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 * integers indicate notes appearing on a space between two staff * lines (or ledger lines). */ - line = _score_note_to_line (staff, note); + line = _score_staff_pitch_to_line (staff, note->pitch); 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; + switch (PITCH_ACCIDENTAL (note->pitch)) { + case PITCH_ACCIDENTAL_DOUBLE_FLAT: + note_glyph[num_glyphs].index = 77; + break; + case PITCH_ACCIDENTAL_FLAT: + note_glyph[num_glyphs].index = 68; + break; + case PITCH_ACCIDENTAL_NATURAL: + note_glyph[num_glyphs].index = 101; + break; + case PITCH_ACCIDENTAL_SHARP: + note_glyph[num_glyphs].index = 134; + break; + case PITCH_ACCIDENTAL_DOUBLE_SHARP: + note_glyph[num_glyphs].index = 142; + break; } - note_glyph.x = 0; - note_glyph.y = score->space_height * line; + if (note->duration == 0 || + ! scherzo_key_contains_pitch (&score->key, note->pitch)) + { + 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); + } + + /* Support duration == 0 to draw accidental only */ + if (note->duration) + { + switch (note->duration) { + case SCORE_DURATION_1: + note_glyph[num_glyphs].index = 127; + break; + case SCORE_DURATION_2: + note_glyph[num_glyphs].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[num_glyphs].index = 84; + } + + 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); 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); + 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); + + return extents.width; +} + +/* Draw the accidental from 'pitch' only (no notehead) at the correct + * position as if drawing a note at 'pitch'. + * + * Returns the width of the drawn glyph. + */ +static double +_draw_accidental (score_t *score, + cairo_t *cr, + score_staff_t *staff, + pitch_t pitch) +{ + score_note_t note; + + note.staff = staff; + note.pitch = pitch; + + /* A duration of 0 indicates to draw only the accidental. */ + note.duration = 0; + + note.color.r = 0.0; + note.color.g = 0.0; + note.color.b = 0.0; + + return _draw_note (score, cr, staff, ¬e); +} + +static void +_draw_key_signature (score_t *score, cairo_t *cr, + score_staff_t *staff) +{ + pitch_t pitch; + double width; + int i; + + /* These octave numbers are correct for treble clef. For bass + * clef, subtract two. + */ + pitch_t sharps_order[] = { + PITCH_LITERAL (F, SHARP, 5), + PITCH_LITERAL (C, SHARP, 5), + PITCH_LITERAL (G, SHARP, 5), + PITCH_LITERAL (D, SHARP, 5), + PITCH_LITERAL (A, SHARP, 4), + PITCH_LITERAL (E, SHARP, 5), + PITCH_LITERAL (B, SHARP, 4) + }; + + pitch_t flats_order[] = { + PITCH_LITERAL (B, FLAT, 4), + PITCH_LITERAL (E, FLAT, 5), + PITCH_LITERAL (A, FLAT, 4), + PITCH_LITERAL (D, FLAT, 5), + PITCH_LITERAL (G, FLAT, 4), + PITCH_LITERAL (C, FLAT, 5), + PITCH_LITERAL (F, FLAT, 4), + }; + + for (i = 0; i < score->key.num_sharps; i++) { + pitch = sharps_order[i]; + + if (staff->clef == SCORE_CLEF_BASS) + pitch = pitch_lower_by_octaves (pitch, 2); + + width = _draw_accidental (score, cr, staff, pitch); + +#define KEY_SIGNATURE_ACCIDENTAL_SPACING (score->space_height * .15) + cairo_translate (cr, ceil (width + KEY_SIGNATURE_ACCIDENTAL_SPACING), 0); + } + + for (i = 0; i < score->key.num_flats; i++) { + pitch = flats_order[i]; + + if (staff->clef == SCORE_CLEF_BASS) + pitch = pitch_lower_by_octaves (pitch, 2); + + width = _draw_accidental (score, cr, staff, pitch); + + cairo_translate (cr, ceil (width + KEY_SIGNATURE_ACCIDENTAL_SPACING), 0); + } } static void @@ -255,6 +494,7 @@ _draw_staff (score_t *score, cairo_t *cr, { int i; cairo_glyph_t clef_glyph; + cairo_text_extents_t clef_extents; cairo_save (cr); @@ -264,6 +504,19 @@ _draw_staff (score_t *score, cairo_t *cr, cairo_set_font_size (cr, score->staff_height); + /* 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); + } + + cairo_set_line_width (cr, score->line_width); + + cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ + cairo_stroke (cr); + + /* Draw the clef */ + /* XXX: The hard-coded glyph indices here are very ugly. We should * figure out how to lookup glyphs by name from this font. */ switch (staff->clef) { @@ -283,19 +536,28 @@ _draw_staff (score_t *score, cairo_t *cr, cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ cairo_show_glyphs (cr, &clef_glyph, 1); - /* 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); - } + /* Make space for clef */ + cairo_glyph_extents (cr, &clef_glyph, 1, &clef_extents); - cairo_set_line_width (cr, score->line_width); +#define CLEF_KEY_SIGNATURE_SPACING (score->space_height * .75) + cairo_translate (cr, ceil (clef_extents.width + + CLEF_KEY_SIGNATURE_SPACING), 0); - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ - cairo_stroke (cr); + /* Draw the key signature */ + _draw_key_signature (score, cr, staff); - /* Make space for clef before drawing notes */ - cairo_translate (cr, (int) (4 * score->space_height), 0); +#define KEY_SIGNATURE_NOTE_SPACING (score->space_height) + cairo_translate (cr, ceil (KEY_SIGNATURE_NOTE_SPACING), 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++) { @@ -334,7 +596,8 @@ score_draw (score_t *score, cairo_t *cr) if (score->num_braces) { - int brace_width; + /* Initialize to keep the compiler quiet. */ + int brace_width = 0; for (i = 0; i < score->num_braces; i++) _draw_brace (score, cr, score->braces[i], &brace_width); @@ -406,6 +669,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,25 +690,90 @@ score_add_staff (score_t *score, score_clef_t clef) return staff; } -score_note_t * -score_add_note (score_staff_t *staff, - score_pitch_t pitch, - int octave, - score_duration_t duration) +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_staff_remove_chords (score_staff_t *staff) +{ + talloc_free (staff->chords); + staff->chords = NULL; + + staff->num_chords = 0; +} + +void +score_remove_chords (score_t *score) +{ + int i; + + for (i = 0; i < score->num_staves; i++) + score_staff_remove_chords (score->staves[i]); +} + +void +score_staff_add_note (score_staff_t *staff, + pitch_t pitch, + score_duration_t duration) { 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->duration == duration) + { + return; + } + } note = talloc (staff, score_note_t); if (note == NULL) - return NULL; + return; note->staff = staff; note->pitch = pitch; - note->octave = octave; note->duration = duration; - line = _score_note_to_line (staff, note); + note->color.r = 0.0; + note->color.g = 0.0; + note->color.b = 0.0; + + line = _score_staff_pitch_to_line (staff, note->pitch); if (line < 0) { int lines = (int) (- line); if (lines > staff->upper_ledger_lines) @@ -460,61 +791,53 @@ score_add_note (score_staff_t *staff, staff->num_notes); if (staff->notes == NULL) { staff->num_notes = 0; - return NULL; + return; } staff->notes[staff->num_notes - 1] = note; - - return note; } void -score_remove_note (score_note_t *note) +score_add_note (score_t *score, pitch_t pitch, score_duration_t duration) { - score_staff_t *staff = note->staff; + score_staff_t *staff, *nearest_staff = NULL; + double distance, nearest_distance = 0.0; int i; - for (i = 0; i < staff->num_notes; i++) - if (staff->notes[i] == note) - break; - - if (i == staff->num_notes) + /* Nothing to do if we have no staff, (there's no place to add a note) . */ + if (score->num_staves == 0) return; - if (i < staff->num_notes - 1) - { - memmove (staff->notes + i, - staff->notes + i + 1, - (staff->num_notes - 1 - i) * sizeof (score_note_t *)); + /* Find the staff where the note will be closest to the center of + * the staff. */ + for (i = 0; i < score->num_staves; i++) { + staff = score->staves[i]; + distance = fabs (_score_staff_pitch_to_line (staff, pitch) - 2.0); + if (nearest_staff == NULL || distance < nearest_distance) { + nearest_staff = staff; + nearest_distance = distance; + } } - staff->num_notes -= 1; + score_staff_add_note (nearest_staff, pitch, duration); +} - if (staff->num_notes == 0) { - staff->upper_ledger_lines = 0; - staff->lower_ledger_lines = 0; - } +void +score_staff_remove_notes (score_staff_t *staff) +{ + talloc_free (staff->notes); + staff->notes = NULL; + staff->num_notes = 0; + + staff->upper_ledger_lines = 0; + staff->lower_ledger_lines = 0; } -score_note_t * -score_staff_find_note (score_staff_t *staff, - score_pitch_t pitch, - int octave, - score_duration_t duration) +void +score_remove_notes (score_t *score) { 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; + for (i = 0; i < score->num_staves; i++) + score_staff_remove_notes (score->staves[i]); } -