comparison src/term.c @ 83127:5182815e0ee1

Make terminal_coding and keyboard_coding display-local. src/coding.c: Include frame.h and termhooks.h. (terminal_coding, keyboard_coding): Remove. (Fset_terminal_coding_system_internal, Fterminal_coding_system): Use the selected frame's terminal coding system. (Fset_safe_terminal_coding_system_internal): Fix typo. (Fset_keyboard_coding_system_internal, Fkeyboard_coding_system): Use the selected frame's keyboard coding system. (init_coding_once): Don't initialize keyboard_coding and terminal_coding. src/coding.h (terminal_coding, keyboard_coding): Remove. src/termhooks.h (terminal_coding, keyboard_coding): New members of struct display. (FRAME_TERMINAL_CODING, FRAME_KEYBOARD_CODING): New macros. src/termchar.h (kboard): Cosmetic change. src/term.c (encode_terminal_code): Add coding parameter. (tty_write_glyphs): Use the display-local terminal coding system. (create_display): Allocate and initialize coding systems. (delete_display): Free coding systems. src/xdisp.c (decode_mode_spec): Use display-local coding systems. src/Makefile.in: Fix dependencies for termchar.h and termhooks.h. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-167

83126:14e5707213a6

   We store the number of glyphs actually converted in *CONSUMED.  The
   return value is the number of bytes store in DST.  */

int
encode_terminal_code (src, dst, src_len, dst_len, consumed)
     struct glyph *src;
     int src_len;
     unsigned char *dst;
     int dst_len, *consumed;
{

  const unsigned char *buf;
  int len;
  register int tlen = GLYPH_TABLE_LENGTH;
  register Lisp_Object *tbase = GLYPH_TABLE_BASE;
  int result;
  struct coding_system *coding;

  /* If terminal_coding does any conversion, use it, otherwise use
     safe_terminal_coding.  We can't use CODING_REQUIRE_ENCODING here
     because it always return 1 if the member src_multibyte is 1.  */
  coding = (terminal_coding.common_flags & CODING_REQUIRE_ENCODING_MASK
	    ? &terminal_coding
	    : &safe_terminal_coding);

  while (src < src_end)
    {
      /* We must skip glyphs to be padded for a wide character.  */

  cmplus (tty, len);

  /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at
     the tail.  */
  terminal_coding.mode &= ~CODING_MODE_LAST_BLOCK;

  while (len > 0)
    {
      /* Identify a run of glyphs with the same face.  */
      int face_id = string->face_id;

      while (n > 0)
	{
	  /* We use a fixed size (1024 bytes) of conversion buffer.
	     Usually it is sufficient, but if not, we just repeat the
	     loop.  */
	  produced = encode_terminal_code (string, conversion_buffer,
					   n, conversion_buffer_size,
					   &consumed);
	  if (produced > 0)
	    {
	      fwrite (conversion_buffer, 1, produced,

      turn_off_face (f, face_id);
      turn_off_highlight (tty);
    }

  /* We may have to output some codes to terminate the writing.  */
  if (CODING_REQUIRE_FLUSHING (&terminal_coding))
    {
      terminal_coding.mode |= CODING_MODE_LAST_BLOCK;
      encode_coding (&terminal_coding, "", conversion_buffer,
		     0, conversion_buffer_size);
      if (terminal_coding.produced > 0)
	{
	  fwrite (conversion_buffer, 1, terminal_coding.produced,
                  tty->output);
	  if (ferror (tty->output))
	    clearerr (tty->output);
	  if (tty->termscript)
	    fwrite (conversion_buffer, 1, terminal_coding.produced,
		    tty->termscript);
	}
    }

  cmcheckmagic (tty);

    }

  turn_on_insert (tty);
  cmplus (tty, len);
  /* The bit CODING_MODE_LAST_BLOCK should be set to 1 only at the tail.  */
  terminal_coding.mode &= ~CODING_MODE_LAST_BLOCK;
  while (len-- > 0)
    {
      int produced, consumed;
      unsigned char conversion_buffer[1024];
      int conversion_buffer_size = sizeof conversion_buffer;

	      start++, len--;
	    }

	  if (len <= 0)
	    /* This is the last glyph.  */
	    terminal_coding.mode |= CODING_MODE_LAST_BLOCK;

	  /* The size of conversion buffer (1024 bytes) is surely
	     sufficient for just one glyph.  */
	  produced = encode_terminal_code (glyph, conversion_buffer, 1,
					   conversion_buffer_size, &consumed);

/* Create a new display object and add it to the display list. */

struct display *
create_display (void)
{
  struct display *dev = (struct display *) xmalloc (sizeof (struct display));
  
  bzero (dev, sizeof (struct display));
  dev->next_display = display_list;
  display_list = dev;

  return dev;
}

/* Remove a display from the display list and free its memory. */

void
delete_display (struct display *dev)
{
  struct display **dp;
  Lisp_Object tail, frame;
  
  /* Check for and close live frames that are still on this
     display. */
  FOR_EACH_FRAME (tail, frame)
    {
      struct frame *f = XFRAME (frame);
      if (FRAME_LIVE_P (f) && f->display == dev)
        {
          Fdelete_frame (frame, Qt);
        }
    }

  for (dp = &display_list; *dp != dev; dp = &(*dp)->next_display)
    if (! *dp)
      abort ();
  *dp = dev->next_display;

  bzero (dev, sizeof (struct display));
  xfree (dev);
}



DEFUN ("suspend-tty", Fsuspend_tty, Ssuspend_tty, 0, 1, 0,

83127:5182815e0ee1

   We store the number of glyphs actually converted in *CONSUMED.  The
   return value is the number of bytes store in DST.  */

int
encode_terminal_code (coding, src, dst, src_len, dst_len, consumed)
     struct coding_system *coding;
     struct glyph *src;
     int src_len;
     unsigned char *dst;
     int dst_len, *consumed;
{

  const unsigned char *buf;
  int len;
  register int tlen = GLYPH_TABLE_LENGTH;
  register Lisp_Object *tbase = GLYPH_TABLE_BASE;
  int result;

  /* If the specified coding does any conversion, use it, otherwise use
     safe_terminal_coding.  We can't use CODING_REQUIRE_ENCODING here
     because it always returns 1 if the member src_multibyte is 1.  */
  coding = (coding->common_flags & CODING_REQUIRE_ENCODING_MASK
	    ? coding
	    : &safe_terminal_coding);

  while (src < src_end)
    {
      /* We must skip glyphs to be padded for a wide character.  */

  cmplus (tty, len);

  /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at
     the tail.  */
  FRAME_TERMINAL_CODING (f)->mode &= ~CODING_MODE_LAST_BLOCK;

  while (len > 0)
    {
      /* Identify a run of glyphs with the same face.  */
      int face_id = string->face_id;

      while (n > 0)
	{
	  /* We use a fixed size (1024 bytes) of conversion buffer.
	     Usually it is sufficient, but if not, we just repeat the
	     loop.  */
	  produced = encode_terminal_code (FRAME_TERMINAL_CODING (f),
                                           string, conversion_buffer,
					   n, conversion_buffer_size,
					   &consumed);
	  if (produced > 0)
	    {
	      fwrite (conversion_buffer, 1, produced,

      turn_off_face (f, face_id);
      turn_off_highlight (tty);
    }

  /* We may have to output some codes to terminate the writing.  */
  if (CODING_REQUIRE_FLUSHING (FRAME_TERMINAL_CODING (f)))
    {
      FRAME_TERMINAL_CODING (f)->mode |= CODING_MODE_LAST_BLOCK;
      encode_coding (FRAME_TERMINAL_CODING (f), "",
                     conversion_buffer, 0, conversion_buffer_size);
      if (FRAME_TERMINAL_CODING (f)->produced > 0)
	{
	  fwrite (conversion_buffer, 1,
                  FRAME_TERMINAL_CODING (f)->produced,
                  tty->output);
	  if (ferror (tty->output))
	    clearerr (tty->output);
	  if (tty->termscript)
	    fwrite (conversion_buffer, 1,
                    FRAME_TERMINAL_CODING (f)->produced,
		    tty->termscript);
	}
    }

  cmcheckmagic (tty);

    }

  turn_on_insert (tty);
  cmplus (tty, len);
  /* The bit CODING_MODE_LAST_BLOCK should be set to 1 only at the tail.  */
  FRAME_TERMINAL_CODING (f)->mode &= ~CODING_MODE_LAST_BLOCK;
  while (len-- > 0)
    {
      int produced, consumed;
      unsigned char conversion_buffer[1024];
      int conversion_buffer_size = sizeof conversion_buffer;

	      start++, len--;
	    }

	  if (len <= 0)
	    /* This is the last glyph.  */
	    FRAME_TERMINAL_CODING (f)->mode |= CODING_MODE_LAST_BLOCK;

	  /* The size of conversion buffer (1024 bytes) is surely
	     sufficient for just one glyph.  */
	  produced = encode_terminal_code (glyph, conversion_buffer, 1,
					   conversion_buffer_size, &consumed);

/* Create a new display object and add it to the display list. */

struct display *
create_display (void)
{
  struct display *display = (struct display *) xmalloc (sizeof (struct display));
  
  bzero (display, sizeof (struct display));
  display->next_display = display_list;
  display_list = display;

  display->keyboard_coding =
    (struct coding_system *) xmalloc (sizeof (struct coding_system));
  display->terminal_coding =
    (struct coding_system *) xmalloc (sizeof (struct coding_system));
  
  setup_coding_system (Qnil, display->keyboard_coding);
  setup_coding_system (Qnil, display->terminal_coding);
  
  return display;
}

/* Remove a display from the display list and free its memory. */

void
delete_display (struct display *display)
{
  struct display **dp;
  Lisp_Object tail, frame;
  
  /* Check for and close live frames that are still on this
     display. */
  FOR_EACH_FRAME (tail, frame)
    {
      struct frame *f = XFRAME (frame);
      if (FRAME_LIVE_P (f) && f->display == display)
        {
          Fdelete_frame (frame, Qt);
        }
    }

  for (dp = &display_list; *dp != display; dp = &(*dp)->next_display)
    if (! *dp)
      abort ();
  *dp = display->next_display;

  if (display->keyboard_coding)
    xfree (display->keyboard_coding);
  if (display->terminal_coding)
    xfree (display->terminal_coding);

  bzero (display, sizeof (struct display));
  xfree (display);
}



DEFUN ("suspend-tty", Fsuspend_tty, Ssuspend_tty, 0, 1, 0,