X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;h=ba27844fb02e9fc6835188f1409cd36e0442b5d2;hb=367e517451123c7c79ead28eca6d2489bfed6467;hp=ac0d346522715896fc3c2e478a3a215a2b32619e;hpb=2e37869bdeb7a9a6de2b758eb704320e00aae5c3;p=scherzo diff --git a/score.c b/score.c index ac0d346..ba27844 100644 --- a/score.c +++ b/score.c @@ -18,7 +18,10 @@ * along with this program. If not, see http://www.gnu.org/licenses/ . */ +#include + #include +#include #include "score.h" @@ -172,13 +175,25 @@ _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 */ @@ -186,8 +201,11 @@ static void _draw_chord (score_t *score, cairo_t *cr, score_staff_t *staff, score_chord_t *chord) { - cairo_text_extents_t chord_extents; + 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 + @@ -196,19 +214,30 @@ _draw_chord (score_t *score, cairo_t *cr, cairo_save (cr); - cairo_text_extents (cr, chord->name, &chord_extents); + 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); - cairo_select_font_face (cr, "serif", 0, 0); - cairo_set_font_size (cr, score->space_height * 3); + 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 + chord_extents.y_bearing); + 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)); - cairo_show_text (cr, chord->name); + g_object_unref (layout); + pango_font_description_free (font_description); - chord->width = chord_extents.x_advance; + chord->width = logical_extents.width; cairo_restore (cr); } @@ -218,12 +247,13 @@ _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); @@ -231,24 +261,62 @@ _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 (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; + } + + if (PITCH_ACCIDENTAL (note->pitch) != 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: @@ -257,24 +325,28 @@ _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); } } @@ -282,7 +354,7 @@ _draw_note (score_t *score, cairo_t *cr, note->color.r, note->color.g, note->color.b); - cairo_show_glyphs (cr, ¬e_glyph, 1); + cairo_show_glyphs (cr, note_glyph, num_glyphs); cairo_restore (cr); } @@ -382,7 +454,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); @@ -485,6 +558,8 @@ score_add_chord (score_staff_t *staff, if (chord == NULL) return NULL; + talloc_steal (chord, name); + chord->staff = staff; chord->name = talloc_strdup (chord, name); @@ -531,10 +606,9 @@ score_remove_chord (score_chord_t *chord) } score_note_t * -score_add_note (score_staff_t *staff, - score_pitch_t pitch, - int octave, - score_duration_t duration) +score_staff_add_note (score_staff_t *staff, + pitch_t pitch, + score_duration_t duration) { score_note_t *note; double line; @@ -544,7 +618,6 @@ score_add_note (score_staff_t *staff, for (i = 0; i < staff->num_notes; i++) { note = staff->notes[i]; if (note->pitch == pitch && - note->octave == octave && note->duration == duration) { return note; @@ -557,14 +630,13 @@ score_add_note (score_staff_t *staff, 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); + line = _score_staff_pitch_to_line (staff, note->pitch); if (line < 0) { int lines = (int) (- line); if (lines > staff->upper_ledger_lines) @@ -590,6 +662,31 @@ score_add_note (score_staff_t *staff, return note; } +score_note_t * +score_add_note (score_t *score, pitch_t pitch, score_duration_t duration) +{ + score_staff_t *staff, *nearest_staff = NULL; + double distance, nearest_distance = 0.0; + int i; + + /* Nothing to do if we have no staff, (there's no place to add a note) . */ + if (score->num_staves == 0) + return NULL; + + /* 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; + } + } + + return score_staff_add_note (nearest_staff, pitch, duration); +} + void score_remove_note (score_note_t *note) { @@ -618,6 +715,23 @@ score_remove_note (score_note_t *note) } } +void +score_staff_remove_notes (score_staff_t *staff) +{ + talloc_free (staff->notes); + staff->notes = NULL; + staff->num_notes = 0; +} + +void +score_remove_notes (score_t *score) +{ + int i; + + for (i = 0; i < score->num_staves; i++) + score_staff_remove_notes (score->staves[i]); +} + void score_set_note_color_rgb (score_note_t *note, double r, @@ -631,8 +745,7 @@ score_set_note_color_rgb (score_note_t *note, score_note_t * score_staff_find_note (score_staff_t *staff, - score_pitch_t pitch, - int octave, + pitch_t pitch, score_duration_t duration) { int i; @@ -640,14 +753,9 @@ score_staff_find_note (score_staff_t *staff, for (i = 0; i < staff->num_notes; i++) { note = staff->notes[i]; - if (note->pitch == pitch && - note->octave == octave && - note->duration == duration) - { + if (note->pitch == pitch && note->duration == duration) return note; - } } return NULL; } -