X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;h=e047f979b6f77d2ba36f2146cbe74cf8f38fcc06;hb=3f6802b662f5e8c13fa44ea2e500da722f654a73;hp=0c9d5f37cb37e20d9913e0601ef4b66246ccf777;hpb=3f6a9cdbf572c83c323f40cc66e301bdf128f076;p=scherzo diff --git a/score.c b/score.c index 0c9d5f3..e047f97 100644 --- a/score.c +++ b/score.c @@ -18,6 +18,8 @@ * along with this program. If not, see http://www.gnu.org/licenses/ . */ +#include + #include #include "score.h" @@ -26,8 +28,18 @@ struct score_staff { score_clef_t clef; + score_chord_t **chords; + int num_chords; + 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 @@ -38,7 +50,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 */ @@ -68,10 +80,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; @@ -108,9 +120,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 @@ -120,13 +139,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); @@ -164,15 +183,76 @@ _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) +{ + 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); +} + 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 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); + } 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 @@ -185,12 +265,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: @@ -199,14 +312,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 + score->line_width / 2.0; + note_glyph[num_glyphs].x = 0; + note_glyph[num_glyphs].y = score->space_height * line; - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ - cairo_show_glyphs (cr, ¬e_glyph, 1); + num_glyphs++; + + if (line < 0 || line > 4) { + double offset, width; + int i; + + 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, offset, width); + } else { + for (i = 5; i <= line; i++) + _draw_ledger_line (i, offset, width); + } + } + + 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); } @@ -220,6 +355,8 @@ _draw_staff (score_t *score, cairo_t *cr, 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); @@ -238,7 +375,7 @@ _draw_staff (score_t *score, cairo_t *cr, break; } clef_glyph.x = 3 * score->line_width; - clef_glyph.y += 1; + clef_glyph.y += score->line_width / 2.0; cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ cairo_show_glyphs (cr, &clef_glyph, 1); @@ -257,6 +394,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]); @@ -273,12 +420,29 @@ 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; + /* 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); @@ -295,16 +459,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); @@ -350,6 +514,12 @@ 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; + score->num_staves++; score->staves = talloc_realloc (score, score->staves, @@ -365,6 +535,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, @@ -372,6 +599,19 @@ score_add_note (score_staff_t *staff, 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->octave == octave && + note->duration == duration) + { + return note; + } + } note = talloc (staff, score_note_t); if (note == NULL) @@ -382,6 +622,21 @@ 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); + 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, @@ -418,6 +673,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 *