comparison src/term.c @ 29448:348aa1a6a062

(encode_terminal_code): Change the way to check if terminal coding does any conversion. (append_glyph): Set glyph->pixel_width correctly.

29447:420c1b718335

  register int tlen = GLYPH_TABLE_LENGTH;
  register Lisp_Object *tbase = GLYPH_TABLE_BASE;
  int result;
  struct coding_system *coding;

  coding = (CODING_REQUIRE_ENCODING (&terminal_coding)
	    ? &terminal_coding
	    : &safe_terminal_coding);

  while (src < src_end)
    {

  for (i = 0; 
       i < it->pixel_width && glyph < end; 
       ++i)
    {
      glyph->type = CHAR_GLYPH;
      glyph->pixel_width = 1;
      glyph->u.ch = it->c;
      glyph->face_id = it->face_id;
      glyph->padding_p = i > 0;
      glyph->charpos = CHARPOS (it->position);
      glyph->object = it->object;

29448:348aa1a6a062

  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)
    {

  for (i = 0; 
       i < it->pixel_width && glyph < end; 
       ++i)
    {
      glyph->type = CHAR_GLYPH;
      glyph->pixel_width = it->pixel_width;
      glyph->u.ch = it->c;
      glyph->face_id = it->face_id;
      glyph->padding_p = i > 0;
      glyph->charpos = CHARPOS (it->position);
      glyph->object = it->object;