X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;h=db07d5e9d57f33436688db8741d2a4442d519760;hb=1fe478f5aaa4f8ebff2a3f7771809c3d1aaa5ef4;hp=7a1c231a4b82cfdcef0d972dcf88ac6c1168e645;hpb=f6b8f7f23bb8a4a5b30bfde8242578cca90ddacf;p=scherzo diff --git a/score.c b/score.c index 7a1c231..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 + #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); @@ -175,6 +184,15 @@ _draw_note (score_t *score, cairo_t *cr, { 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); @@ -208,9 +226,27 @@ _draw_note (score_t *score, cairo_t *cr, } note_glyph.x = 0; - note_glyph.y = score->space_height * line + score->line_width / 2.0; + note_glyph.y = score->space_height * line; - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ + if (line < 0 || line > 4) { + int i; + cairo_text_extents_t note_extents; + + cairo_glyph_extents (cr, ¬e_glyph, 1, ¬e_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, ¬e_glyph, 1); cairo_restore (cr); @@ -222,10 +258,11 @@ _draw_staff (score_t *score, cairo_t *cr, { int i; cairo_glyph_t clef_glyph; - cairo_text_extents_t clef_extents; 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); @@ -244,13 +281,11 @@ _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); - cairo_glyph_extents (cr, &clef_glyph, 1, &clef_extents); - /* Draw staff lines */ for (i = 0; i < 5; i++) { cairo_move_to (cr, 0, i * score->space_height + score->line_width / 2.0); @@ -263,12 +298,14 @@ _draw_staff (score_t *score, cairo_t *cr, cairo_stroke (cr); /* Make space for clef before drawing notes */ - cairo_translate (cr, (int) (1.5 * clef_extents.width), 0); + 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); @@ -279,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; @@ -301,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); @@ -356,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, @@ -372,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, @@ -402,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; +} +