X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fredisplay-gtk.c;h=7560803738ef0130dc7b1909a147c044900b0e07;hb=c17cfefd00f49430bd139e11bfc580734091d728;hp=f1ee92619a1064ca738ad4719e1e8ad69fb51e06;hpb=7ee7b9fd0c91842f267cf6e412286d647f68e32a;p=chise%2Fxemacs-chise.git.1

diff --git a/src/redisplay-gtk.c b/src/redisplay-gtk.c
index f1ee926..7560803 100644
--- a/src/redisplay-gtk.c
+++ b/src/redisplay-gtk.c
@@ -51,6 +51,10 @@ Boston, MA 02111-1307, USA.  */
 #include "file-coding.h" /* for CCL conversion */
 #endif
 
+#ifdef HAVE_POLL
+#include <sys/poll.h>
+#endif
+
 #define CONST const
 
 #define EOL_CURSOR_WIDTH	5
@@ -290,7 +294,7 @@ gtk_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);
@@ -322,7 +326,7 @@ gtk_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)
     {
@@ -417,8 +421,8 @@ gtk_output_display_block (struct window *w, struct display_line *dl, int block,
 	      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);
 	      instance = glyph_image_instance (rb->object.dglyph.glyph,
@@ -456,7 +460,7 @@ gtk_output_display_block (struct window *w, struct display_line *dl, int block,
 		    break;
 
 		  case IMAGE_POINTER:
-		    abort ();
+		    ABORT ();
 
 		  case IMAGE_WIDGET:
 		      if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
@@ -480,14 +484,14 @@ gtk_output_display_block (struct window *w, struct display_line *dl, int block,
 		    break;
 
 		  default:
-		    abort ();
+		    ABORT ();
 		  }
 
 	      xpos += rb->width;
 	      elt++;
 	    }
 	  else
-	    abort ();
+	    ABORT ();
 	}
     }