comparison src/term.c @ 83512:5d328dadd0f4

Make `tty-display-color-p' follow its doc string. (Reported by Dan Nicolaescu.) * lisp/vc.el (vc-annotate-color-map): Undo previous change. * src/dispnew.c (Fsend_string_to_terminal): Update call to `get_tty_terminal'. * src/term.c (Fsuspend_tty, Fresume_tty): Update call to `get_tty_terminal'. (get_tty_terminal): Add throw parameter. (Ftty_display_color_p, Ftty_display_color_cells): Don't throw errors on X frames. * src/dispextern.h (get_tty_terminal): Update prototype. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-552

83511:f714f11da40a

frame's terminal).  This function always returns nil if TERMINAL
is not on a tty device.  */)
     (terminal)
     Lisp_Object terminal;
{
  struct terminal *t = get_tty_terminal (terminal);
  if (!t)
    return Qnil;
  else
    return t->display_info.tty->TN_max_colors > 0 ? Qt : Qnil;
}

DEFUN ("tty-display-color-cells", Ftty_display_color_cells,
       Stty_display_color_cells, 0, 1, 0,
       doc: /* Return the number of colors supported by the tty device TERMINAL.

TERMINAL can be a terminal id, a frame or nil (meaning the selected
frame's terminal).  This function always returns nil if TERMINAL
is not on a tty device.  */)
     (terminal)
     Lisp_Object terminal;
{
  struct terminal *t = get_tty_terminal (terminal);
  if (!t)
    return make_number (0);
  else
    return make_number (t->display_info.tty->TN_max_colors);
}



/* Return the tty display object specified by TERMINAL. */

struct terminal *
get_tty_terminal (Lisp_Object terminal)
{
  struct terminal *t = get_terminal (terminal, 0);

  if (t && t->type == output_initial)
    t = NULL;

  if (t && t->type != output_termcap)
    error ("Device %d is not a termcap terminal device", t->id);

  return t;
}

/* Return the active termcap device that uses the tty device with the

A suspended tty may be resumed by calling `resume-tty' on it.  */)
     (tty)
     Lisp_Object tty;
{
  struct terminal *t = get_tty_terminal (tty);
  FILE *f;
  
  if (!t)
    error ("Unknown tty device");

TTY may be a terminal id, a frame, or nil for the terminal device of
the currently selected frame. */)
     (tty)
     Lisp_Object tty;
{
  struct terminal *t = get_tty_terminal (tty);
  int fd;

  if (!t)
    error ("Unknown tty device");

83512:5d328dadd0f4

frame's terminal).  This function always returns nil if TERMINAL
is not on a tty device.  */)
     (terminal)
     Lisp_Object terminal;
{
  struct terminal *t = get_tty_terminal (terminal, 0);
  if (!t)
    return Qnil;
  else
    return t->display_info.tty->TN_max_colors > 0 ? Qt : Qnil;
}

DEFUN ("tty-display-color-cells", Ftty_display_color_cells,
       Stty_display_color_cells, 0, 1, 0,
       doc: /* Return the number of colors supported by the tty device TERMINAL.

TERMINAL can be a terminal id, a frame or nil (meaning the selected
frame's terminal).  This function always returns 0 if TERMINAL
is not on a tty device.  */)
     (terminal)
     Lisp_Object terminal;
{
  struct terminal *t = get_tty_terminal (terminal, 0);
  if (!t)
    return make_number (0);
  else
    return make_number (t->display_info.tty->TN_max_colors);
}



/* Return the tty display object specified by TERMINAL. */

struct terminal *
get_tty_terminal (Lisp_Object terminal, int throw)
{
  struct terminal *t = get_terminal (terminal, throw);

  if (t && t->type == output_initial)
    return NULL;

  if (t && t->type != output_termcap)
    {
      if (throw)
        error ("Device %d is not a termcap terminal device", t->id);
      else
        return NULL;
    }

  return t;
}

/* Return the active termcap device that uses the tty device with the

A suspended tty may be resumed by calling `resume-tty' on it.  */)
     (tty)
     Lisp_Object tty;
{
  struct terminal *t = get_tty_terminal (tty, 1);
  FILE *f;
  
  if (!t)
    error ("Unknown tty device");

TTY may be a terminal id, a frame, or nil for the terminal device of
the currently selected frame. */)
     (tty)
     Lisp_Object tty;
{
  struct terminal *t = get_tty_terminal (tty, 1);
  int fd;

  if (!t)
    error ("Unknown tty device");