comparison src/xterm.c @ 22503:104e277d77d3

(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use XLoadQueryFont instead of XListFonts. (x_load_fonts): Call x_list_fonts with MAXNAMES 1.

22502:627b13315f04

     int size;
     int maxnames;
{
  Lisp_Object list = Qnil, patterns, newlist = Qnil, key, tem, second_best;
  Display *dpy = f != NULL ? FRAME_X_DISPLAY (f) : x_display_list->display;

  patterns = Fassoc (pattern, Valternate_fontname_alist);
  if (NILP (patterns))
    patterns = Fcons (pattern, Qnil);

  /* We try at least 10 fonts because X server will return auto-scaled
     fonts at the head.  */
  if (maxnames < 10) maxnames = 10;

  for (; CONSP (patterns); patterns = XCONS (patterns)->cdr)
    {
      int num_fonts;
      char **names;

	  /* We have a cashed list.  Don't have to get the list again.  */
	  goto label_cached;
	}

      /* At first, put PATTERN in the cache.  */
      BLOCK_INPUT;
      names = XListFonts (dpy, XSTRING (pattern)->data, maxnames, &num_fonts);
      UNBLOCK_INPUT;

      if (names)
	{
	  int i;

			/* For the moment, width is not known.  */
			list = Fcons (Fcons (tem, Qnil), list);
		    }
		}
	    }
	  XFreeFontNames (names);
	}

      /* Now store the result in the cache.  */
      if (f != NULL)
	XCONS (FRAME_X_DISPLAY_INFO (f)->name_list_element)->cdr

  Lisp_Object font_names;

  /* Get a list of all the fonts that match this name.  Once we
     have a list of matching fonts, we compare them against the fonts
     we already have by comparing names.  */
  font_names = x_list_fonts (f, build_string (fontname), size, 256);

  if (!NILP (font_names))
    {
      Lisp_Object tail;
      int i;

22503:104e277d77d3

     int size;
     int maxnames;
{
  Lisp_Object list = Qnil, patterns, newlist = Qnil, key, tem, second_best;
  Display *dpy = f != NULL ? FRAME_X_DISPLAY (f) : x_display_list->display;
  int try_XLoadQueryFont = 0;

  patterns = Fassoc (pattern, Valternate_fontname_alist);
  if (NILP (patterns))
    patterns = Fcons (pattern, Qnil);

  if (maxnames == 1 && !size)
    /* We can return any single font matching PATTERN.  */
    try_XLoadQueryFont = 1;
  else
    {
      /* We try at least 10 fonts because XListFonts will return
	 auto-scaled fonts at the head.  */
      if (maxnames < 10) maxnames = 10;
    }

  for (; CONSP (patterns); patterns = XCONS (patterns)->cdr)
    {
      int num_fonts;
      char **names;

	  /* We have a cashed list.  Don't have to get the list again.  */
	  goto label_cached;
	}

      /* At first, put PATTERN in the cache.  */

      BLOCK_INPUT;
      if (try_XLoadQueryFont)
	{
	  XFontStruct *font;
	  unsigned long value;

	  font = XLoadQueryFont (dpy, XSTRING (pattern)->data);
	  if (font
	      && XGetFontProperty (font, XA_FONT, &value))
	    {
	      char *name = (char *) XGetAtomName (dpy, (Atom) value);
	      int len = strlen (name);

	      num_fonts = 1;
	      names = alloca (sizeof (char *));
	      names[0] = alloca (len + 1);
	      bcopy (name, names[0], len + 1);
	      XFree (name);
	    }
	  else
	    try_XLoadQueryFont = 0;
	}

      if (!try_XLoadQueryFont)
	names = XListFonts (dpy, XSTRING (pattern)->data, maxnames,
			    &num_fonts);
      UNBLOCK_INPUT;

      if (names)
	{
	  int i;

			/* For the moment, width is not known.  */
			list = Fcons (Fcons (tem, Qnil), list);
		    }
		}
	    }
	  if (!try_XLoadQueryFont)
	    XFreeFontNames (names);
	}

      /* Now store the result in the cache.  */
      if (f != NULL)
	XCONS (FRAME_X_DISPLAY_INFO (f)->name_list_element)->cdr

  Lisp_Object font_names;

  /* Get a list of all the fonts that match this name.  Once we
     have a list of matching fonts, we compare them against the fonts
     we already have by comparing names.  */
  font_names = x_list_fonts (f, build_string (fontname), size, 1);

  if (!NILP (font_names))
    {
      Lisp_Object tail;
      int i;