comparison src/keyboard.c @ 83012:4aa172a45af1

Fix C-g handling with multiple ttys. src/sysdep.c (init_sys_modes): Disable interrupt and quit keys on secondary terminals. Added a big fat comment about this. lib-src/emacsclient.c (init_signals): Don't pass SIGINT and SIGQUIT to Emacs. src/keyboard.c (interrupt_signal): Exit Emacs if there are no frames on the controlling tty. Otherwise set internal_last_event_frame to the controlling tty's top frame. src/term.c (ring_bell, tty_ring_bell): Don't look at updating_frame. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-52

83011:c4d4cbf86260

interrupt_signal (signalnum)	/* If we don't have an argument, */
     int signalnum;		/* some compilers complain in signal calls. */
{
  /* Must preserve main program's value of errno.  */
  int old_errno = errno;

#if defined (USG) && !defined (POSIX_SIGNALS)
  /* USG systems forget handlers when they are used;
     must reestablish each time */
  signal (SIGINT, interrupt_signal);
  signal (SIGQUIT, interrupt_signal);
#endif /* USG */

  if (! tty_list)
    {
      /* If there are no tty frames, exit Emacs.

         Emacs should exit on SIGINT if and only if there are no
         frames on its controlling tty and the signal came from there.
         We can check for the first condition, but (alas) not for the
         second.  The best we can do is that we only exit if we are
         sure that the SIGINT was from the controlling tty, i.e., if
         there are no termcap frames.
      */
      Fkill_emacs (Qnil);
      
      errno = old_errno;
      return;
    }

  handle_interrupt ();

  errno = old_errno;
}

/* C-g processing, signal independent code.

	/* Else request quit when it's safe */
	Vquit_flag = Qt;
    }

  if (waiting_for_input && !echoing)
    quit_throw_to_read_char ();
}

/* Handle a C-g by making read_char return C-g.  */

void

    {
      /* Before multi-tty support, these handlers used to be installed
         only if the current session was a tty session.  Now an Emacs
         session may have multiple display types, so we always handle
         SIGINT.  There is special code in interrupt_signal to exit
         Emacs on SIGINT when there are no termcap frames. */
      signal (SIGINT, interrupt_signal);
#if defined (HAVE_TERMIO) || defined (HAVE_TERMIOS)
      /* For systems with SysV TERMIO, C-g is set up for both SIGINT and
	 SIGQUIT and we can't tell which one it will give us.  */
      signal (SIGQUIT, interrupt_signal);

83012:4aa172a45af1

interrupt_signal (signalnum)	/* If we don't have an argument, */
     int signalnum;		/* some compilers complain in signal calls. */
{
  /* Must preserve main program's value of errno.  */
  int old_errno = errno;
  struct display *display;

#if defined (USG) && !defined (POSIX_SIGNALS)
  /* USG systems forget handlers when they are used;
     must reestablish each time */
  signal (SIGINT, interrupt_signal);
  signal (SIGQUIT, interrupt_signal);
#endif /* USG */

  /* See if we have a display on our controlling terminal. */
  display = get_named_tty_display (NULL);
  if (!display)
    {
      /* If there are no frames there, let's pretend that we are a
         well-behaving UN*X program and quit. */
      Fkill_emacs (Qnil);
    }
  else
    {
      /* Otherwise, the SIGINT was probably generated by C-g.  */
      
      /* Set internal_last_event_frame to the top frame of the
         controlling tty, if we have a frame there.  We disable the
         interrupt key on secondary ttys, so the SIGINT must have come
         from the controlling tty.  */
      internal_last_event_frame = display->display_info.tty->top_frame;

      handle_interrupt ();

    }

  errno = old_errno;
}

/* C-g processing, signal independent code.

	/* Else request quit when it's safe */
	Vquit_flag = Qt;
    }

  if (waiting_for_input && !echoing)
      quit_throw_to_read_char ();
}

/* Handle a C-g by making read_char return C-g.  */

void

    {
      /* Before multi-tty support, these handlers used to be installed
         only if the current session was a tty session.  Now an Emacs
         session may have multiple display types, so we always handle
         SIGINT.  There is special code in interrupt_signal to exit
         Emacs on SIGINT when there are no termcap frames on the
         controlling terminal. */
      signal (SIGINT, interrupt_signal);
#if defined (HAVE_TERMIO) || defined (HAVE_TERMIOS)
      /* For systems with SysV TERMIO, C-g is set up for both SIGINT and
	 SIGQUIT and we can't tell which one it will give us.  */
      signal (SIGQUIT, interrupt_signal);