emacs: src/xterm.c comparison

comparison src/xterm.c @ 35367:68000d773920

(x_list_fonts): Allow scalable fonts if SIZE is < 0, In the cache, use a key containing the information if scalable fonts are included. (x_load_font): Adapt to change of keys in the font cache. (x_list_fonts): Ensure caching font information when called for a null frame, which is the case frequently when Emacs starts.

author	Gerd Moellmann <gerd@gnu.org>
date	Wed, 17 Jan 2001 15:46:19 +0000
parents	1f5511b1d5ea
children	2470cdee5ed8

comparison

equal deleted inserted replaced

-:94a6afe6cbef
+:68000d773920
 {
 return (FRAME_X_FONT_TABLE (f) + font_idx);
 }
-/* Return a list of names of available fonts matching PATTERN on frame
+/* Return a list of names of available fonts matching PATTERN on frame F.
-F.  If SIZE is not 0, it is the size (maximum bound width) of fonts
-to be listed.  Frame F NULL means we have not yet created any
+If SIZE is > 0, it is the size (maximum bounds width) of fonts
-frame on X, and consult the first display in x_display_list.
+to be listed.
-MAXNAMES sets a limit on how many fonts to match.  */
+SIZE < 0 means include scalable fonts.
+Frame F null means we have not yet created any frame on X, and
+consult the first display in x_display_list.  MAXNAMES sets a limit
+on how many fonts to match.  */
 Lisp_Object
 x_list_fonts (f, pattern, size, maxnames)
-FRAME_PTR f;
+struct frame *f;
 Lisp_Object pattern;
 int size;
 int maxnames;
 {
 Lisp_Object list = Qnil, patterns, newlist = Qnil, key = Qnil;
 Lisp_Object tem, second_best;
-Display *dpy = f != NULL ? FRAME_X_DISPLAY (f) : x_display_list->display;
+struct x_display_info *dpyinfo
+= f ? FRAME_X_DISPLAY_INFO (f) : x_display_list;
+Display *dpy = dpyinfo->display;
 int try_XLoadQueryFont = 0;
 int count;
+int allow_scalable_fonts_p = 0;
+if (size < 0)
+{
+allow_scalable_fonts_p = 1;
+size = 0;
+}
 patterns = Fassoc (pattern, Valternate_fontname_alist);
 if (NILP (patterns))
 patterns = Fcons (pattern, Qnil);
 char **names = NULL;
 pattern = XCAR (patterns);
 /* See if we cached the result for this particular query.
 The cache is an alist of the form:
-	   (((PATTERN . MAXNAMES) (FONTNAME . WIDTH) ...) ...)
+	 ((((PATTERN . MAXNAMES) . SCALABLE) (FONTNAME . WIDTH) ...) ...)  */
-*/
+tem = XCDR (dpyinfo->name_list_element);
-if (f && (tem = XCDR (FRAME_X_DISPLAY_INFO (f)->name_list_element),
+key = Fcons (Fcons (pattern, make_number (maxnames)),
-		key = Fcons (pattern, make_number (maxnames)),
+		   allow_scalable_fonts_p ? Qt : Qnil);
-		!NILP (list = Fassoc (key, tem))))
+list = Fassoc (key, tem);
+if (!NILP (list))
 	{
 	  list = Fcdr_safe (list);
 	  /* We have a cashed list.  Don't have to get the list again.  */
 	  goto label_cached;
 	}
 	      int width = 0;
 	      char *p = names[i];
 	      int average_width = -1, dashes = 0;
 	      /* Count the number of dashes in NAMES[I].  If there are
-		14 dashes, and the field value following 12th dash
+		 14 dashes, and the field value following 12th dash
-		(AVERAGE_WIDTH) is 0, this is a auto-scaled font which
+		 (AVERAGE_WIDTH) is 0, this is a auto-scaled font which
-		is usually too ugly to be used for editing.  Let's
+		 is usually too ugly to be used for editing.  Let's
-		ignore it.  */
+		 ignore it.  */
 	      while (*p)
 		if (*p++ == '-')
 		  {
 		    dashes++;
 		    if (dashes == 7) /* PIXEL_SIZE field */
 		      width = atoi (p);
 		    else if (dashes == 12) /* AVERAGE_WIDTH field */
 		      average_width = atoi (p);
 		  }
-	      if (dashes < 14 || average_width != 0)
+	      if (allow_scalable_fonts_p
+		  || dashes < 14 || average_width != 0)
 		{
 		  tem = build_string (names[i]);
 		  if (NILP (Fassoc (tem, list)))
 		    {
 		      if (STRINGP (Vx_pixel_size_width_font_regexp)
 	  if (!try_XLoadQueryFont)
 	    XFreeFontNames (names);
 	}
 /* Now store the result in the cache.  */
-if (f != NULL)
+XCDR (dpyinfo->name_list_element)
-	XCDR (FRAME_X_DISPLAY_INFO (f)->name_list_element)
+= Fcons (Fcons (key, list), XCDR (dpyinfo->name_list_element));
-	  = Fcons (Fcons (key, list),
-		   XCDR (FRAME_X_DISPLAY_INFO (f)->name_list_element));
 label_cached:
 if (NILP (list)) continue; /* Try the remaining alternatives.  */
 newlist = second_best = Qnil;
 	    }
 	  if (!INTEGERP (XCDR (tem)))
 	    {
 	      /* Since we have not yet known the size of this font, we
-		must try slow function call XLoadQueryFont.  */
+		 must try slow function call XLoadQueryFont.  */
 	      XFontStruct *thisinfo;
 	      BLOCK_INPUT;
 	      count = x_catch_errors (dpy);
 	      thisinfo = XLoadQueryFont (dpy,
 	/* We come here because of a bug of XListFonts mentioned at
 	   the head of this block.  Let's store this information in
 	   the cache for x_list_fonts.  */
 	Lisp_Object lispy_name = build_string (fontname);
 	Lisp_Object lispy_full_name = build_string (fontp->full_name);
+	Lisp_Object key = Fcons (Fcons (lispy_name, make_number (256)),
+				 Qnil);
 	XCDR (dpyinfo->name_list_element)
-	  = Fcons (Fcons (Fcons (lispy_name, make_number (256)),
+	  = Fcons (Fcons (key,
 			  Fcons (Fcons (lispy_full_name,
 					make_number (fontp->size)),
 				 Qnil)),
 		   XCDR (dpyinfo->name_list_element));
 	if (full_name)
-	  XCDR (dpyinfo->name_list_element)
+	  {
-	    = Fcons (Fcons (Fcons (lispy_full_name, make_number (256)),
+	    key = Fcons (Fcons (lispy_full_name, make_number (256)),
-			    Fcons (Fcons (lispy_full_name,
+			 Qnil);
-					  make_number (fontp->size)),
+	    XCDR (dpyinfo->name_list_element)
-				   Qnil)),
+	      = Fcons (Fcons (key,
-		     XCDR (dpyinfo->name_list_element));
+			      Fcons (Fcons (lispy_full_name,
+					    make_number (fontp->size)),
+				     Qnil)),
+		       XCDR (dpyinfo->name_list_element));
+	  }
 }
 /* The slot `encoding' specifies how to map a character
 code-points (0x20..0x7F or 0x2020..0x7F7F) of each charset to
 the font code-points (0:0x20..0x7F, 1:0xA0..0xFF), or

Mercurial > emacs

comparison src/xterm.c @ 35367:68000d773920