comparison src/xfaces.c @ 90044:cb7f41387eb3

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-70 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-669 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-678 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-679 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-680 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-688 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-689 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-690 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-691 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-69 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-70 - [e-mail]--gnu-2004/gnus--rel--5.10--patch-71 Update from CVS

90043:e24e2e78deda

   unless both FROM and TO are relative.  GCPRO is a lisp value that
   will be protected from garbage-collection if this function makes a
   call into lisp.  */

Lisp_Object
merge_face_heights (from, to, invalid, gcpro)
     Lisp_Object from, to, invalid, gcpro;
{
  Lisp_Object result = invalid;

  if (INTEGERP (from))
    /* FROM is absolute, just use it as is.  */

    /* FROM is a function, which use to adjust TO.  */
    {
      /* Call function with current height as argument.
	 From is the new height.  */
      Lisp_Object args[2];
      struct gcpro gcpro1;

      GCPRO1 (gcpro);

      args[0] = from;
      args[1] = to;
      result = safe_call (2, args);

      UNGCPRO;

      /* Ensure that if TO was absolute, so is the result.  */
      if (INTEGERP (to) && !INTEGERP (result))
	result = invalid;
    }

  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (!UNSPECIFIEDP (from[i]))
      {
	if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
	  to[i] = merge_face_heights (from[i], to[i], to[i],
				      named_merge_points);
	else
	  to[i] = from[i];
      }

  /* TO is always an absolute face, which should inherit from nothing.

  struct named_merge_point named_merge_point;

  if (push_named_merge_point (&named_merge_point,
			      face_name, &named_merge_points))
    {
      Lisp_Object from[LFACE_VECTOR_SIZE];
      int ok = get_lface_attributes (f, face_name, from, 0);

      if (ok)
	merge_face_vectors (f, from, to, named_merge_points);

      return ok;
    }
  else
    return 0;

		    err = 1;
		}
	      else if (EQ (keyword, QCheight))
		{
		  Lisp_Object new_height =
		    merge_face_heights (value, to[LFACE_HEIGHT_INDEX],
					Qnil, Qnil);

		  if (! NILP (new_height))
		    to[LFACE_HEIGHT_INDEX] = new_height;
		  else
		    err = 1;

	  test = (EQ (face, Qdefault)
		  ? value
		  /* The default face must have an absolute size,
		     otherwise, we do a test merge with a random
		     height to see if VALUE's ok. */
		  : merge_face_heights (value, make_number (10), Qnil, Qnil));

	  if (!INTEGERP (test) || XINT (test) <= 0)
	    signal_error ("Invalid face height", value);
	}

     Lisp_Object attribute, value1, value2;
{
  if (EQ (value1, Qunspecified))
    return value2;
  else if (EQ (attribute, QCheight))
    return merge_face_heights (value1, value2, value1, Qnil);
  else
    return value1;
}

90044:cb7f41387eb3

   unless both FROM and TO are relative.  GCPRO is a lisp value that
   will be protected from garbage-collection if this function makes a
   call into lisp.  */

Lisp_Object
merge_face_heights (from, to, invalid)
     Lisp_Object from, to, invalid;
{
  Lisp_Object result = invalid;

  if (INTEGERP (from))
    /* FROM is absolute, just use it as is.  */

    /* FROM is a function, which use to adjust TO.  */
    {
      /* Call function with current height as argument.
	 From is the new height.  */
      Lisp_Object args[2];

      args[0] = from;
      args[1] = to;
      result = safe_call (2, args);

      /* Ensure that if TO was absolute, so is the result.  */
      if (INTEGERP (to) && !INTEGERP (result))
	result = invalid;
    }

  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (!UNSPECIFIEDP (from[i]))
      {
	if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
	  to[i] = merge_face_heights (from[i], to[i], to[i]);
	else
	  to[i] = from[i];
      }

  /* TO is always an absolute face, which should inherit from nothing.

  struct named_merge_point named_merge_point;

  if (push_named_merge_point (&named_merge_point,
			      face_name, &named_merge_points))
    {
      struct gcpro gcpro1;
      Lisp_Object from[LFACE_VECTOR_SIZE];
      int ok = get_lface_attributes (f, face_name, from, 0);

      if (ok)
	{
	  GCPRO1 (named_merge_point.face_name);
	  merge_face_vectors (f, from, to, named_merge_points);
	  UNGCPRO;
	}

      return ok;
    }
  else
    return 0;

		    err = 1;
		}
	      else if (EQ (keyword, QCheight))
		{
		  Lisp_Object new_height =
		    merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil);

		  if (! NILP (new_height))
		    to[LFACE_HEIGHT_INDEX] = new_height;
		  else
		    err = 1;

	  test = (EQ (face, Qdefault)
		  ? value
		  /* The default face must have an absolute size,
		     otherwise, we do a test merge with a random
		     height to see if VALUE's ok. */
		  : merge_face_heights (value, make_number (10), Qnil));

	  if (!INTEGERP (test) || XINT (test) <= 0)
	    signal_error ("Invalid face height", value);
	}

     Lisp_Object attribute, value1, value2;
{
  if (EQ (value1, Qunspecified))
    return value2;
  else if (EQ (attribute, QCheight))
    return merge_face_heights (value1, value2, value1);
  else
    return value1;
}