comparison src/keyboard.c @ 83021:32bf8e7cc0c2

Fixed tty faces during combo sessions. Plus other assorted bugfixes. lisp/startup.el (command-line): Always call tty-register-default-colors. src/dispextern.h (delete_tty): Added missing prototype. src/keyboard.c (read_avail_input): Close display gracefully if needed. Kill Emacs if the last display is to be closed. (tty_read_avail_input): Don't call delete_tty and don't signal hangup here; return -2 instead to indicate the non-transient failure to read_avail_input. src/term.c (delete_tty): Removed superflous wiping of the deleted frames' output_data field. (delete_display): Check for and close live frames that are still on the display. src/termhooks.h (read_socket_hook, delete_display_hook): Added detailed comment. src/xfaces.c (realize_face): Create a dummy face for the initial frame. (Reported by Robert J. Chassell (bob at rattlenake dot com).) git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-61

83020:d617fe346b2b

  int nread = 0;
  
  for (i = 0; i < KBD_BUFFER_SIZE; i++)
    EVENT_INIT (buf[i]);

  for (d = display_list; d; d = d->next_display)
    {
      if (d->read_socket_hook)
        /* No need for FIONREAD or fcntl; just say don't wait.  */
        nread = (*d->read_socket_hook) (d, buf, KBD_BUFFER_SIZE, expected);

      if (nread > 0)
        break;
    }

  /* Scan the chars for C-g and store them in kbd_buffer.  */
  for (i = 0; i < nread; i++)
    {

/* This is the tty way of reading available input.

   Note that each terminal device has its own `struct display' object,
   and so this function is called once for each individual termcap
   display.  The first parameter indicates which device to read from.  */
int
tty_read_avail_input (struct display *display,
                      struct input_event *buf,
                      int numchars, int expected)
{

#ifdef FIONREAD
  /* Find out how much input is available.  */
  if (ioctl (fileno (TTY_INPUT (tty)), FIONREAD, &n_to_read) < 0)
    {
      if (! noninteractive)
        {
          delete_tty (tty); /* XXX I wonder if this is safe here. */
          
          /* Formerly simply reported no input, but that sometimes led to
             a failure of Emacs to terminate.
             SIGHUP seems appropriate if we can't reach the terminal.  */
          /* ??? Is it really right to send the signal just to this process
             rather than to the whole process group?
             Perhaps on systems with FIONREAD Emacs is alone in its group.  */
          /* It appears to be the case, see narrow_foreground_group. */
          if (! tty_list->next)
            kill (getpid (), SIGHUP); /* This was the last terminal. */
        }
      else
        {
          n_to_read = 0;
        }
    }
  if (n_to_read == 0)
    return 0;
  if (n_to_read > sizeof cbuf)
    n_to_read = sizeof cbuf;

         this part standard and returns -1 from read (0) with errno==EIO
         when the control tty is taken away.
         Jeffrey Honig <[e-mail]> says this is generally safe.  */
      if (nread == -1 && errno == EIO)
        {
          if (! tty_list->next)
            kill (0, SIGHUP); /* This was the last terminal. */
          else
            delete_tty (tty); /* XXX I wonder if this is safe here. */
        }
#if defined (AIX) && (! defined (aix386) && defined (_BSD))
      /* The kernel sometimes fails to deliver SIGHUP for ptys.
         This looks incorrect, but it isn't, because _BSD causes
         O_NDELAY to be defined in fcntl.h as O_NONBLOCK,
         and that causes a value other than 0 when there is no input.  */
      if (nread == 0)
        {
          if (! tty_list->next)
            kill (0, SIGHUP); /* This was the last terminal. */
          else
            delete_tty (tty); /* XXX I wonder if this is safe here. */
        }
#endif
    }
  while (
         /* We used to retry the read if it was interrupted.

83021:32bf8e7cc0c2

  int nread = 0;
  
  for (i = 0; i < KBD_BUFFER_SIZE; i++)
    EVENT_INIT (buf[i]);

  d = display_list;
  while (d)
    {
      struct display *next = d->next_display;
      
      if (d->read_socket_hook)
        /* No need for FIONREAD or fcntl; just say don't wait.  */
        nread = (*d->read_socket_hook) (d, buf, KBD_BUFFER_SIZE, expected);

      if (nread == -2)
        {
          /* The display device terminated; it should be closed. */

          /* Kill Emacs if this was our last display. */
          if (! display_list->next_display)
            kill (getpid (), SIGHUP);

          /* XXX Is calling delete_display safe here?  It calls Fdelete_frame. */
          if (d->delete_display_hook)
            (*d->delete_display_hook) (d);
          else
            delete_display (d);
        }
      else if (nread > 0)
        {
          /* We've got input. */
          break;
        }

      d = next;
    }

  /* Scan the chars for C-g and store them in kbd_buffer.  */
  for (i = 0; i < nread; i++)
    {

/* This is the tty way of reading available input.

   Note that each terminal device has its own `struct display' object,
   and so this function is called once for each individual termcap
   display.  The first parameter indicates which device to read from.  */

int
tty_read_avail_input (struct display *display,
                      struct input_event *buf,
                      int numchars, int expected)
{

#ifdef FIONREAD
  /* Find out how much input is available.  */
  if (ioctl (fileno (TTY_INPUT (tty)), FIONREAD, &n_to_read) < 0)
    {
      if (! noninteractive)
        return -2;          /* Close this display. */
      else
        n_to_read = 0;
    }
  if (n_to_read == 0)
    return 0;
  if (n_to_read > sizeof cbuf)
    n_to_read = sizeof cbuf;

         this part standard and returns -1 from read (0) with errno==EIO
         when the control tty is taken away.
         Jeffrey Honig <[e-mail]> says this is generally safe.  */
      if (nread == -1 && errno == EIO)
        {
          return -2;          /* Close this display. */
        }
#if defined (AIX) && (! defined (aix386) && defined (_BSD))
      /* The kernel sometimes fails to deliver SIGHUP for ptys.
         This looks incorrect, but it isn't, because _BSD causes
         O_NDELAY to be defined in fcntl.h as O_NONBLOCK,
         and that causes a value other than 0 when there is no input.  */
      if (nread == 0)
        {
          return -2;          /* Close this display. */
        }
#endif
    }
  while (
         /* We used to retry the read if it was interrupted.