X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fredisplay-output.c;h=540ece941a0c441b584dadd2e0d024fcc05ad04b;hb=63a686a3d18465a8c96b8cc4a273c295f8a5a379;hp=7b1c46ff673c0da17f0800436cbaebadec2b96fb;hpb=6e8f204c9e1f490b2752de46c111744d1deb3ee0;p=chise%2Fxemacs-chise.git.1

diff --git a/src/redisplay-output.c b/src/redisplay-output.c
index 7b1c46f..540ece9 100644
--- a/src/redisplay-output.c
+++ b/src/redisplay-output.c
@@ -221,7 +221,7 @@ compare_runes (struct window *w, struct rune *crb, struct rune *drb)
   else if (crb->type != drb->type)
     return 0;
   else if (crb->type == RUNE_CHAR &&
-	   !CHARC_EQ (crb->object.cglyph, drb->object.cglyph))
+	   (crb->object.chr.ch != drb->object.chr.ch))
     return 0;
   else if (crb->type == RUNE_HLINE &&
 	   (crb->object.hline.thickness != drb->object.hline.thickness ||
@@ -1317,7 +1317,7 @@ redisplay_output_layout (Lisp_Object domain,
 {
   Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
   Lisp_Object rest, window = DOMAIN_WINDOW (domain);
-  Charc_dynarr *buf = Dynarr_new (Charc);
+  Emchar_dynarr *buf;
   struct window *w = XWINDOW (window);
   struct device *d = DOMAIN_XDEVICE (domain);
   int layout_height, layout_width;
@@ -1334,6 +1334,8 @@ redisplay_output_layout (Lisp_Object domain,
   if (!redisplay_normalize_glyph_area (db, dga))
     return;
 
+  buf = Dynarr_new (Emchar);
+
   /* Highly dodgy optimization. We want to only output the whole
      layout if we really have to. */
   if (!IMAGE_INSTANCE_OPTIMIZE_OUTPUT (p)
@@ -1457,7 +1459,7 @@ redisplay_output_layout (Lisp_Object domain,
 			struct display_line dl;	/* this is fake */
 			Lisp_Object string =
 			  IMAGE_INSTANCE_TEXT_STRING (childii);
-			Charset_ID charsets[NUM_LEADING_BYTES];
+			unsigned char charsets[NUM_LEADING_BYTES];
 			struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex);
 
 			find_charsets_in_bufbyte_string (charsets,
@@ -1465,9 +1467,8 @@ redisplay_output_layout (Lisp_Object domain,
 							 XSTRING_LENGTH (string));
 			ensure_face_cachel_complete (cachel, window, charsets);
 
-			convert_bufbyte_string_into_charc_dynarr
-			  (XSTRING_DATA (string), XSTRING_LENGTH (string),
-			   buf);
+			convert_bufbyte_string_into_emchar_dynarr
+			  (XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
 
 			redisplay_normalize_display_box (&cdb, &cdga);
 			/* Offsets are now +ve again so be careful