Mercurial > emacs
changeset 98073:e77a63e6f983
* nsfont.m (nsfont_draw): Fix the references to missing gidx data
member to point to cmp_from.
* xdisp.c: Doc fix for references to gidx data member.
| author | Teodor Zlatanov <tzz@lifelogs.com> |
|---|---|
| date | Sun, 07 Sep 2008 11:16:20 +0000 |
| parents | f52bded946ed |
| children | 9419b837e9c6 |
| files | src/ChangeLog src/nsfont.m src/xdisp.c |
| diffstat | 3 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Sep 07 09:16:56 2008 +0000 +++ b/src/ChangeLog Sun Sep 07 11:16:20 2008 +0000 @@ -1,3 +1,10 @@ +2008-09-07 Teodor Zlatanov <tzz@lifelogs.com> + + * nsfont.m (nsfont_draw): Fix the references to missing gidx data + member to point to cmp_from. + + * xdisp.c: Doc fix for references to gidx data member. + 2008-09-07 Stefan Monnier <monnier@iro.umontreal.ca> * buffer.c (Fbuffer_swap_text): Reset window->point markers.
--- a/src/nsfont.m Sun Sep 07 09:16:56 2008 +0000 +++ b/src/nsfont.m Sun Sep 07 11:16:20 2008 +0000 @@ -904,14 +904,14 @@ int hi, lo; char isComposite = 0; /* s->first_glyph->type == COMPOSITE_GLYPH; */ /* FIXME: composition: no vertical displacement is considered. */ - t+= s->gidx; /* advance into composition */ - for (i =0; i<s->nchars - s->gidx; i++, t++) + t+= s->cmp_from; /* advance into composition */ + for (i =0; i<s->nchars - s->cmp_from; i++, t++) { hi = (*t & 0xFF00) >> 8; lo = *t & 0x00FF; if (isComposite) { - cwidth = s->cmp->offsets[s->gidx++ * 2] - twidth; + cwidth = s->cmp->offsets[s->cmp_from++ * 2] - twidth; } else { @@ -1094,13 +1094,13 @@ [col set]; CGContextSetTextPosition (gcontext, r.origin.x, r.origin.y); - CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx, + CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from, advances, len); if (face->overstrike) { CGContextSetTextPosition (gcontext, r.origin.x+0.5, r.origin.y); - CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx, + CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from, advances, len); }
--- a/src/xdisp.c Sun Sep 07 09:16:56 2008 +0000 +++ b/src/xdisp.c Sun Sep 07 11:16:20 2008 +0000 @@ -19532,7 +19532,7 @@ /* Fill glyph string S with composition components specified by S->cmp. BASE_FACE is the base face of the composition. - S->gidx is the index of the first component for S. + S->cmp_from is the index of the first component for S. OVERLAPS non-zero means S should draw the foreground only, and use its physical height for clipping. See also draw_glyphs. @@ -19547,7 +19547,7 @@ { int i; /* For all glyphs of this composition, starting at the offset - S->gidx, until we reach the end of the definition or encounter a + S->cmp_from, until we reach the end of the definition or encounter a glyph that requires the different face, add it to S. */ struct face *face;