diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2004-10-21 18:38:58 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2004-10-21 18:38:58 +0000 |
| commit | c27ed90af576892cae147bfe6be1a8b43126102a (patch) | |
| tree | f4160cfb96b7cb46e98ae9a865c086b6c782a411 /src/xterm.h | |
| parent | 6e237e7298748ebb5fe7baa4d56a5cf7cbac224b (diff) | |
| download | emacs-c27ed90af576892cae147bfe6be1a8b43126102a.tar.gz | |
* xterm.h (x_output): New member `xic_base_fontname'.
(FRAME_XIC_BASE_FONTNAME): New macro.
(xic_free_xfontset): Declare.
* xfns.c (xic_create_xfontset): Share fontsets between frames
based on base_fontname.
(xic_free_xfontset): New function.
(free_frame_xic): Use it.
(xic_set_xfontset): Ditto.
* xterm.c (xim_destroy_callback): Ditto.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xterm.h b/src/xterm.h index f0e2f3521bb..7ec690d2e24 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -600,6 +600,7 @@ struct x_output XIC xic; XIMStyle xic_style; XFontSet xic_xfs; + char *xic_base_fontname; #endif /* Relief GCs, colors etc. */ @@ -734,6 +735,7 @@ enum #define FRAME_X_XIM_STYLES(f) (FRAME_X_DISPLAY_INFO (f)->xim_styles) #define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style) #define FRAME_XIC_FONTSET(f) ((f)->output_data.x->xic_xfs) +#define FRAME_XIC_BASE_FONTNAME(f) ((f)->output_data.x->xic_base_fontname) /* Value is the smallest width of any character in any font on frame F. */ @@ -1043,6 +1045,7 @@ extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)) extern unsigned char * x_encode_text P_ ((Lisp_Object, Lisp_Object, int, int *, int *)); extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); +extern void xic_free_xfontset P_ ((struct frame *)); extern void create_frame_xic P_ ((struct frame *)); extern void destroy_frame_xic P_ ((struct frame *)); extern void xic_set_preeditarea P_ ((struct window *, int, int)); |