comparison src/xfaces.c @ 27088:23bd823f11f4

(tty_defined_color): Pass frame to tty-color-desc. The list of colors renamed to tty-defined-color-alist. (tty_color_name): Pass the frame to tty-color-by-index. (realize_tty_face): tty-color-alist is now a function which accepts the frame as argument.

27087:8de2d17323c2

  int color_idx = FACE_TTY_DEFAULT_COLOR, red = 0, green = 0, blue = 0;
  int status = 1;

  if (*color_name && !NILP (Ffboundp (Qtty_color_desc)))
    {
      status = 0;
      color_desc = call1 (Qtty_color_desc, build_string (color_name));
      if (CONSP (color_desc) && CONSP (XCDR (color_desc)))
	{
	  color_idx = XINT (XCAR (XCDR (color_desc)));
	  if (CONSP (XCDR (XCDR (color_desc))))
	    {

	      green = XINT (XCAR (XCDR (XCDR (XCDR (color_desc)))));
	      blue = XINT (XCAR (XCDR (XCDR (XCDR (XCDR (color_desc))))));
	    }
	  status = 1;
	}
      else if (NILP (Fsymbol_value (intern ("tty-color-alist"))))
	/* We were called early during startup, and the colors are not
	   yet set up in tty-color-alist.  Don't return a failure
	   indication, since this produces the annoying "Unable to
	   load color" messages in the *Messages* buffer.  */
	status = 1;
    }
  if (color_idx == FACE_TTY_DEFAULT_COLOR && *color_name)

{
  char *color;

  if (idx >= 0 && !NILP (Ffboundp (Qtty_color_by_index)))
    {
      Lisp_Object coldesc = call1 (Qtty_color_by_index, make_number (idx));

      if (!NILP (coldesc))
	return XCAR (coldesc);
    }
#ifdef MSDOS

     int charset;
{
  struct face *face;
  int weight, slant;
  Lisp_Object color;
  Lisp_Object tty_color_alist = Fsymbol_value (intern ("tty-color-alist"));
  int face_colors_defaulted = 0;

  /* Frame must be a termcap frame.  */
  xassert (FRAME_TERMCAP_P (c->f) || FRAME_MSDOS_P (c->f));
  

  /* Map color names to color indices.  */
  face->foreground = FACE_TTY_DEFAULT_FG_COLOR;
  face->background = FACE_TTY_DEFAULT_BG_COLOR;

  color = attrs[LFACE_FOREGROUND_INDEX];
  if (STRINGP (color)
      && XSTRING (color)->size
      && !NILP (tty_color_alist)
      && (color = Fassoc (color, tty_color_alist),
	  CONSP (color)))
    /* Associations in tty-color-alist are of the form
       (NAME INDEX R G B).  We need the INDEX part.  */
    face->foreground = XINT (XCAR (XCDR (color)));

  if (face->foreground == FACE_TTY_DEFAULT_FG_COLOR
      && STRINGP (attrs[LFACE_FOREGROUND_INDEX]))

    }

  color = attrs[LFACE_BACKGROUND_INDEX];
  if (STRINGP (color)
      && XSTRING (color)->size
      && !NILP (tty_color_alist)
      && (color = Fassoc (color, tty_color_alist),
	  CONSP (color)))
    /* Associations in tty-color-alist are of the form
       (NAME INDEX R G B).  We need the INDEX part.  */
    face->background = XINT (XCAR (XCDR (color)));

  if (face->background == FACE_TTY_DEFAULT_BG_COLOR
      && STRINGP (attrs[LFACE_BACKGROUND_INDEX]))

27088:23bd823f11f4

  int color_idx = FACE_TTY_DEFAULT_COLOR, red = 0, green = 0, blue = 0;
  int status = 1;

  if (*color_name && !NILP (Ffboundp (Qtty_color_desc)))
    {
      Lisp_Object frame;

      XSETFRAME (frame, f);
      status = 0;
      color_desc = call2 (Qtty_color_desc, build_string (color_name), frame);
      if (CONSP (color_desc) && CONSP (XCDR (color_desc)))
	{
	  color_idx = XINT (XCAR (XCDR (color_desc)));
	  if (CONSP (XCDR (XCDR (color_desc))))
	    {

	      green = XINT (XCAR (XCDR (XCDR (XCDR (color_desc)))));
	      blue = XINT (XCAR (XCDR (XCDR (XCDR (XCDR (color_desc))))));
	    }
	  status = 1;
	}
      else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist"))))
	/* We were called early during startup, and the colors are not
	   yet set up in tty-defined-color-alist.  Don't return a failure
	   indication, since this produces the annoying "Unable to
	   load color" messages in the *Messages* buffer.  */
	status = 1;
    }
  if (color_idx == FACE_TTY_DEFAULT_COLOR && *color_name)

{
  char *color;

  if (idx >= 0 && !NILP (Ffboundp (Qtty_color_by_index)))
    {
      Lisp_Object frame;
      Lisp_Object coldesc;

      XSETFRAME (frame, f);
      coldesc = call2 (Qtty_color_by_index, make_number (idx), frame);

      if (!NILP (coldesc))
	return XCAR (coldesc);
    }
#ifdef MSDOS

     int charset;
{
  struct face *face;
  int weight, slant;
  Lisp_Object color;
  Lisp_Object tty_defined_color_alist =
    Fsymbol_value (intern ("tty-defined-color-alist"));
  Lisp_Object tty_color_alist = intern ("tty-color-alist");
  Lisp_Object frame;
  int face_colors_defaulted = 0;

  /* Frame must be a termcap frame.  */
  xassert (FRAME_TERMCAP_P (c->f) || FRAME_MSDOS_P (c->f));
  

  /* Map color names to color indices.  */
  face->foreground = FACE_TTY_DEFAULT_FG_COLOR;
  face->background = FACE_TTY_DEFAULT_BG_COLOR;

  XSETFRAME (frame, c->f);
  color = attrs[LFACE_FOREGROUND_INDEX];
  if (STRINGP (color)
      && XSTRING (color)->size
      && !NILP (tty_defined_color_alist)
      && (color = Fassoc (color, call1 (tty_color_alist, frame)),
	  CONSP (color)))
    /* Associations in tty-defined-color-alist are of the form
       (NAME INDEX R G B).  We need the INDEX part.  */
    face->foreground = XINT (XCAR (XCDR (color)));

  if (face->foreground == FACE_TTY_DEFAULT_FG_COLOR
      && STRINGP (attrs[LFACE_FOREGROUND_INDEX]))

    }

  color = attrs[LFACE_BACKGROUND_INDEX];
  if (STRINGP (color)
      && XSTRING (color)->size
      && !NILP (tty_defined_color_alist)
      && (color = Fassoc (color, call1 (tty_color_alist, frame)),
	  CONSP (color)))
    /* Associations in tty-defined-color-alist are of the form
       (NAME INDEX R G B).  We need the INDEX part.  */
    face->background = XINT (XCAR (XCDR (color)));

  if (face->background == FACE_TTY_DEFAULT_BG_COLOR
      && STRINGP (attrs[LFACE_BACKGROUND_INDEX]))