X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;h=e047f979b6f77d2ba36f2146cbe74cf8f38fcc06;hb=659f6814cb925cfcd1db6dd1cfd92944f76991e5;hp=e319af0c238abaf594afee0088bc8c580de6f59e;hpb=05713bff8bc084c401d58b1b9526d83d9a42b641;p=scherzo diff --git a/score.c b/score.c index e319af0..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" @@ -186,8 +188,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 +201,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); + + layout = pango_cairo_create_layout (cr); + pango_layout_set_font_description (layout, font_description); + pango_layout_set_markup (layout, chord->name, -1); - cairo_select_font_face (cr, "serif", 0, 0); - cairo_set_font_size (cr, score->space_height * 3); + 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); - cairo_show_text (cr, chord->name); + pango_cairo_show_layout_line (cr, pango_layout_get_line (layout, 0)); - chord->width = chord_extents.x_advance; + g_object_unref (layout); + pango_font_description_free (font_description); + + chord->width = logical_extents.width; cairo_restore (cr); } @@ -218,12 +234,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,6 +248,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 @@ -243,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: @@ -257,24 +312,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 +341,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 +441,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 +545,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); @@ -538,6 +600,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)