comparison src/term.c @ 110600:0e84d4500f6b

merge trunk

110598:ee58b36ab139

#include <errno.h>
#include <sys/file.h>

#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif

#include <signal.h>
#include <stdarg.h>
#include <setjmp.h>

   *HPOS and *VPOS are set to the positions found.  W's current glyphs
   must be up to date.  If POS is above window start return (0, 0).
   If POS is after end of W, return end of last line in W.
   - taken from msdos.c */
static int
fast_find_position (struct window *w, int pos, int *hpos, int *vpos)
{
  int i, lastcol, line_start_position, maybe_next_line_p = 0;
  int yb = window_text_bottom_y (w);
  struct glyph_row *row = MATRIX_ROW (w->current_matrix, 0), *best_row = row;

  while (row->y < yb)
    {

  lastcol = 0;
  row = best_row;
  for (i = 0; i < row->used[TEXT_AREA]; i++)
    {
      struct glyph *glyph = row->glyphs[TEXT_AREA] + i;
      int charpos;

      charpos = glyph->charpos;
      if (charpos == pos)
	{
	  *hpos = i;

  if (part == ON_TEXT
      && EQ (w->window_end_valid, w->buffer)
      && XFASTINT (w->last_modified) == BUF_MODIFF (b)
      && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b))
    {
      int pos, i, nrows = w->current_matrix->nrows;
      struct glyph_row *row;
      struct glyph *glyph;

      /* Find the glyph under X/Y.  */
      glyph = NULL;

      pos = glyph->charpos;

      /* Check for mouse-face.  */
      {
	Lisp_Object mouse_face, overlay, position, *overlay_vec;
	int noverlays, obegv, ozv;
	struct buffer *obuf;

	/* If we get an out-of-range value, return now; avoid an error.  */
	if (pos > BUF_Z (b))
	  return;

  tty->terminal = terminal;

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

#ifndef DOS_NT
  set_tty_hooks (terminal);

  {
    int fd;

  }

  tty->type = xstrdup (terminal_type);

  add_keyboard_wait_descriptor (fileno (tty->input));

#endif	/* !DOS_NT */

  encode_terminal_src_size = 0;
  encode_terminal_dst_size = 0;

#ifdef HAVE_GPM
  terminal->mouse_position_hook = term_mouse_position;
  mouse_face_window = Qnil;
#endif

#ifdef DOS_NT
#ifdef WINDOWSNT
  initialize_w32_display (terminal);
#else  /* MSDOS */
  if (strcmp (terminal_type, "internal") == 0)
    terminal->type = output_msdos_raw;
  initialize_msdos_display (terminal);
#endif	/* MSDOS */
  tty->output = stdout;
  tty->input = stdin;
  /* The following two are inaccessible from w32console.c.  */
  terminal->delete_frame_hook = &tty_free_frame_resources;
  terminal->delete_terminal_hook = &delete_tty;

  tty->name = xstrdup (name);
  terminal->name = xstrdup (name);
  tty->type = xstrdup (terminal_type);

  add_keyboard_wait_descriptor (0);

  Wcm_clear (tty);

#ifdef WINDOWSNT
  {
    struct frame *f = XFRAME (selected_frame);

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

    FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
    FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
  }
#else  /* MSDOS */
  {
    int height, width;
    get_tty_size (fileno (tty->input), &width, &height);
    FrameCols (tty) = width;
    FrameRows (tty) = height;
  }
#endif	/* MSDOS */
  tty->delete_in_insert_mode = 1;

  UseTabs (tty) = 0;
  terminal->scroll_region_ok = 0;

  /* Seems to insert lines when it's not supposed to, messing up the
     display.  In doing a trace, it didn't seem to be called much, so I
     don't think we're losing anything by turning it off.  */
  terminal->line_ins_del_ok = 0;
#ifdef WINDOWSNT
  terminal->char_ins_del_ok = 1;
  baud_rate = 19200;
#else  /* MSDOS */
  terminal->char_ins_del_ok = 0;
  init_baud_rate (fileno (tty->input));
#endif	/* MSDOS */

  tty->TN_max_colors = 16;  /* Required to be non-zero for tty-display-color-p */

#else  /* not DOS_NT */

  Wcm_clear (tty);

  tty->termcap_term_buffer = (char *) xmalloc (buffer_size);

  tty->TF_insmode_motion = tgetflag ("mi");
  tty->TF_standout_motion = tgetflag ("ms");
  tty->TF_underscore = tgetflag ("ul");
  tty->TF_teleray = tgetflag ("xt");

#endif /* !DOS_NT  */
  terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
  init_kboard (terminal->kboard);
  terminal->kboard->Vwindow_system = Qnil;
  terminal->kboard->next_kboard = all_kboards;
  all_kboards = terminal->kboard;

110600:0e84d4500f6b

#include <errno.h>
#include <sys/file.h>

#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

#include <signal.h>
#include <stdarg.h>
#include <setjmp.h>

   *HPOS and *VPOS are set to the positions found.  W's current glyphs
   must be up to date.  If POS is above window start return (0, 0).
   If POS is after end of W, return end of last line in W.
   - taken from msdos.c */
static int
fast_find_position (struct window *w, EMACS_INT pos, int *hpos, int *vpos)
{
  int i, lastcol, maybe_next_line_p = 0;
  EMACS_INT line_start_position;
  int yb = window_text_bottom_y (w);
  struct glyph_row *row = MATRIX_ROW (w->current_matrix, 0), *best_row = row;

  while (row->y < yb)
    {

  lastcol = 0;
  row = best_row;
  for (i = 0; i < row->used[TEXT_AREA]; i++)
    {
      struct glyph *glyph = row->glyphs[TEXT_AREA] + i;
      EMACS_INT charpos;

      charpos = glyph->charpos;
      if (charpos == pos)
	{
	  *hpos = i;

  if (part == ON_TEXT
      && EQ (w->window_end_valid, w->buffer)
      && XFASTINT (w->last_modified) == BUF_MODIFF (b)
      && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b))
    {
      int i, nrows = w->current_matrix->nrows;
      EMACS_INT pos;
      struct glyph_row *row;
      struct glyph *glyph;

      /* Find the glyph under X/Y.  */
      glyph = NULL;

      pos = glyph->charpos;

      /* Check for mouse-face.  */
      {
	Lisp_Object mouse_face, overlay, position, *overlay_vec;
	int noverlays;
	EMACS_INT obegv, ozv;
	struct buffer *obuf;

	/* If we get an out-of-range value, return now; avoid an error.  */
	if (pos > BUF_Z (b))
	  return;

  tty->terminal = terminal;

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

  encode_terminal_src_size = 0;
  encode_terminal_dst_size = 0;

#ifdef HAVE_GPM
  terminal->mouse_position_hook = term_mouse_position;
  mouse_face_window = Qnil;
#endif

  
#ifndef DOS_NT
  set_tty_hooks (terminal);

  {
    int fd;

  }

  tty->type = xstrdup (terminal_type);

  add_keyboard_wait_descriptor (fileno (tty->input));

  Wcm_clear (tty);

  tty->termcap_term_buffer = (char *) xmalloc (buffer_size);

  tty->TF_insmode_motion = tgetflag ("mi");
  tty->TF_standout_motion = tgetflag ("ms");
  tty->TF_underscore = tgetflag ("ul");
  tty->TF_teleray = tgetflag ("xt");

#else /* DOS_NT */
#ifdef WINDOWSNT
  {
    struct frame *f = XFRAME (selected_frame);

    initialize_w32_display (terminal);

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

    FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
    FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
    terminal->char_ins_del_ok = 1;
    baud_rate = 19200;
  }
#else  /* MSDOS */
  {
    int height, width;
    if (strcmp (terminal_type, "internal") == 0)
      terminal->type = output_msdos_raw;
    initialize_msdos_display (terminal);

    get_tty_size (fileno (tty->input), &width, &height);
    FrameCols (tty) = width;
    FrameRows (tty) = height;
    terminal->char_ins_del_ok = 0;
    init_baud_rate (fileno (tty->input));
  }
#endif	/* MSDOS */
  tty->output = stdout;
  tty->input = stdin;
  /* The following two are inaccessible from w32console.c.  */
  terminal->delete_frame_hook = &tty_free_frame_resources;
  terminal->delete_terminal_hook = &delete_tty;

  tty->name = xstrdup (name);
  terminal->name = xstrdup (name);
  tty->type = xstrdup (terminal_type);

  add_keyboard_wait_descriptor (0);

  /* FIXME: this should be removed,  done earlier. */
  Wcm_clear (tty);

  tty->delete_in_insert_mode = 1;

  UseTabs (tty) = 0;
  terminal->scroll_region_ok = 0;

  /* Seems to insert lines when it's not supposed to, messing up the
     display.  In doing a trace, it didn't seem to be called much, so I
     don't think we're losing anything by turning it off.  */
  terminal->line_ins_del_ok = 0;

  tty->TN_max_colors = 16;  /* Required to be non-zero for tty-display-color-p */
#endif	/* DOS_NT */

  terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
  init_kboard (terminal->kboard);
  terminal->kboard->Vwindow_system = Qnil;
  terminal->kboard->next_kboard = all_kboards;
  all_kboards = terminal->kboard;