comparison src/xfaces.c @ 27114:4efa5e54e9a9

(Qunspecified_fg, Qunspecified_bg): Remove. (syms_of_xfaces): Remove their staticpro's. (tty_color_name): Return Lisp strings for unspecified fore- and back-ground colors. (Finternal_set_lisp_face_attribute): Remove the special treatment for Qunspecified_{f,b}g. (realize_default_face): Replace Qunspecified_{f,b}g with a Lisp string.

27113:21f49fa0782b

Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed;
Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded;
Lisp_Object Qultra_expanded;
Lisp_Object Qreleased_button, Qpressed_button;
Lisp_Object QCstyle, QCcolor, QCline_width;
Lisp_Object Qunspecified, Qunspecified_fg, Qunspecified_bg;

/* The symbol `x-charset-registry'.  This property of charsets defines
   the X registry and encoding that fonts should have that are used to
   display characters of that charset.  */

  /* FIXME: When/if w32 supports colors in non-window mode, there should
     be a call here to a w32-specific function that returns the color
     by index using the default color mapping on a Windows console.  */
#endif

  return
    idx == FACE_TTY_DEFAULT_FG_COLOR ? Qunspecified_fg
    : idx == FACE_TTY_DEFAULT_BG_COLOR ? Qunspecified_bg
    : Qunspecified;
}

/* Return non-zero if COLOR_NAME is a shade of gray (or white or
   black) on frame F.  The algorithm is taken from 20.2 faces.el.  */

      old_value = LFACE_INVERSE (lface);
      LFACE_INVERSE (lface) = value;
    }
  else if (EQ (attr, QCforeground))
    {
      if (!UNSPECIFIEDP (value)
	  && !EQ (value, Qunspecified_fg) && !EQ (value, Qunspecified_bg))
	{
	  /* Don't check for valid color names here because it depends
	     on the frame (display) whether the color will be valid
	     when the face is realized.  */
	  CHECK_STRING (value, 3);

      old_value = LFACE_FOREGROUND (lface);
      LFACE_FOREGROUND (lface) = value;
    }
  else if (EQ (attr, QCbackground))
    {
      if (!UNSPECIFIEDP (value)
	  && !EQ (value, Qunspecified_bg) && !EQ (value, Qunspecified_fg))
	{
	  /* Don't check for valid color names here because it depends
	     on the frame (display) whether the color will be valid
	     when the face is realized.  */
	  CHECK_STRING (value, 3);

      if (CONSP (color) && STRINGP (XCDR (color)))
	LFACE_FOREGROUND (lface) = XCDR (color);
      else if (FRAME_X_P (f))
	return 0;
      else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
	LFACE_FOREGROUND (lface) = Qunspecified_fg;
      else
	abort ();
    }
  
  if (UNSPECIFIEDP (LFACE_BACKGROUND (lface)))

      if (CONSP (color) && STRINGP (XCDR (color)))
	LFACE_BACKGROUND (lface) = XCDR (color);
      else if (FRAME_X_P (f))
	return 0;
      else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
	LFACE_BACKGROUND (lface) = Qunspecified_bg;
      else
	abort ();
    }
  
  if (UNSPECIFIEDP (LFACE_STIPPLE (lface)))

  staticpro (&Qbackground_color);
  Qforeground_color = intern ("foreground-color");
  staticpro (&Qforeground_color);
  Qunspecified = intern ("unspecified");
  staticpro (&Qunspecified);
  Qunspecified_fg = intern ("unspecified-fg");
  staticpro (&Qunspecified_fg);
  Qunspecified_bg = intern ("unspecified-bg");
  staticpro (&Qunspecified_bg);

  Qx_charset_registry = intern ("x-charset-registry");
  staticpro (&Qx_charset_registry);
  Qface_alias = intern ("face-alias");
  staticpro (&Qface_alias);

27114:4efa5e54e9a9

Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed;
Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded;
Lisp_Object Qultra_expanded;
Lisp_Object Qreleased_button, Qpressed_button;
Lisp_Object QCstyle, QCcolor, QCline_width;
Lisp_Object Qunspecified;

char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg";

/* The symbol `x-charset-registry'.  This property of charsets defines
   the X registry and encoding that fonts should have that are used to
   display characters of that charset.  */

  /* FIXME: When/if w32 supports colors in non-window mode, there should
     be a call here to a w32-specific function that returns the color
     by index using the default color mapping on a Windows console.  */
#endif

  if (idx == FACE_TTY_DEFAULT_FG_COLOR)
    return build_string (unspecified_fg);
  if (idx == FACE_TTY_DEFAULT_BG_COLOR)
    return build_string (unspecified_bg);
  return Qunspecified;
}

/* Return non-zero if COLOR_NAME is a shade of gray (or white or
   black) on frame F.  The algorithm is taken from 20.2 faces.el.  */

      old_value = LFACE_INVERSE (lface);
      LFACE_INVERSE (lface) = value;
    }
  else if (EQ (attr, QCforeground))
    {
      if (!UNSPECIFIEDP (value))
	{
	  /* Don't check for valid color names here because it depends
	     on the frame (display) whether the color will be valid
	     when the face is realized.  */
	  CHECK_STRING (value, 3);

      old_value = LFACE_FOREGROUND (lface);
      LFACE_FOREGROUND (lface) = value;
    }
  else if (EQ (attr, QCbackground))
    {
      if (!UNSPECIFIEDP (value))
	{
	  /* Don't check for valid color names here because it depends
	     on the frame (display) whether the color will be valid
	     when the face is realized.  */
	  CHECK_STRING (value, 3);

      if (CONSP (color) && STRINGP (XCDR (color)))
	LFACE_FOREGROUND (lface) = XCDR (color);
      else if (FRAME_X_P (f))
	return 0;
      else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
	LFACE_FOREGROUND (lface) = build_string (unspecified_fg);
      else
	abort ();
    }
  
  if (UNSPECIFIEDP (LFACE_BACKGROUND (lface)))

      if (CONSP (color) && STRINGP (XCDR (color)))
	LFACE_BACKGROUND (lface) = XCDR (color);
      else if (FRAME_X_P (f))
	return 0;
      else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
	LFACE_BACKGROUND (lface) = build_string (unspecified_bg);
      else
	abort ();
    }
  
  if (UNSPECIFIEDP (LFACE_STIPPLE (lface)))

  staticpro (&Qbackground_color);
  Qforeground_color = intern ("foreground-color");
  staticpro (&Qforeground_color);
  Qunspecified = intern ("unspecified");
  staticpro (&Qunspecified);

  Qx_charset_registry = intern ("x-charset-registry");
  staticpro (&Qx_charset_registry);
  Qface_alias = intern ("face-alias");
  staticpro (&Qface_alias);