comparison src/xfont.c @ 103543:11b57e1bdb96

Change font_add_log to FONT_ADD_LOG.

103542:01b5e53f519a

    }

  x_uncatch_errors ();
  UNBLOCK_INPUT;

  font_add_log ("xfont-list", build_string (pattern), list);
  return list;
}

static Lisp_Object
xfont_list (frame, spec)

	}
      XFreeFont (display, xfont);
    }
  UNBLOCK_INPUT;

  font_add_log ("xfont-match", spec, entity);
  return entity;
}

static Lisp_Object
xfont_list_family (frame)

  /* At first, check if we know how to encode characters for this
     font.  */
  registry = AREF (entity, FONT_REGISTRY_INDEX);
  if (font_registry_charsets (registry, &encoding, &repertory) < 0)
    {
      font_add_log ("  x:unknown registry", registry, Qnil);
      return Qnil;
    }

  if (XINT (AREF (entity, FONT_SIZE_INDEX)) != 0)
    pixel_size = XINT (AREF (entity, FONT_SIZE_INDEX));

	pixel_size = 14;
    }
  len = font_unparse_xlfd (entity, pixel_size, name, 512);
  if (len <= 0 || (len = xfont_encode_coding_xlfd (name)) < 0)
    {
      font_add_log ("  x:unparse failed", entity, Qnil);
      return Qnil;
    }

  BLOCK_INPUT;
  x_catch_errors (display);

      temp = Fcopy_font_spec (entity);
      ASET (temp, FONT_DPI_INDEX, Qnil);
      len = font_unparse_xlfd (temp, pixel_size, name, 512);
      if (len <= 0 || (len = xfont_encode_coding_xlfd (name)) < 0)
	{
	  font_add_log ("  x:unparse failed", temp, Qnil);
	  return Qnil;
	}
      xfont = XLoadQueryFont (display, name);
      if (x_had_errors_p (display))
	{

  x_uncatch_errors ();
  UNBLOCK_INPUT;

  if (! xfont)
    {
      font_add_log ("  x:open failed", build_string (name), Qnil);
      return Qnil;
    }

  font_object = font_make_object (VECSIZE (struct xfont_info),
				  entity, pixel_size);

103543:11b57e1bdb96

    }

  x_uncatch_errors ();
  UNBLOCK_INPUT;

  FONT_ADD_LOG ("xfont-list", build_string (pattern), list);
  return list;
}

static Lisp_Object
xfont_list (frame, spec)

	}
      XFreeFont (display, xfont);
    }
  UNBLOCK_INPUT;

  FONT_ADD_LOG ("xfont-match", spec, entity);
  return entity;
}

static Lisp_Object
xfont_list_family (frame)

  /* At first, check if we know how to encode characters for this
     font.  */
  registry = AREF (entity, FONT_REGISTRY_INDEX);
  if (font_registry_charsets (registry, &encoding, &repertory) < 0)
    {
      FONT_ADD_LOG ("  x:unknown registry", registry, Qnil);
      return Qnil;
    }

  if (XINT (AREF (entity, FONT_SIZE_INDEX)) != 0)
    pixel_size = XINT (AREF (entity, FONT_SIZE_INDEX));

	pixel_size = 14;
    }
  len = font_unparse_xlfd (entity, pixel_size, name, 512);
  if (len <= 0 || (len = xfont_encode_coding_xlfd (name)) < 0)
    {
      FONT_ADD_LOG ("  x:unparse failed", entity, Qnil);
      return Qnil;
    }

  BLOCK_INPUT;
  x_catch_errors (display);

      temp = Fcopy_font_spec (entity);
      ASET (temp, FONT_DPI_INDEX, Qnil);
      len = font_unparse_xlfd (temp, pixel_size, name, 512);
      if (len <= 0 || (len = xfont_encode_coding_xlfd (name)) < 0)
	{
	  FONT_ADD_LOG ("  x:unparse failed", temp, Qnil);
	  return Qnil;
	}
      xfont = XLoadQueryFont (display, name);
      if (x_had_errors_p (display))
	{

  x_uncatch_errors ();
  UNBLOCK_INPUT;

  if (! xfont)
    {
      FONT_ADD_LOG ("  x:open failed", build_string (name), Qnil);
      return Qnil;
    }

  font_object = font_make_object (VECSIZE (struct xfont_info),
				  entity, pixel_size);