X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fredisplay-x.c;h=daf3c27ba7ac7cc7723cc733400a886f76aaa399;hb=63a686a3d18465a8c96b8cc4a273c295f8a5a379;hp=85d540a6df909f80ee7087a31b6adce21d3c60d1;hpb=caf1416adb403b6334ce635e58b269b6c653aa39;p=chise%2Fxemacs-chise.git.1

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index 85d540a..daf3c27 100644
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -318,7 +318,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);
+  Emchar_dynarr *buf;
   Lisp_Object window;
 
   struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@ -345,7 +345,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 
   if (end < 0)
     end = Dynarr_length (rba);
-  Dynarr_reset (buf);
+  buf = Dynarr_new (Emchar);
 
   while (elt < end)
     {
@@ -439,11 +439,12 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 	      Lisp_Object instance;
 	      struct display_box dbox;
 	      struct display_glyph_area dga;
+
 	      redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset,
-						 start_pixpos, rb->width,
-						 &dbox, &dga);
+						 rb->object.dglyph.yoffset, start_pixpos,
+                                                 rb->width, &dbox, &dga);
 
-	      XSETWINDOW (window, w);
+              XSETWINDOW (window, w);
 	      instance = glyph_image_instance (rb->object.dglyph.glyph,
 					       window, ERROR_ME_NOT, 1);
 	      findex = rb->findex;
@@ -481,7 +482,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;
@@ -491,7 +492,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 	      elt++;
 	    }
 	  else
-	    abort ();
+	    ABORT ();
 	}
     }
 
@@ -514,7 +515,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 /*****************************************************************************
  x_bevel_area
 
- Draw a shadows for the given area in the given face.
+ Draw shadows for the given area in the given face.
  ****************************************************************************/
 static void
 x_bevel_area (struct window *w, face_index findex,
@@ -971,7 +972,9 @@ x_output_string (struct window *w, struct display_line *dl,
       /* We draw underlines in the same color as the text. */
       if (cachel->underline)
 	{
-	  unsigned long upos, 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));
@@ -999,7 +1002,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));
@@ -1706,6 +1711,7 @@ x_redraw_exposed_window (struct window *w, int x, int y, int width, int height)
       f->windows_structure_changed = 1;
     }
 
+  redisplay_clear_top_of_window (w);
   if (window_needs_vertical_divider (w))
     {
       x_output_vertical_divider (w, 0);
@@ -2064,8 +2070,8 @@ x_ring_bell (struct device *d, int volume, int pitch, int duration)
       /* #### grab server? */
       XGetKeyboardControl (display, &state);
 
-      ctl.bell_pitch    = (pitch    >= 0 ? pitch    : state.bell_pitch);
-      ctl.bell_duration = (duration >= 0 ? duration : state.bell_duration);
+      ctl.bell_pitch    = (pitch    >= 0 ? pitch    : (int) state.bell_pitch);
+      ctl.bell_duration = (duration >= 0 ? duration : (int) state.bell_duration);
       XChangeKeyboardControl (display, KBBellPitch|KBBellDuration, &ctl);
 
       XBell (display, (volume * 2) - 100);