comparison src/xdisp.c @ 91140:6ab6b7928830

(handle_composition_prop): Adjusted for the change of lispy gstring. Call a function for auto-composition with the third arg it->window. (fill_composite_glyph_string): Adjusted for the change of lispy string. (x_produce_glyphs): Adjusted for the change of font_prepare_compositionl.

91139:3b9ed57b1424

		{
		  EMACS_INT pos_byte = IT_BYTEPOS (*it);

		  it->c = FETCH_CHAR (pos_byte);
		}
	      args[3] = font_at (it->c, this_pos, face, it->w, it->string);
	    }
	  else
#endif	/* USE_FONT_BACKEND */
	    args[3] = Qnil;
	  safe_call (4, args);

	    {
	      Lisp_Object lgstring = AREF (XHASH_TABLE (composition_hash_table)
					   ->key_and_value,
					   cmp->hash_index * 2);

	      it->c = XINT (LGLYPH_CHAR (LGSTRING_GLYPH (lgstring, 0)));
	    }
	  else
#endif /* USE_FONT_BACKEND */
	    {
	      int i;

      for (i = 0, s->nchars = 0; i < s->cmp->glyph_len; i++, s->nchars++)
	{
	  Lisp_Object g = LGSTRING_GLYPH (gstring, i);
	  unsigned code;
          XChar2b * store_pos;
	  if (NILP (LGLYPH_FROM (g)))
	    break;
	  code = XUINT (LGLYPH_CODE (g));
          store_pos = s->char2b + i;
	  STORE_XCHAR2B (store_pos, code >> 8, code & 0xFF);
	}
      s->width = s->cmp->pixel_width;
    }

#ifdef USE_FONT_BACKEND
      if (cmp->method == COMPOSITION_WITH_GLYPH_STRING)
	{
	  if (! cmp->font || cmp->font != font)
	    font_prepare_composition (cmp);
	}
      else
#endif	/* USE_FONT_BACKEND */
      /* If we have not yet calculated pixel size data of glyphs of
	 the composition for the current face font, calculate them

91140:6ab6b7928830

		{
		  EMACS_INT pos_byte = IT_BYTEPOS (*it);

		  it->c = FETCH_CHAR (pos_byte);
		}
	      args[3] = it->window;
	    }
	  else
#endif	/* USE_FONT_BACKEND */
	    args[3] = Qnil;
	  safe_call (4, args);

	    {
	      Lisp_Object lgstring = AREF (XHASH_TABLE (composition_hash_table)
					   ->key_and_value,
					   cmp->hash_index * 2);

	      it->c = LGLYPH_CHAR (LGSTRING_GLYPH (lgstring, 0));
	    }
	  else
#endif /* USE_FONT_BACKEND */
	    {
	      int i;

      for (i = 0, s->nchars = 0; i < s->cmp->glyph_len; i++, s->nchars++)
	{
	  Lisp_Object g = LGSTRING_GLYPH (gstring, i);
	  unsigned code;
          XChar2b * store_pos;
	  if (NILP (g))
	    break;
	  code = LGLYPH_CODE (g);
          store_pos = s->char2b + i;
	  STORE_XCHAR2B (store_pos, code >> 8, code & 0xFF);
	}
      s->width = s->cmp->pixel_width;
    }

#ifdef USE_FONT_BACKEND
      if (cmp->method == COMPOSITION_WITH_GLYPH_STRING)
	{
	  if (! cmp->font || cmp->font != font)
	    font_prepare_composition (cmp, it->f);
	}
      else
#endif	/* USE_FONT_BACKEND */
      /* If we have not yet calculated pixel size data of glyphs of
	 the composition for the current face font, calculate them