comparison src/keyboard.c @ 53232:22aaf1e5fbe6

Full support for multiple terminal I/O (with some rough edges). lib-src/emacsclient.c (emacs_pid): New variable. (window_change): Forward the SIGWINCH signal to the Emacs process after copying the size parameters to the proxy terminal. (copy_from_to): New parameter (sigio), kill Emacs with SIGIO if it is nonzero. (main): Set emacs_pid. lisp/server.el (server-process-filter): Send the pid of Emacs to emacsclient. src/cm.c: Added tty parameters to all functions and all Wcm macro calls. src/cm.h: Added tty parameters to all macros. Updated function prototypes. (Wcm): Moved to struct tty_output. src/dispextern.h: Updated function prototypes. src/dispnew.c: Added tty parameters to all Wcm macro calls. (do_switch_frame): Make old frame obscured, not invisible, to solve problems with other-frame. (Wcm): Moved to struct tty_output. src/keyboard.c (read_avail_input): Select the frame corresponding to the tty that was read. Slight rearrangement of tty loop. src/lisp.h (tabs_safe_p): Removed duplicate prototype. src/sysdep.c (hft_init, hft_reset): Added tty_output parameter. (discard_tty_input): Discard input from all ttys on APOLLO, too. Whatever it is. (narrow_foreground_group, widen_foreground_group): Added tty parameter (not really useful, the functions only work on the controlling tty.) (tabs_safe_p): Added tty parameter. src/term.c Added tty parameters to all Wcm macro calls. Standardised updating_frame vs. selected frame and tty_output access. (term_init): Allocate Wcm. (syms_of_term): Provide the `multi-tty' feature. src/termchar.h (struct tty_output): Added Wcm. src/xdisp.c (try_window_id): Make sure we use the tty device corresponding to the current frame. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-8

53231:e0c359b85b58

           || readable_filtered_events (do_timers_now, filter_events));

  /* If input is being read as it arrives, and we have none, there is none.  */
  if (*addr > 0 || (interrupt_input && ! interrupts_deferred))
    return;

  /* Try to read some input and see how much we get.  */
  gobble_input (0);
  *addr = (!NILP (Vquit_flag)
           || readable_filtered_events (do_timers_now, filter_events));
}

     int expected;
{
  struct input_event buf[KBD_BUFFER_SIZE];
  register int i;
  int nread;

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

  if (read_socket_hook)
    /* No need for FIONREAD or fcntl; just say don't wait.  */

      struct tty_output *tty;
      nread = 0;

      /* Try to read from each available tty, until one succeeds. */
      for (tty = tty_list; tty && !nread; tty = tty->next) {
        
        /* Determine how many characters we should *try* to read.  */
#ifdef FIONREAD
        /* Find out how much input is available.  */
        if (ioctl (fileno (TTY_INPUT (tty)), FIONREAD, &n_to_read) < 0)
          {

               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.  */
            if (! noninteractive)
              {
                if (! tty_list->next)
                  kill (getpid (), SIGHUP); /* This was the last terminal. */
                else

#if defined (USG) || defined (DGUX) || defined (CYGWIN)
        fcntl (fileno (TTY_INPUT (tty)), F_SETFL, 0);
#endif /* USG or DGUX or CYGWIN */
#endif /* no FIONREAD */

      } /* for each tty */
      
      if (! nread)
        return 0;
      
#endif /* not MSDOS */
#endif /* not WINDOWSNT */

      /* XXX Select frame corresponding to the tty. */
      
      for (i = 0; i < nread; i++)
	{
	  buf[i].kind = ASCII_KEYSTROKE_EVENT;
	  buf[i].modifiers = 0;
	  if (meta_key == 1 && (cbuf[i] & 0x80))
	    buf[i].modifiers = meta_modifier;
	  if (meta_key != 2)
	    cbuf[i] &= ~0x80;

	  buf[i].code = cbuf[i];
	  buf[i].frame_or_window = selected_frame;
	  buf[i].arg = Qnil;
	}
    }

  /* Scan the chars for C-g and store them in kbd_buffer.  */

53232:22aaf1e5fbe6

           || readable_filtered_events (do_timers_now, filter_events));

  /* If input is being read as it arrives, and we have none, there is none.  */
  if (*addr > 0 || (interrupt_input && ! interrupts_deferred))
    return;
  
  /* Try to read some input and see how much we get.  */
  gobble_input (0);
  *addr = (!NILP (Vquit_flag)
           || readable_filtered_events (do_timers_now, filter_events));
}

     int expected;
{
  struct input_event buf[KBD_BUFFER_SIZE];
  register int i;
  int nread;
  
  for (i = 0; i < KBD_BUFFER_SIZE; i++)
    EVENT_INIT (buf[i]);

  if (read_socket_hook)
    /* No need for FIONREAD or fcntl; just say don't wait.  */

      struct tty_output *tty;
      nread = 0;

      /* Try to read from each available tty, until one succeeds. */
      for (tty = tty_list; tty; tty = tty->next) {
      
        /* Determine how many characters we should *try* to read.  */
#ifdef FIONREAD
        /* Find out how much input is available.  */
        if (ioctl (fileno (TTY_INPUT (tty)), FIONREAD, &n_to_read) < 0)
          {

               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 (! noninteractive)
              {
                if (! tty_list->next)
                  kill (getpid (), SIGHUP); /* This was the last terminal. */
                else

#if defined (USG) || defined (DGUX) || defined (CYGWIN)
        fcntl (fileno (TTY_INPUT (tty)), F_SETFL, 0);
#endif /* USG or DGUX or CYGWIN */
#endif /* no FIONREAD */

        if (nread > 0)
          break;
      } /* for each tty */
      
      if (nread <= 0)
        return 0;
      
#endif /* not MSDOS */
#endif /* not WINDOWSNT */

      /* Select frame corresponding to the active tty.  Note that the
         value of selected_frame is not reliable here, redisplay tends
         to temporarily change it.  But tty should always be non-NULL. */
      Lisp_Object frame = (tty ? tty->top_frame : selected_frame);
      
      for (i = 0; i < nread; i++)
	{
	  buf[i].kind = ASCII_KEYSTROKE_EVENT;
	  buf[i].modifiers = 0;
	  if (meta_key == 1 && (cbuf[i] & 0x80))
	    buf[i].modifiers = meta_modifier;
	  if (meta_key != 2)
	    cbuf[i] &= ~0x80;

          buf[i].code = cbuf[i];
	  buf[i].frame_or_window = frame;
	  buf[i].arg = Qnil;
	}
    }

  /* Scan the chars for C-g and store them in kbd_buffer.  */