comparison src/term.c @ 82991:2b26656ff804

MULTI_KBOARD support for ttys. Input-related bugfixes for X+tty sessions. lib-src/emacsclient.c (pty_conversation): Fix errno check for read from fileno(in). src/config.in: Unconditionally define MULTI_KBOARD. src/frame.c (make_terminal_frame): Initialize f->kboard. src/keyboard.c (cmd_error_internal): Don't kill Emacs if a Quit was pressed on the tty of a X+tty session. (read_avail_input): Initialize nread to zero. Abort if there is no tty after a termcap read. (interrupt_signal)[USG]: Always reset signal handler. (init_keyboard): Always set signal handler for SIGINT/SIGQUIT if noninteractive. src/term.c (term_dummy_init): Initialize kboard to the initial_kboard. (term_init): Free component structures of the initial tty. Clear xmalloced structures. Moved rif initialization to syms_of_term. (term_init)[MULTI_KBOARD]: Initialize tty->kboard. (delete_tty)[MULTI_KBOARD]: Delete the keyboard. (syms_of_term): Initialize tty_display_method_template. src/termchar.h (tty_output)[MULTI_KBOARD]: Added kboard member. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-31

82990:2ecd1f669db9

  tty_list->name = 0;
  tty_list->input = stdin;
  tty_list->output = stdout;
  tty_list->Wcm = (struct cm *) xmalloc (sizeof (struct cm));
  tty_list->display_method = (struct display_method *) xmalloc (sizeof (struct display_method));
  return tty_list;
}


struct tty_display_info *

    {
      /* Return the previously initialized terminal, except if it is
         the dummy terminal created for the initial frame. */
      if (tty->type)
        return tty;
    }
  else
    {
      tty = (struct tty_display_info *) xmalloc (sizeof (struct tty_display_info));
      bzero (tty, sizeof (struct tty_display_info));
      tty->next = tty_list;
      tty_list = tty;
    }

  if (! tty->Wcm)
    tty->Wcm = (struct cm *) xmalloc (sizeof (struct cm));

  if (! tty->display_method)
    tty->display_method = (struct display_method *) xmalloc (sizeof (struct display_method));

  /* Initialize the common members in the new display method with our
     predefined template. */
  *tty->display_method = tty_display_method_template;
  f->display_method = tty->display_method;

  /* Termcap-based displays don't support window-based redisplay. */
  f->display_method->rif = 0;

  /* Make sure the frame is live; if an error happens, it must be
     deleted. */
  f->output_method = output_termcap;
  if (! f->output_data.tty)

  FrameRows (tty) = FRAME_LINES (f);
  FrameCols (tty) = FRAME_COLS (f);
  tty->specified_window = FRAME_LINES (f);

  f->display_method->delete_in_insert_mode = 1;

  UseTabs (tty) = 0;
  FRAME_SCROLL_REGION_OK (f) = 0;

  /* Seems to insert lines when it's not supposed to, messing

                 FrameCols (tty), FrameRows (tty));
        }
    }

#if 0  /* This is not used anywhere. */
  f->display_method->min_padding_speed = tgetnum ("pb");
#endif

  TabWidth (tty) = tgetnum ("tw");

#ifdef VMS

     really ugly at times.  */
  FRAME_LINE_INS_DEL_OK (f) = 0;
  FRAME_CHAR_INS_DEL_OK (f) = 0;
#endif

  /* Don't do this.  I think termcap may still need the buffer. */
  /* xfree (buffer); */

  /* Set the top frame to the first frame on this display. */
  tty->top_frame = frame;

  init_sys_modes (tty);

  tty_set_terminal_modes (tty);

  return tty;
#endif /* WINDOWSNT */
}

/* VARARGS 1 */
void
fatal (str, arg1, arg2)

    xfree (tty->Wcm);

  if (tty->display_method)
    xfree (tty->display_method);

  bzero (tty, sizeof (struct tty_display_info));
  xfree (tty);
  deleting_tty = 0;
}

  defsubr (&Stty_display_color_cells);
  defsubr (&Sframe_tty_name);
  defsubr (&Sframe_tty_type);
  defsubr (&Sdelete_tty);

  /* XXX tty_display_method_template initialization will go here. */

  Fprovide (intern ("multi-tty"), Qnil);
}



/* arch-tag: 498e7449-6f2e-45e2-91dd-b7d4ca488193

82991:2b26656ff804

  tty_list->name = 0;
  tty_list->input = stdin;
  tty_list->output = stdout;
  tty_list->Wcm = (struct cm *) xmalloc (sizeof (struct cm));
  tty_list->display_method = (struct display_method *) xmalloc (sizeof (struct display_method));
  tty_list->kboard = initial_kboard;
  return tty_list;
}


struct tty_display_info *

    {
      /* Return the previously initialized terminal, except if it is
         the dummy terminal created for the initial frame. */
      if (tty->type)
        return tty;

      /* Free up temporary structures. */
      if (tty->Wcm)
        xfree (tty->Wcm);
      if (tty->display_method)
        xfree (tty->display_method);
      if (tty->kboard != initial_kboard)
        abort ();
      tty->kboard = 0;
    }
  else
    {
      tty = (struct tty_display_info *) xmalloc (sizeof (struct tty_display_info));
      bzero (tty, sizeof (struct tty_display_info));
      tty->next = tty_list;
      tty_list = tty;
    }

  tty->Wcm = (struct cm *) xmalloc (sizeof (struct cm));
  Wcm_clear (tty);

  /* Each termcap frame has its own display method. */
  tty->display_method = (struct display_method *) xmalloc (sizeof (struct display_method));
  bzero (tty->display_method, sizeof (struct display_method));

  /* Initialize the common members in the new display method with our
     predefined template. */
  *tty->display_method = tty_display_method_template;
  f->display_method = tty->display_method;

  /* Make sure the frame is live; if an error happens, it must be
     deleted. */
  f->output_method = output_termcap;
  if (! f->output_data.tty)

  FrameRows (tty) = FRAME_LINES (f);
  FrameCols (tty) = FRAME_COLS (f);
  tty->specified_window = FRAME_LINES (f);

  tty->display_method->delete_in_insert_mode = 1;

  UseTabs (tty) = 0;
  FRAME_SCROLL_REGION_OK (f) = 0;

  /* Seems to insert lines when it's not supposed to, messing

                 FrameCols (tty), FrameRows (tty));
        }
    }

#if 0  /* This is not used anywhere. */
  tty->display_method->min_padding_speed = tgetnum ("pb");
#endif

  TabWidth (tty) = tgetnum ("tw");

#ifdef VMS

     really ugly at times.  */
  FRAME_LINE_INS_DEL_OK (f) = 0;
  FRAME_CHAR_INS_DEL_OK (f) = 0;
#endif

#ifdef MULTI_KBOARD
  tty->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
  init_kboard (tty->kboard);
  tty->kboard->next_kboard = all_kboards;
  all_kboards = tty->kboard;
  /* Don't let the initial kboard remain current longer than necessary.
     That would cause problems if a file loaded on startup tries to
     prompt in the mini-buffer.  */
  if (current_kboard == initial_kboard)
    current_kboard = tty->kboard;
  tty->kboard->reference_count++;
#endif

  /* Don't do this.  I think termcap may still need the buffer. */
  /* xfree (buffer); */

  /* Set the top frame to the first frame on this display. */
  tty->top_frame = frame;

  init_sys_modes (tty);

  tty_set_terminal_modes (tty);

  return tty;
#endif /* not WINDOWSNT */
}

/* VARARGS 1 */
void
fatal (str, arg1, arg2)

    xfree (tty->Wcm);

  if (tty->display_method)
    xfree (tty->display_method);

#ifdef MULTI_KBOARD
  if (tty->kboard && --tty->kboard->reference_count > 0)
    abort ();
  if (tty->kboard)
    delete_kboard (tty->kboard);
#endif
  
  bzero (tty, sizeof (struct tty_display_info));
  xfree (tty);
  deleting_tty = 0;
}

  defsubr (&Stty_display_color_cells);
  defsubr (&Sframe_tty_name);
  defsubr (&Sframe_tty_type);
  defsubr (&Sdelete_tty);

  Fprovide (intern ("multi-tty"), Qnil);

  /* Initialize the display method template. */
  
  /* Termcap-based displays don't support window-based redisplay. */
  tty_display_method_template.rif = 0;

}



/* arch-tag: 498e7449-6f2e-45e2-91dd-b7d4ca488193