comparison src/keyboard.c @ 83252:6e0f153725ab

Fix compilation error with GTK, fix issues with double C-g on controlling tty. (Reported by Friedrich Delgado Friedrichs, Yoshiaki Kasahara.) * src/keyboard.c (interrupt_signal, handle_interrupt): Move thread check to interrupt_signal. Check for frame on controlling tty instead of current selected frame in handle_interrupt. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-292

83251:de637975e99a

  input_available_clear_time = 0;
}

/* The SIGINT handler.

   If we have a frame on the controlling tty, the SIGINT was generated
   by C-g, so we call handle_interrupt.  Otherwise, the handler kills
   Emacs.  */

static SIGTYPE
interrupt_signal (signalnum)	/* If we don't have an argument, */
     int signalnum;		/* some compilers complain in signal calls. */
{

     must reestablish each time */
  signal (SIGINT, interrupt_signal);
  signal (SIGQUIT, interrupt_signal);
#endif /* USG */

  /* See if we have an active 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

static void
handle_interrupt ()
{
  char c;
  struct frame *sf = SELECTED_FRAME ();

  SIGNAL_THREAD_CHECK (signalnum);
  cancel_echoing ();

  /* XXX This code needs to be revised for multi-tty support. */
  if (!NILP (Vquit_flag)
      && (FRAME_TERMCAP_P (sf) || FRAME_MSDOS_P (sf)))
    {
      /* If SIGINT isn't blocked, don't let us be interrupted by
	 another SIGINT, it might be harmful due to non-reentrancy
	 in I/O functions.  */
      sigblock (sigmask (SIGINT));

83252:6e0f153725ab

  input_available_clear_time = 0;
}

/* The SIGINT handler.

   If we have a frame on the controlling tty, we assume that the
   SIGINT was generated by C-g, so we call handle_interrupt.
   Otherwise, the handler kills Emacs.  */

static SIGTYPE
interrupt_signal (signalnum)	/* If we don't have an argument, */
     int signalnum;		/* some compilers complain in signal calls. */
{

     must reestablish each time */
  signal (SIGINT, interrupt_signal);
  signal (SIGQUIT, interrupt_signal);
#endif /* USG */

  SIGNAL_THREAD_CHECK (signalnum);

  /* See if we have an active 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

static void
handle_interrupt ()
{
  char c;

  cancel_echoing ();

  /* XXX This code needs to be revised for multi-tty support. */
  if (!NILP (Vquit_flag)
#ifndef MSDOS
      && get_named_tty_display (NULL)
#endif
      )
    {
      /* If SIGINT isn't blocked, don't let us be interrupted by
	 another SIGINT, it might be harmful due to non-reentrancy
	 in I/O functions.  */
      sigblock (sigmask (SIGINT));