comparison src/font.c @ 90490:8ef2cbaf626a

(font_parse_xlfd): Fix generating of CHARSET_REGISTRY field. (font_has_char): Accept font-object too. (font_find_for_lface): Try at first with a size specified in face.

90489:78a820ef12db

	}
      else
	{
	  if (! NILP (f[XLFD_ENCODING_INDEX]))
	    f[XLFD_REGISTRY_INDEX]
	      = Fintern (concat2 (SYMBOL_NAME (f[XLFD_REGISTRY_INDEX]),
				  SYMBOL_NAME (f[XLFD_ENCODING_INDEX])), Qnil);
	}
    }

  if (! merge || NILP (AREF (font, FONT_FOUNDRY_INDEX)))

	break;
      }
}

int
font_has_char (f, font_entity, c)
     FRAME_PTR f;
     Lisp_Object font_entity;
     int c;
{
  Lisp_Object type = AREF (font_entity, FONT_TYPE_INDEX);
  struct font_driver_list *driver_list;

  for (driver_list = f->font_driver_list;
       driver_list && ! EQ (driver_list->driver->type, type);
       driver_list = driver_list->next);
  if (! driver_list)
    return -1;
  return driver_list->driver->has_char (font_entity, c);
}

unsigned
font_encode_char (font_object, c)
     Lisp_Object font_object;

    font_merge_old_spec (Qnil, lface[LFACE_FAMILY_INDEX], Qnil,
			 scratch_font_spec);
  if (NILP (AREF (scratch_font_spec, FONT_REGISTRY_INDEX)))
    ASET (scratch_font_spec, FONT_REGISTRY_INDEX, intern ("iso8859-1"));

  XSETFRAME (frame, f);
  entities = font_list_entities (frame, scratch_font_spec);
  while (ASIZE (entities) == 0)
    {
      if (! NILP (AREF (scratch_font_spec, FONT_FOUNDRY_INDEX))
	  && (NILP (spec) || NILP (AREF (spec, FONT_FOUNDRY_INDEX))))
	{
	  ASET (scratch_font_spec, FONT_FOUNDRY_INDEX, Qnil);
	  entities = font_list_entities (frame, scratch_font_spec);
	}

90490:8ef2cbaf626a

	}
      else
	{
	  if (! NILP (f[XLFD_ENCODING_INDEX]))
	    f[XLFD_REGISTRY_INDEX]
	      = Fintern (concat3 (SYMBOL_NAME (f[XLFD_REGISTRY_INDEX]),
				  build_string ("-"),
				  SYMBOL_NAME (f[XLFD_ENCODING_INDEX])), Qnil);
	}
    }

  if (! merge || NILP (AREF (font, FONT_FOUNDRY_INDEX)))

	break;
      }
}

int
font_has_char (f, font, c)
     FRAME_PTR f;
     Lisp_Object font;
     int c;
{
  struct font *fontp;

  if (FONT_ENTITY_P (font))
    {
      Lisp_Object type = AREF (font, FONT_TYPE_INDEX);
      struct font_driver_list *driver_list;

      for (driver_list = f->font_driver_list;
	   driver_list && ! EQ (driver_list->driver->type, type);
	   driver_list = driver_list->next);
      if (! driver_list)
	return 0;
      if (! driver_list->driver->has_char)
	return -1;
      return driver_list->driver->has_char (font, c);
    }

  xassert (FONT_OBJECT_P (font));
  fontp = XSAVE_VALUE (font)->pointer;

  if (fontp->driver->has_char)
    {
      int result = fontp->driver->has_char (fontp->entity, c);

      if (result >= 0)
	return result;
    }
  return (fontp->driver->encode_char (fontp, c) != FONT_INVALID_CODE);
}

unsigned
font_encode_char (font_object, c)
     Lisp_Object font_object;

    font_merge_old_spec (Qnil, lface[LFACE_FAMILY_INDEX], Qnil,
			 scratch_font_spec);
  if (NILP (AREF (scratch_font_spec, FONT_REGISTRY_INDEX)))
    ASET (scratch_font_spec, FONT_REGISTRY_INDEX, intern ("iso8859-1"));

  if (NILP (AREF (scratch_font_spec, FONT_SIZE_INDEX))
      && ! NILP (lface[LFACE_HEIGHT_INDEX]))
    {
      double pt = XINT (lface[LFACE_HEIGHT_INDEX]);
      int pixel_size = POINT_TO_PIXEL (pt / 10, f->resy);

      ASET (scratch_font_spec, FONT_SIZE_INDEX, make_number (pixel_size));
    }

  XSETFRAME (frame, f);
  entities = font_list_entities (frame, scratch_font_spec);
  while (ASIZE (entities) == 0)
    {
      if (! NILP (AREF (scratch_font_spec, FONT_SIZE_INDEX))
	  && (NILP (spec) || NILP (AREF (spec, FONT_SIZE_INDEX))))
	{
	  ASET (scratch_font_spec, FONT_SIZE_INDEX, Qnil);
	  entities = font_list_entities (frame, scratch_font_spec);
	}
      else if (! NILP (AREF (scratch_font_spec, FONT_FOUNDRY_INDEX))
	  && (NILP (spec) || NILP (AREF (spec, FONT_FOUNDRY_INDEX))))
	{
	  ASET (scratch_font_spec, FONT_FOUNDRY_INDEX, Qnil);
	  entities = font_list_entities (frame, scratch_font_spec);
	}