comparison src/xfaces.c @ 83276:26c9034f3533

Merged from [e-mail]--gnu-2005 (patch 192-203) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-192 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-193 Use gdb-ui breakpoint faces on ttys too * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-194 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-195 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-196 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-197 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-198 Tweak gdb-ui breakpoint faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-199 Tweak gdb-ui breakpoint faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-200 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-201 Tweak info/.arch-inventory to identify info/.cvsignore as source * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-202 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-203 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-316

83275:87d0734390da

   SYMBOL.  This is like lookup_named_face, except that the default
   attributes come from FACE_ID, not from the default face.  FACE_ID
   is assumed to be already realized.  */

int
lookup_derived_face (f, symbol, c, face_id)
     struct frame *f;
     Lisp_Object symbol;
     int c;
     int face_id;
{

  struct face *default_face = FACE_FROM_ID (f, face_id);

  if (!default_face)
    abort ();

  get_lface_attributes (f, symbol, symbol_attrs, 1);
  bcopy (default_face->lface, attrs, sizeof attrs);
  merge_face_vectors (f, symbol_attrs, attrs, 0);
  return lookup_face (f, attrs, c, default_face);
}

  if (EQ (face_name, Qt))
    {
      if (face_id < 0 || face_id >= lface_id_to_name_size)
	return base_face_id;
      face_name = lface_id_to_name[face_id];
      face_id = lookup_derived_face (f, face_name, 0, base_face_id);
      if (face_id >= 0)
	return face_id;
      return base_face_id;
    }

83276:26c9034f3533

   SYMBOL.  This is like lookup_named_face, except that the default
   attributes come from FACE_ID, not from the default face.  FACE_ID
   is assumed to be already realized.  */

int
lookup_derived_face (f, symbol, c, face_id, signal_p)
     struct frame *f;
     Lisp_Object symbol;
     int c;
     int face_id;
{

  struct face *default_face = FACE_FROM_ID (f, face_id);

  if (!default_face)
    abort ();

  get_lface_attributes (f, symbol, symbol_attrs, signal_p);
  bcopy (default_face->lface, attrs, sizeof attrs);
  merge_face_vectors (f, symbol_attrs, attrs, 0);
  return lookup_face (f, attrs, c, default_face);
}

  if (EQ (face_name, Qt))
    {
      if (face_id < 0 || face_id >= lface_id_to_name_size)
	return base_face_id;
      face_name = lface_id_to_name[face_id];
      face_id = lookup_derived_face (f, face_name, 0, base_face_id, 1);
      if (face_id >= 0)
	return face_id;
      return base_face_id;
    }