Mercurial > emacs
comparison src/dispnew.c @ 110598:ee58b36ab139
Remove restriction on the number of glyphs in one composition.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 27 Sep 2010 14:27:28 +0900 |
| parents | 9fa0b071facc |
| children | 0e84d4500f6b |
comparison
equal
deleted
inserted
replaced
| 110470:937bcfd8c509 | 110598:ee58b36ab139 |
|---|---|
| 5455 struct glyph *glyph = row->glyphs[TEXT_AREA] + it.hpos; | 5455 struct glyph *glyph = row->glyphs[TEXT_AREA] + it.hpos; |
| 5456 #ifdef HAVE_WINDOW_SYSTEM | 5456 #ifdef HAVE_WINDOW_SYSTEM |
| 5457 if (img) | 5457 if (img) |
| 5458 { | 5458 { |
| 5459 *dy -= row->ascent - glyph->ascent; | 5459 *dy -= row->ascent - glyph->ascent; |
| 5460 *dx += glyph->slice.x; | 5460 *dx += glyph->slice.img.x; |
| 5461 *dy += glyph->slice.y; | 5461 *dy += glyph->slice.img.y; |
| 5462 /* Image slices positions are still relative to the entire image */ | 5462 /* Image slices positions are still relative to the entire image */ |
| 5463 *width = img->width; | 5463 *width = img->width; |
| 5464 *height = img->height; | 5464 *height = img->height; |
| 5465 } | 5465 } |
| 5466 else | 5466 else |
| 5618 struct image *img; | 5618 struct image *img; |
| 5619 img = IMAGE_FROM_ID (WINDOW_XFRAME (w), glyph->u.img_id); | 5619 img = IMAGE_FROM_ID (WINDOW_XFRAME (w), glyph->u.img_id); |
| 5620 if (img != NULL) | 5620 if (img != NULL) |
| 5621 *object = img->spec; | 5621 *object = img->spec; |
| 5622 y0 -= row->ascent - glyph->ascent; | 5622 y0 -= row->ascent - glyph->ascent; |
| 5623 x0 += glyph->slice.x; | 5623 x0 += glyph->slice.img.x; |
| 5624 y0 += glyph->slice.y; | 5624 y0 += glyph->slice.img.y; |
| 5625 } | 5625 } |
| 5626 #endif | 5626 #endif |
| 5627 } | 5627 } |
| 5628 else | 5628 else |
| 5629 { | 5629 { |