X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fredisplay-x.c;h=f2acc68f4d3a3ad3b60e9630422c5668976deb14;hb=4722bc54af41d050cb2bf24670d152f3fb0547b7;hp=d74bb3ea4dc34c9a80f818cc7afb300e393224e2;hpb=dbf2768f7b146e97e37a27316f70bb313f1acf15;p=chise%2Fxemacs-chise.git.1

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index d74bb3e..f2acc68 100644
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -123,7 +123,7 @@ struct textual_run
 static int
 separate_textual_runs (unsigned char *text_storage,
 		       struct textual_run *run_storage,
-		       const Emchar *str, Charcount len)
+		       const Charc *str, Charcount len)
 {
   Lisp_Object prev_charset = Qunbound; /* not Qnil because that is a
 					  possible valid charset when
@@ -137,16 +137,25 @@ separate_textual_runs (unsigned char *text_storage,
 
   for (i = 0; i < len; i++)
     {
-      Emchar ch = str[i];
-      Lisp_Object charset;
+      Charc cc = str[i];
+      Lisp_Object charset = CHARC_CHARSET (cc);
+      int code_point = CHARC_CODE_POINT (cc);
       int byte1, byte2;
       int dimension;
       int graphic;
 
-      BREAKUP_CHAR (ch, charset, byte1, byte2);
       dimension = XCHARSET_DIMENSION (charset);
       graphic   = XCHARSET_GRAPHIC   (charset);
-
+      if (dimension == 1)
+	{
+	  byte1 = code_point;
+	  byte2 = 0;
+	}
+      else
+	{
+	  byte1 = code_point >> 8;
+	  byte2 = code_point & 0xFF;
+	}
       if (!EQ (charset, prev_charset))
 	{
 	  run_storage[runs_so_far].ptr       = text_storage;
@@ -241,7 +250,7 @@ x_text_width_single_run (struct face_cachel *cachel, struct textual_run *run)
    */
 
 static int
-x_text_width (struct frame *f, struct face_cachel *cachel, const Emchar *str,
+x_text_width (struct frame *f, struct face_cachel *cachel, const Charc *str,
 	      Charcount len)
 {
   int width_so_far = 0;
@@ -318,7 +327,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 			int cursor_width, int cursor_height)
 {
   struct frame *f = XFRAME (w->frame);
-  Emchar_dynarr *buf = Dynarr_new (Emchar);
+  Charc_dynarr *buf;
   Lisp_Object window;
 
   struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@ -341,21 +350,22 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
   findex = rb->findex;
   xpos = rb->xpos;
   if (rb->type == RUNE_CHAR)
-    charset = CHAR_CHARSET (rb->object.chr.ch);
+    charset = CHARC_CHARSET (rb->object.cglyph);
 
   if (end < 0)
     end = Dynarr_length (rba);
-  Dynarr_reset (buf);
+  buf = Dynarr_new (Charc);
 
   while (elt < end)
     {
       rb = Dynarr_atp (rba, elt);
 
       if (rb->findex == findex && rb->type == RUNE_CHAR
-	  && rb->object.chr.ch != '\n' && rb->cursor_type != CURSOR_ON
-	  && EQ (charset, CHAR_CHARSET (rb->object.chr.ch)))
+	  && (!CHARC_ASCII_EQ (rb->object.cglyph, '\n'))
+	  && rb->cursor_type != CURSOR_ON
+	  && EQ (charset, CHARC_CHARSET (rb->object.cglyph)))
 	{
-	  Dynarr_add (buf, rb->object.chr.ch);
+	  Dynarr_add (buf, rb->object.cglyph);
 	  width += rb->width;
 	  elt++;
 	}
@@ -376,17 +386,17 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 	    {
 	      findex = rb->findex;
 	      xpos = rb->xpos;
-	      charset = CHAR_CHARSET (rb->object.chr.ch);
+	      charset = CHARC_CHARSET (rb->object.cglyph);
 
 	      if (rb->cursor_type == CURSOR_ON)
 		{
-		  if (rb->object.chr.ch == '\n')
+		  if (CHARC_ASCII_EQ (rb->object.cglyph, '\n'))
 		    {
 		      x_output_eol_cursor (w, dl, xpos, findex);
 		    }
 		  else
 		    {
-		      Dynarr_add (buf, rb->object.chr.ch);
+		      Dynarr_add (buf, rb->object.cglyph);
 		      x_output_string (w, dl, buf, xpos, 0, start_pixpos,
 				       rb->width, findex, 1,
 				       cursor_start, cursor_width,
@@ -397,7 +407,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 		  xpos += rb->width;
 		  elt++;
 		}
-	      else if (rb->object.chr.ch == '\n')
+	      else if (CHARC_ASCII_EQ (rb->object.cglyph, '\n'))
 		{
 		  /* Clear in case a cursor was formerly here. */
 		  redisplay_clear_region (window, findex, xpos,
@@ -482,7 +492,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 		    case IMAGE_TEXT:
 		    case IMAGE_POINTER:
 		    default:
-		      abort ();
+		      ABORT ();
 		    }
 		  IMAGE_INSTANCE_OPTIMIZE_OUTPUT
 		    (XIMAGE_INSTANCE (instance)) = 0;
@@ -492,7 +502,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 	      elt++;
 	    }
 	  else
-	    abort ();
+	    ABORT ();
 	}
     }
 
@@ -765,7 +775,7 @@ x_get_gc (struct device *d, Lisp_Object font, Lisp_Object fg, Lisp_Object bg,
  ****************************************************************************/
 void
 x_output_string (struct window *w, struct display_line *dl,
-		 Emchar_dynarr *buf, int xpos, int xoffset, int clip_start,
+		 Charc_dynarr *buf, int xpos, int xoffset, int clip_start,
 		 int width, face_index findex, int cursor,
 		 int cursor_start, int cursor_width, int cursor_height)
 {
@@ -972,8 +982,9 @@ x_output_string (struct window *w, struct display_line *dl,
       /* We draw underlines in the same color as the text. */
       if (cachel->underline)
 	{
-	  long upos;
-	  long uthick;
+	  /* upos is naturally signed, why would anyone think otherwise?
+	     uthick is signed to avoid unsigned propagation. */
+	  long upos, uthick;
 	  XFontStruct *xfont;
 
 	  xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
@@ -1001,7 +1012,9 @@ x_output_string (struct window *w, struct display_line *dl,
 	}
 
       if (cachel->strikethru) {
-	unsigned long ascent,descent,upos, uthick;
+	/* ascent, descent, and upos are naturally signed; why would anyone
+	   think otherwise?  uthick is signed to avoid unsigned propagation. */
+	long ascent, descent, upos, uthick;
 	XFontStruct *xfont;
 
 	xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));