projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Add some Adobe-Japan1 code points.
[chise/xemacs-chise.git-]
/
src
/
redisplay-gtk.c
diff --git
a/src/redisplay-gtk.c
b/src/redisplay-gtk.c
index
967cf89
..
7560803
100644
(file)
--- a/
src/redisplay-gtk.c
+++ b/
src/redisplay-gtk.c
@@
-294,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);
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);
Lisp_Object window;
struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@
-326,7
+326,7
@@
gtk_output_display_block (struct window *w, struct display_line *dl, int block,
if (end < 0)
end = Dynarr_length (rba);
if (end < 0)
end = Dynarr_length (rba);
- Dynarr_reset (buf);
+ buf = Dynarr_new (Emchar);
while (elt < end)
{
while (elt < end)
{
@@
-421,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,
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,
XSETWINDOW (window, w);
instance = glyph_image_instance (rb->object.dglyph.glyph,
@@
-460,7
+460,7
@@
gtk_output_display_block (struct window *w, struct display_line *dl, int block,
break;
case IMAGE_POINTER:
break;
case IMAGE_POINTER:
- abort ();
+ ABORT ();
case IMAGE_WIDGET:
if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
case IMAGE_WIDGET:
if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
@@
-484,14
+484,14
@@
gtk_output_display_block (struct window *w, struct display_line *dl, int block,
break;
default:
break;
default:
- abort ();
+ ABORT ();
}
xpos += rb->width;
elt++;
}
else
}
xpos += rb->width;
elt++;
}
else
- abort ();
+ ABORT ();
}
}
}
}