comparison src/terminal.c @ 84694:95e3b5b2f3ef

(get_terminal): Handle terminals. Make sure the terminal returned is live. (create_terminal): Use allocate_terminal. (mark_terminals): Move to alloc.c. (delete_terminal): Use terminal->name as liveness status. NULL out fields after freeing their contents. Don't deallocate the object. (Fframe_terminal): Use FRAME_TERMINAL. Return the terminal object rather than an int. (Fterminal_live_p): Accept non-integer arguments. (Fterminal_list): Return terminal objects rather than an ints.

84693:7ee574475f20

  struct terminal *result = NULL;

  if (NILP (terminal))
    terminal = selected_frame;

  if (INTEGERP (terminal))
    {
      struct terminal *t;

      for (t = terminal_list; t; t = t->next_terminal)
        {
          if (t->id == XINT (terminal))
            {
              result = t;
              break;
            }
        }
    }
  else if (FRAMEP (terminal))
    {
      result = FRAME_TERMINAL (XFRAME (terminal));
    }

  if (result == NULL && throw)
    wrong_type_argument (Qterminal_live_p, terminal);

  return result;
}

/* Create a new terminal object and add it to the terminal list. */

struct terminal *
create_terminal (void)
{
  struct terminal *terminal = (struct terminal *) xmalloc (sizeof (struct terminal));
  
  bzero (terminal, sizeof (struct terminal));
  terminal->next_terminal = terminal_list;
  terminal_list = terminal;

  terminal->id = next_terminal_id++;

  terminal->param_alist = Qnil;
  return terminal;
}

/* Mark the Lisp pointers in the terminal objects.
   Called by the Fgarbage_collector.  */

void
mark_terminals (void)
{
  struct terminal *t;
  for (t = terminal_list; t; t = t->next_terminal)
    {
      mark_object (t->param_alist);
    }
}


/* Low-level function to close all frames on a terminal, remove it
   from the terminal list and free its memory.  */

void
delete_terminal (struct terminal *terminal)

  struct terminal **tp;
  Lisp_Object tail, frame;

  /* Protect against recursive calls.  Fdelete_frame calls the
     delete_terminal_hook when we delete our last frame.  */
  if (terminal->deleted)
    return;
  terminal->deleted = 1;

  /* Check for live frames that are still on this terminal. */
  FOR_EACH_FRAME (tail, frame)
    {
      struct frame *f = XFRAME (frame);

  for (tp = &terminal_list; *tp != terminal; tp = &(*tp)->next_terminal)
    if (! *tp)
      abort ();
  *tp = terminal->next_terminal;

  if (terminal->keyboard_coding)
    xfree (terminal->keyboard_coding);
  if (terminal->terminal_coding)
    xfree (terminal->terminal_coding);
  if (terminal->name)
    xfree (terminal->name);
  
#ifdef MULTI_KBOARD
  if (terminal->kboard && --terminal->kboard->reference_count == 0)
    delete_kboard (terminal->kboard);
#endif
  
  bzero (terminal, sizeof (struct terminal));
  xfree (terminal);
}

DEFUN ("delete-terminal", Fdelete_terminal, Sdelete_terminal, 0, 2, 0,
       doc: /* Delete TERMINAL by deleting all frames on it and closing the terminal.
TERMINAL may be a terminal id, a frame, or nil (meaning the selected

  if (NILP (frame))
    frame = selected_frame;

  CHECK_LIVE_FRAME (frame);

  t = get_terminal (frame, 0);

  if (!t)
    return Qnil;
  else
    return make_number (t->id);
}

DEFUN ("terminal-live-p", Fterminal_live_p, Sterminal_live_p, 1, 1, 0,
       doc: /* Return non-nil if OBJECT is a terminal which has not been deleted.
Value is nil if OBJECT is not a live display terminal.
If object is a live display terminal, the return value indicates what
sort of output terminal it uses.  See the documentation of `framep' for
possible return values.

Display terminals are represented by their integer identifiers. */)
     (object)
     Lisp_Object object;
{
  struct terminal *t;
  
  if (!INTEGERP (object))
    return Qnil;

  t = get_terminal (object, 0);

  if (!t)
    return Qnil;

      abort ();
    }
}

DEFUN ("terminal-list", Fterminal_list, Sterminal_list, 0, 0, 0,
       doc: /* Return a list of all terminal devices.
Terminal devices are represented by their integer identifiers. */)
  ()
{
  Lisp_Object terminals = Qnil;
  struct terminal *t;

  for (t = terminal_list; t; t = t->next_terminal)
    terminals = Fcons (make_number (t->id), terminals);

  return terminals;
}

DEFUN ("terminal-name", Fterminal_name, Sterminal_name, 0, 1, 0,

84694:95e3b5b2f3ef

  struct terminal *result = NULL;

  if (NILP (terminal))
    terminal = selected_frame;

  if (TERMINALP (terminal))
    result = XTERMINAL (terminal);

  else if (INTEGERP (terminal))
    {
      /* FIXME: Get rid of the use of integers to represent terminals.  */
      struct terminal *t;

      for (t = terminal_list; t; t = t->next_terminal)
        {
          if (t->id == XINT (terminal))
            {
              result = t;
  	      eassert (t->name != NULL);
              break;
            }
        }
    }
  else if (FRAMEP (terminal))
    {
      result = FRAME_TERMINAL (XFRAME (terminal));
    }

  if (result && !result->name)
    result = NULL;

  if (result == NULL && throw)
    wrong_type_argument (Qterminal_live_p, terminal);

  return result;
}

/* Create a new terminal object and add it to the terminal list. */

struct terminal *
create_terminal (void)
{
  struct terminal *terminal = allocate_terminal ();

  terminal->name = NULL;
  terminal->next_terminal = terminal_list;
  terminal_list = terminal;

  terminal->id = next_terminal_id++;

  terminal->param_alist = Qnil;
  return terminal;
}

/* Low-level function to close all frames on a terminal, remove it
   from the terminal list and free its memory.  */

void
delete_terminal (struct terminal *terminal)

  struct terminal **tp;
  Lisp_Object tail, frame;

  /* Protect against recursive calls.  Fdelete_frame calls the
     delete_terminal_hook when we delete our last frame.  */
  if (!terminal->name)
    return;
  xfree (terminal->name);
  terminal->name = NULL;

  /* Check for live frames that are still on this terminal. */
  FOR_EACH_FRAME (tail, frame)
    {
      struct frame *f = XFRAME (frame);

  for (tp = &terminal_list; *tp != terminal; tp = &(*tp)->next_terminal)
    if (! *tp)
      abort ();
  *tp = terminal->next_terminal;

  xfree (terminal->keyboard_coding);
  terminal->keyboard_coding = NULL;
  xfree (terminal->terminal_coding);
  terminal->terminal_coding = NULL;
  
#ifdef MULTI_KBOARD
  if (terminal->kboard && --terminal->kboard->reference_count == 0)
    {
      delete_kboard (terminal->kboard);
      terminal->kboard = NULL;
    }
#endif
}

DEFUN ("delete-terminal", Fdelete_terminal, Sdelete_terminal, 0, 2, 0,
       doc: /* Delete TERMINAL by deleting all frames on it and closing the terminal.
TERMINAL may be a terminal id, a frame, or nil (meaning the selected

  if (NILP (frame))
    frame = selected_frame;

  CHECK_LIVE_FRAME (frame);

  t = FRAME_TERMINAL (XFRAME (frame));

  if (!t)
    return Qnil;
  else
    {
      Lisp_Object terminal;
      XSETTERMINAL (terminal, t);
      return terminal;
    }
}

DEFUN ("terminal-live-p", Fterminal_live_p, Sterminal_live_p, 1, 1, 0,
       doc: /* Return non-nil if OBJECT is a terminal which has not been deleted.
Value is nil if OBJECT is not a live display terminal.
If object is a live display terminal, the return value indicates what
sort of output terminal it uses.  See the documentation of `framep' for
possible return values.  */)
     (object)
     Lisp_Object object;
{
  struct terminal *t;
  
  t = get_terminal (object, 0);

  if (!t)
    return Qnil;

      abort ();
    }
}

DEFUN ("terminal-list", Fterminal_list, Sterminal_list, 0, 0, 0,
       doc: /* Return a list of all terminal devices.  */)
  ()
{
  Lisp_Object terminal, terminals = Qnil;
  struct terminal *t;

  for (t = terminal_list; t; t = t->next_terminal)
    {
      XSETTERMINAL (terminal, t);
      terminals = Fcons (terminal, terminals);
    }

  return terminals;
}

DEFUN ("terminal-name", Fterminal_name, Sterminal_name, 0, 1, 0,