comparison src/w32fns.c @ 45465:84120e75baa0

* w32fns.c (enumfont_t): Remove tail, make pattern a normal Lisp_Object. (enum_font_cb2, enum_font_maybe_add_to_list, w32_list_fonts): Use modified enumfont_t struct. * w32fns.c (Qhbar): New variable. (x_specified_cursor_type): Use it.

45464:f45806ed6479

#define VIETNAMESE_CHARSET 163
#endif

Lisp_Object Qauto_raise;
Lisp_Object Qauto_lower;
Lisp_Object Qbar;
Lisp_Object Qborder_color;
Lisp_Object Qborder_width;
Lisp_Object Qbox;
Lisp_Object Qcursor_color;
Lisp_Object Qcursor_type;

	   && XINT (XCDR (arg)) >= 0)
    {
      type = BAR_CURSOR;
      *width = XINT (XCDR (arg));
    }
  else if (NILP (arg))
    type = NO_CURSOR;
  else
    /* Treat anything unknown as "box cursor".
       It was bad to signal an error; people have trouble fixing

{
  HDC hdc;
  int numFonts;
  LOGFONT logfont;
  XFontStruct *size_ref;
  Lisp_Object *pattern;
  Lisp_Object list;
  Lisp_Object *tail;
} enumfont_t;


static void
enum_font_maybe_add_to_list (enumfont_t *, LOGFONT *, char *, Lisp_Object);

    char *charset = NULL;

    /* Truetype fonts do not report their true metrics until loaded */
    if (FontType != RASTER_FONTTYPE)
      {
	if (!NILP (*(lpef->pattern)))
	  {
	    /* Scalable fonts are as big as you want them to be.  */
	    lplf->elfLogFont.lfHeight = lpef->logfont.lfHeight;
	    lplf->elfLogFont.lfWidth = lpef->logfont.lfWidth;
	    width = make_number (lpef->logfont.lfWidth);

          lplf->elfLogFont.lfHeight = lptm->tmInternalLeading - lptm->tmHeight;
        else
          lplf->elfLogFont.lfHeight = -lplf->elfLogFont.lfHeight;
      }

    if (!NILP (*(lpef->pattern)))
      {
        charset = xlfd_charset_of_font (XSTRING(*(lpef->pattern))->data);

	/* We already checked charsets above, but DEFAULT_CHARSET
           slipped through.  So only allow exact matches for DEFAULT_CHARSET.  */
	if (charset
	    && strncmp (charset, "*-*", 3) != 0

  char buf[100];

  if (!w32_to_x_font (logfont, buf, 100, match_charset))
    return;

  if (NILP (*(lpef->pattern))
      || w32_font_match (buf, XSTRING (*(lpef->pattern))->data))
    {
      /* Check if we already listed this font.  This may happen if
         w32_enable_synthesized_fonts is non-nil, and there are real
         bold and italic versions of the font.  */
      Lisp_Object font_name = build_string (buf);
      if (NILP (Fmember (font_name, lpef->list)))
	{
	  *lpef->tail = Fcons (Fcons (build_string (buf), width), Qnil);
	  lpef->tail = &(XCDR_AS_LVALUE (*lpef->tail));
	  lpef->numFonts++;
	}
    }
}

          goto label_cached;
        }

      BLOCK_INPUT;
      /* At first, put PATTERN in the cache.  */
      list = Qnil;
      ef.pattern = &tpat;
      ef.list = list;
      ef.tail = &list;
      ef.numFonts = 0;

      /* Use EnumFontFamiliesEx where it is available, as it knows
         about character sets.  Fall back to EnumFontFamilies for
         older versions of NT that don't support the 'Ex function.  */

        ReleaseDC (dpyinfo->root_window, ef.hdc);
      }

      UNBLOCK_INPUT;

      /* Make a list of the fonts we got back.
         Store that in the font cache for the display. */
      XSETCDR (dpyinfo->name_list_element,
	       Fcons (Fcons (tpat, list),

  staticpro (&Qauto_raise);
  Qauto_lower = intern ("auto-lower");
  staticpro (&Qauto_lower);
  Qbar = intern ("bar");
  staticpro (&Qbar);
  Qborder_color = intern ("border-color");
  staticpro (&Qborder_color);
  Qborder_width = intern ("border-width");
  staticpro (&Qborder_width);
  Qbox = intern ("box");

45465:84120e75baa0

#define VIETNAMESE_CHARSET 163
#endif

Lisp_Object Qauto_raise;
Lisp_Object Qauto_lower;
Lisp_Object Qbar, Qhbar;
Lisp_Object Qborder_color;
Lisp_Object Qborder_width;
Lisp_Object Qbox;
Lisp_Object Qcursor_color;
Lisp_Object Qcursor_type;

	   && XINT (XCDR (arg)) >= 0)
    {
      type = BAR_CURSOR;
      *width = XINT (XCDR (arg));
    }
  else if (EQ (arg, Qhbar))
    {
      type = HBAR_CURSOR;
      *width = 2;
    }
  else if (CONSP (arg)
	   && EQ (XCAR (arg), Qhbar)
	   && INTEGERP (XCDR (arg))
	   && XINT (XCDR (arg)) >= 0)
    {
      type = HBAR_CURSOR;
      *width = XINT (XCDR (arg));
    }
  else if (NILP (arg))
    type = NO_CURSOR;
  else
    /* Treat anything unknown as "box cursor".
       It was bad to signal an error; people have trouble fixing

{
  HDC hdc;
  int numFonts;
  LOGFONT logfont;
  XFontStruct *size_ref;
  Lisp_Object pattern;
  Lisp_Object list;
} enumfont_t;


static void
enum_font_maybe_add_to_list (enumfont_t *, LOGFONT *, char *, Lisp_Object);

    char *charset = NULL;

    /* Truetype fonts do not report their true metrics until loaded */
    if (FontType != RASTER_FONTTYPE)
      {
	if (!NILP (lpef->pattern))
	  {
	    /* Scalable fonts are as big as you want them to be.  */
	    lplf->elfLogFont.lfHeight = lpef->logfont.lfHeight;
	    lplf->elfLogFont.lfWidth = lpef->logfont.lfWidth;
	    width = make_number (lpef->logfont.lfWidth);

          lplf->elfLogFont.lfHeight = lptm->tmInternalLeading - lptm->tmHeight;
        else
          lplf->elfLogFont.lfHeight = -lplf->elfLogFont.lfHeight;
      }

    if (!NILP (lpef->pattern))
      {
        charset = xlfd_charset_of_font (XSTRING(lpef->pattern)->data);

	/* We already checked charsets above, but DEFAULT_CHARSET
           slipped through.  So only allow exact matches for DEFAULT_CHARSET.  */
	if (charset
	    && strncmp (charset, "*-*", 3) != 0

  char buf[100];

  if (!w32_to_x_font (logfont, buf, 100, match_charset))
    return;

  if (NILP (lpef->pattern)
      || w32_font_match (buf, XSTRING (lpef->pattern)->data))
    {
      /* Check if we already listed this font.  This may happen if
         w32_enable_synthesized_fonts is non-nil, and there are real
         bold and italic versions of the font.  */
      Lisp_Object font_name = build_string (buf);
      if (NILP (Fmember (font_name, lpef->list)))
	{
	  Lisp_Object entry = Fcons (font_name, width);
	  lpef->list = Fcons (entry, lpef->list);
	  lpef->numFonts++;
	}
    }
}

          goto label_cached;
        }

      BLOCK_INPUT;
      /* At first, put PATTERN in the cache.  */
      ef.pattern = tpat;
      ef.list = Qnil;
      ef.numFonts = 0;

      /* Use EnumFontFamiliesEx where it is available, as it knows
         about character sets.  Fall back to EnumFontFamilies for
         older versions of NT that don't support the 'Ex function.  */

        ReleaseDC (dpyinfo->root_window, ef.hdc);
      }

      UNBLOCK_INPUT;
      list = ef.list;

      /* Make a list of the fonts we got back.
         Store that in the font cache for the display. */
      XSETCDR (dpyinfo->name_list_element,
	       Fcons (Fcons (tpat, list),

  staticpro (&Qauto_raise);
  Qauto_lower = intern ("auto-lower");
  staticpro (&Qauto_lower);
  Qbar = intern ("bar");
  staticpro (&Qbar);
  Qhbar = intern ("hbar");
  staticpro (&Qhbar);
  Qborder_color = intern ("border-color");
  staticpro (&Qborder_color);
  Qborder_width = intern ("border-width");
  staticpro (&Qborder_width);
  Qbox = intern ("box");