mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-01 08:17:38 +00:00
(FONT_INFO_ID): Build an ID from a font_info pointer.
(FONT_INFO_FROM_ID): Get a font_info pointer from an ID. (toplevel): Add extern declarations for Vfontset_alias_alist and Vglobal_fontset_alist.
This commit is contained in:
parent
18082e2d15
commit
e18f992255
@ -217,6 +217,8 @@ extern int fs_register_fontset P_ ((struct frame *, Lisp_Object));
|
||||
EXFUN (Fquery_fontset, 2);
|
||||
extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int));
|
||||
extern Lisp_Object Vglobal_fontset_alist;
|
||||
struct frame;
|
||||
int fs_query_fontset P_ ((struct frame *f, char *name));
|
||||
|
||||
extern Lisp_Object Qfontset;
|
||||
extern Lisp_Object Vuse_default_ascent;
|
||||
@ -243,4 +245,24 @@ extern int font_idx_temp;
|
||||
? font_table + font_idx_temp \
|
||||
: fs_load_font (f, font_table, charset, fontname, fontset))
|
||||
|
||||
extern Lisp_Object Vfontset_alias_alist;
|
||||
extern Lisp_Object Vglobal_fontset_alist;
|
||||
|
||||
|
||||
/* Return an immutable id for font_info FONT_INFO on frame F. The
|
||||
reason for this macro is hat one cannot hold pointers to font_info
|
||||
structures in other data structures, because the table is
|
||||
reallocated in x_list_fonts. */
|
||||
|
||||
#define FONT_INFO_ID(F, FONT_INFO) \
|
||||
(FONT_INFO) - (FRAME_X_DISPLAY_INFO ((F))->font_table)
|
||||
|
||||
/* Given a font_info id ID, return a pointer to the font_info
|
||||
structure on frame F. If ID is invalid, return null. */
|
||||
|
||||
#define FONT_INFO_FROM_ID(F, ID) \
|
||||
(((ID) >= 0 && (ID) < FRAME_X_DISPLAY_INFO ((F))->font_table_size) \
|
||||
? (FRAME_X_DISPLAY_INFO ((F))->font_table + (ID)) \
|
||||
: 0)
|
||||
|
||||
#endif /* _FONTSET_H */
|
||||
|
Loading…
Reference in New Issue
Block a user