diff options
| author | Kenichi Handa | 2006-06-06 03:50:45 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-06-06 03:50:45 +0000 |
| commit | 8443e69e76206a997dcdff6e41f1ddedd31a5db2 (patch) | |
| tree | b20e220bf1921f46a5d750fdb5e78d6a3fe5feb8 /src | |
| parent | f30d8d94fe5fba1ed2f3ecc6d728f83831b0ae66 (diff) | |
| download | emacs-8443e69e76206a997dcdff6e41f1ddedd31a5db2.tar.gz emacs-8443e69e76206a997dcdff6e41f1ddedd31a5db2.zip | |
(struct glyph_string) [USE_FONT_BACKEND]: New
members clip_x, clip_y, clip_width, and clip_height.
(struct face) [USE_FONT_BACKEND]: New members font_info and extra.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispextern.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index b1e71315086..0aac78f9557 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -1220,6 +1220,11 @@ struct glyph_string | |||
| 1220 | *clip_tail, not including their overhangs. */ | 1220 | *clip_tail, not including their overhangs. */ |
| 1221 | struct glyph_string *clip_head, *clip_tail; | 1221 | struct glyph_string *clip_head, *clip_tail; |
| 1222 | 1222 | ||
| 1223 | #ifdef USE_FONT_BACKEND | ||
| 1224 | /* The current clipping area. */ | ||
| 1225 | int clip_x, clip_y, clip_width, clip_height; | ||
| 1226 | #endif /* USE_FONT_BACKEND */ | ||
| 1227 | |||
| 1223 | struct glyph_string *next, *prev; | 1228 | struct glyph_string *next, *prev; |
| 1224 | }; | 1229 | }; |
| 1225 | 1230 | ||
| @@ -1476,6 +1481,10 @@ struct face | |||
| 1476 | reallocated. */ | 1481 | reallocated. */ |
| 1477 | int font_info_id; | 1482 | int font_info_id; |
| 1478 | 1483 | ||
| 1484 | #ifdef USE_FONT_BACKEND | ||
| 1485 | struct font_info *font_info; | ||
| 1486 | #endif /* USE_FONT_BACKEND */ | ||
| 1487 | |||
| 1479 | /* Fontset ID if for this face's fontset. Non-ASCII faces derived | 1488 | /* Fontset ID if for this face's fontset. Non-ASCII faces derived |
| 1480 | from the same ASCII face have the same fontset. */ | 1489 | from the same ASCII face have the same fontset. */ |
| 1481 | int fontset; | 1490 | int fontset; |
| @@ -1558,6 +1567,11 @@ struct face | |||
| 1558 | Otherwise, this points to an ASCII face that has the same | 1567 | Otherwise, this points to an ASCII face that has the same |
| 1559 | attributes except the font. */ | 1568 | attributes except the font. */ |
| 1560 | struct face *ascii_face; | 1569 | struct face *ascii_face; |
| 1570 | |||
| 1571 | #ifdef USE_FONT_BACKEND | ||
| 1572 | /* Extra member that a font-driver uses privately. */ | ||
| 1573 | void *extra; | ||
| 1574 | #endif /* USE_FONT_BACKEND */ | ||
| 1561 | }; | 1575 | }; |
| 1562 | 1576 | ||
| 1563 | 1577 | ||