/* Fontset handler.
- Ver.1.0
- Copyright (C) 1995 Free Software Foundation, Inc.
- Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
+ Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
+ Licensed to the Free Software Foundation.
This file is part of GNU Emacs.
Lisp_Object Vglobal_fontset_alist;
Lisp_Object Vfont_encoding_alist;
Lisp_Object Vuse_default_ascent;
-Lisp_Object Valternative_fontname_alist;
+Lisp_Object Vignore_relative_composition;
+Lisp_Object Valternate_fontname_alist;
Lisp_Object Vfontset_alias_alist;
Lisp_Object Vhighlight_wrong_size_font;
Lisp_Object Vclip_large_size_font;
+/* Used as a temporary in macro FS_LOAD_FONT. */
+int font_idx_temp;
+
/* We had better have our own strcasecmp function because some system
doesn't have it. */
static char my_strcasetbl[256];
the comments in src/fontset.h for more detail. */
/* Return a pointer to struct font_info of font FONT_IDX of frame F. */
-struct font_info *(*get_font_info_func) (/* FRAME_PTR f; int font_idx */);
+struct font_info *(*get_font_info_func) P_ ((FRAME_PTR f, int font_idx));
/* Return a list of font names which matches PATTERN. See the document of
`x-list-fonts' for more detail. */
-Lisp_Object (*list_fonts_func) (/* Lisp_Object pattern, face, frame, width */);
+Lisp_Object (*list_fonts_func) P_ ((Lisp_Object pattern, Lisp_Object face,
+ Lisp_Object frame, Lisp_Object width));
/* Load a font named NAME for frame F and return a pointer to the
information of the loaded font. If loading is failed, return 0. */
-struct font_info *(*load_font_func) (/* FRAME_PTR f; char *name */);
+struct font_info *(*load_font_func) P_ ((FRAME_PTR f, char *name, int));
/* Return a pointer to struct font_info of a font named NAME for frame F. */
-struct font_info *(*query_font_func) (/* FRAME_PTR f; char *name */);
+struct font_info *(*query_font_func) P_ ((FRAME_PTR f, char *name));
/* Additional function for setting fontset or changing fontset
contents of frame F. */
-void (*set_frame_fontset_func) (/* FRAME_PTR f; Lisp_Object arg, oldval */);
+void (*set_frame_fontset_func) P_ ((FRAME_PTR f, Lisp_Object arg,
+ Lisp_Object oldval));
/* Check if any window system is used now. */
-void (*check_window_system_func) ();
+void (*check_window_system_func) P_ ((void));
struct fontset_data *
alloc_fontset_data ()
free_fontset_data (fontset_data)
struct fontset_data *fontset_data;
{
- int i;
-
- for (i = 0; i < fontset_data->n_fontsets; i++)
+ if (fontset_data->fontset_table)
{
- int j;
+ int i;
- xfree (fontset_data->fontset_table[i]->name);
- for (j = 0; j <= MAX_CHARSET; j++)
- if (fontset_data->fontset_table[i]->fontname[j])
- xfree (fontset_data->fontset_table[i]->fontname[j]);
- xfree (fontset_data->fontset_table[i]);
+ for (i = 0; i < fontset_data->n_fontsets; i++)
+ {
+ int j;
+
+ xfree (fontset_data->fontset_table[i]->name);
+ for (j = 0; j <= MAX_CHARSET; j++)
+ if (fontset_data->fontset_table[i]->fontname[j])
+ xfree (fontset_data->fontset_table[i]->fontname[j]);
+ xfree (fontset_data->fontset_table[i]);
+ }
+ xfree (fontset_data->fontset_table);
}
- xfree (fontset_data->fontset_table);
xfree (fontset_data);
}
If loading fails, return 0;
If FONTNAME is NULL, the name is taken from the information of FONTSET.
If FONTSET is given, try to load a font whose size matches that of
- FONTSET, and, the font index is stored in the table for FONTSET. */
+ FONTSET, and, the font index is stored in the table for FONTSET.
+
+ If you give FONTSET argument, don't call this function directry,
+ instead call macro FS_LOAD_FONT with the same argument. */
struct font_info *
fs_load_font (f, font_table, charset, fontname, fontset)
/* No way to get fontname. */
return 0;
- /* If a fontset is specified and we have already loaded some fonts
- in the fontset, we need a font of appropriate size to be used
- with the fonts. */
- if (fontsetp && fontsetp->size)
- size = fontsetp->size * CHARSET_WIDTH (charset);
+ /* If CHARSET is not ASCII and FONTSET is specified, we must load a
+ font of appropriate size to be used with other fonts in this
+ fontset. */
+ if (charset != CHARSET_ASCII && fontsetp)
+ {
+ /* If we have not yet loaded ASCII font of FONTSET, we must load
+ it now to decided the size and height of this fontset. */
+ if (fontsetp->size == 0)
+ {
+ fontp = fs_load_font (f, font_table, CHARSET_ASCII, 0, fontset);
+ if (!fontp)
+ /* Any fontset should contain avairable ASCII. */
+ return 0;
+ }
+ /* Now we have surely decided the size of this fontset. */
+ size = fontsetp->size * CHARSET_WIDTH (charset);
+ }
fontp = (*load_font_func) (f, fontname, size);
not set by (*load_font_func). */
fontp->charset = charset;
- if (fontp->encoding[1] >= 0)
+ if (fontp->encoding[1] != FONT_ENCODING_NOT_DECIDED)
{
/* The font itself tells which code points to be used. Use this
encoding for all other charsets. */
elt = XCONS (list)->car;
if (CONSP (elt)
&& STRINGP (XCONS (elt)->car) && CONSP (XCONS (elt)->cdr)
- && (fast_string_match_ignore_case (XCONS (elt)->car, fontname)
+ && (fast_c_string_match_ignore_case (XCONS (elt)->car, fontname)
>= 0))
{
Lisp_Object tmp;
elt = XCONS (list)->car;
if (CONSP (elt)
&& STRINGP (XCONS (elt)->car) && VECTORP (XCONS (elt)->cdr)
- && fast_string_match_ignore_case (XCONS (elt)->car, fontname) >= 0)
+ && fast_c_string_match_ignore_case (XCONS (elt)->car, fontname) >= 0)
{
fontp->font_encoder
= (struct ccl_program *) xmalloc (sizeof (struct ccl_program));
}
}
+ /* If FONTSET is specified, setup various fields of it. */
if (fontsetp)
{
fontsetp->font_indexes[charset] = fontp->font_idx;
- if (fontsetp->size == 0)
- fontsetp->size = fontp->size / CHARSET_WIDTH (charset);
-
- if (charset == CHARSET_ASCII
- && fontsetp->size != fontp->size)
+ if (charset == CHARSET_ASCII)
{
- /* When loading ASCII font of the different size from the
- size of FONTSET, we have to update the size of FONTSET.
- Since changing the size of FONTSET may make some fonts
- already loaded inappropriate to be used in FONTSET, we
- must delete the record of such fonts. In that case, we
- also have to calculate the height of FONTSET from the
- remaining fonts. */
- int i;
-
- fontsetp->size = fontp->size;
- fontsetp->height = fontp->height;
- for (i = CHARSET_ASCII + 1; i <= MAX_CHARSET; i++)
+ /* Decide or change the size and height of this fontset. */
+ if (fontsetp->size == 0)
+ {
+ fontsetp->size = fontp->size;
+ fontsetp->height = fontp->height;
+ }
+ else if (fontsetp->size != fontp->size
+ || fontsetp->height != fontp->height)
{
- font_idx = fontsetp->font_indexes[i];
- if (font_idx >= 0)
+ /* When loading ASCII font of the different size from
+ the size of FONTSET, we have to update the size of
+ FONTSET. Since changing the size of FONTSET may make
+ some fonts already loaded inappropriate to be used in
+ FONTSET, we must delete the record of such fonts. In
+ that case, we also have to calculate the height of
+ FONTSET from the remaining fonts. */
+ int i;
+
+ fontsetp->size = fontp->size;
+ fontsetp->height = fontp->height;
+ for (i = CHARSET_ASCII + 1; i <= MAX_CHARSET; i++)
{
- struct font_info *fontp2 = font_table + font_idx;
-
- if (fontp2->size != fontp->size * CHARSET_WIDTH (i))
- fontsetp->font_indexes[i] = FONT_NOT_OPENED;
- /* The following code should be disabled until Emacs
- supports variable height lines. */
+ font_idx = fontsetp->font_indexes[i];
+ if (font_idx >= 0)
+ {
+ struct font_info *fontp2 = font_table + font_idx;
+
+ if (fontp2->size != fontp->size * CHARSET_WIDTH (i))
+ fontsetp->font_indexes[i] = FONT_NOT_OPENED;
+ /* The following code should be disabled until
+ Emacs supports variable height lines. */
#if 0
- else if (fontsetp->height < fontp->height)
- fontsetp->height = fontp->height;
+ else if (fontsetp->height < fontp->height)
+ fontsetp->height = fontp->height;
#endif
+ }
}
}
}
- else if (fontsetp->height < fontp->height)
- fontsetp->height = fontp->height;
}
return fontp;
Lisp_Object fontset_name = XCONS (XCONS (tem)->car)->car;
if (!NILP (regexp))
{
- if (fast_string_match_ignore_case (regexp,
- XSTRING (fontset_name)->data)
+ if (fast_c_string_match_ignore_case (regexp,
+ XSTRING (fontset_name)->data)
>= 0)
return fontset_name;
}
if (!NILP (regexp))
{
- if (fast_string_match_ignore_case (regexp, fontsetp->name) >= 0)
+ if (fast_c_string_match_ignore_case (regexp, fontsetp->name) >= 0)
name_matched = 1;
}
else
if (!fontp)
return Qnil;
- info = Fmake_vector (make_number (7), Qnil);
+ info = Fmake_vector (make_number (8), Qnil);
XVECTOR (info)->contents[0] = build_string (fontp->name);
XVECTOR (info)->contents[1] = build_string (fontp->full_name);
Vfont_encoding_alist = Qnil;
DEFVAR_LISP ("use-default-ascent", &Vuse_default_ascent,
- "Char table of characters of which ascent values should be ignored.\n\
+ "Char table of characters whose ascent values should be ignored.\n\
If an entry for a character is non-nil, the ascent value of the glyph\n\
-is assumed to be what specified by _MULE_DEFAULT_ASCENT property of a font.");
+is assumed to be what specified by _MULE_DEFAULT_ASCENT property of a font.\n\
+\n\
+This affects how a composite character which contains\n\
+such a character is displayed on screen.");
+ Vuse_default_ascent = Qnil;
+
+ DEFVAR_LISP ("ignore-relative-composition", &Vignore_relative_composition,
+ "Char table of characters which is not composed relatively.\n\
+If an entry for a character is non-nil, a composite character\n\
+which contains that character is displayed so that\n\
+the glyph of that character is put without considering\n\
+an ascent and descent value of a previous character.");
Vuse_default_ascent = Qnil;
- DEFVAR_LISP ("alternative-fontname-alist", &Valternative_fontname_alist,
- "Alist of fontname vs list of the alternative fontnames.\n\
-When no font can be opened by a fontname, the corresponding\n\
-alternative fontnames are tried.");
- Valternative_fontname_alist = Qnil;
+ DEFVAR_LISP ("alternate-fontname-alist", &Valternate_fontname_alist,
+ "Alist of fontname vs list of the alternate fontnames.\n\
+When a specified font name is not found, the corresponding\n\
+alternate fontnames (if any) are tried instead.");
+ Valternate_fontname_alist = Qnil;
DEFVAR_LISP ("fontset-alias-alist", &Vfontset_alias_alist,
"Alist of fontset names vs the aliases.");
DEFVAR_LISP ("highlight-wrong-size-font", &Vhighlight_wrong_size_font,
"*Non-nil means highlight characters shown in wrong size fonts somehow.\n\
The way to highlight them depends on window system on which Emacs runs.\n\
-On X window, a rectangle is shown around each such character.");
- Vhighlight_wrong_size_font = Qt;
+On X11, a rectangle is shown around each such character.");
+ Vhighlight_wrong_size_font = Qnil;
DEFVAR_LISP ("clip-large-size-font", &Vclip_large_size_font,
- "*Non-nil means characters shown in large size fonts are clipped.\n\
+ "*Non-nil means characters shown in overlarge fonts are clipped.\n\
The height of clipping area is the same as that of an ASCII character.\n\
-The width of the area is the same as that of an ASCII character or\n\
-twice wider than that of an ASCII character depending on\n\
-the width (i.e. column numbers occupied on screen) of the character set\n\
-of the character.\n\
+The width of the area is the same as that of an ASCII character,\n\
+or twice as wide, depending on the character set's column-width.\n\
\n\
-In the case that you only have too large size font for a specific\n\
-charscter set, and clipping characters of the character set makes them\n\
-almost unreadable, you can set this variable to t to see the\n\
-characters in exchage for garbage dots left on your screen.");
+If the only font you have for a specific character set is too large,\n\
+and clipping these characters makes them hard to read,\n\
+you can set this variable to nil to display the characters without clipping.\n\
+The drawback is that you will get some garbage left on your screen.");
Vclip_large_size_font = Qt;
defsubr (&Squery_fontset);
HCoop / bpt / emacs.git / blobdiff