Mercurial > hg > xemacs-beta

comparison src/redisplay-output.c @ 440:8de8e3f6228a r21-2-28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-28
author cvs
date Mon, 13 Aug 2007 11:33:38 +0200
parents 84b14dcb0985
children abe6d1db359e
comparison
equal deleted inserted replaced
439:357dd071b03c 440:8de8e3f6228a
1155 Lisp_Object image_instance, 1155 Lisp_Object image_instance,
1156 struct display_box* db, struct display_glyph_area* dga, 1156 struct display_box* db, struct display_glyph_area* dga,
1157 face_index findex, int cursor_start, int cursor_width, 1157 face_index findex, int cursor_start, int cursor_width,
1158 int cursor_height) 1158 int cursor_height)
1159 { 1159 {
1160 struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); 1160 Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
1161 Lisp_Object window; 1161 Lisp_Object window;
1162 struct display_glyph_area sdga; 1162 struct display_glyph_area sdga;
1163 1163
1164 dga->height = IMAGE_INSTANCE_SUBWINDOW_HEIGHT (p); 1164 dga->height = IMAGE_INSTANCE_SUBWINDOW_HEIGHT (p);
1165 dga->width = IMAGE_INSTANCE_SUBWINDOW_WIDTH (p); 1165 dga->width = IMAGE_INSTANCE_SUBWINDOW_WIDTH (p);
1212 Lisp_Object image_instance, 1212 Lisp_Object image_instance,
1213 struct display_box* db, struct display_glyph_area* dga, 1213 struct display_box* db, struct display_glyph_area* dga,
1214 face_index findex, int cursor_start, int cursor_width, 1214 face_index findex, int cursor_start, int cursor_width,
1215 int cursor_height) 1215 int cursor_height)
1216 { 1216 {
1217 struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); 1217 Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
1218 Lisp_Object window, rest; 1218 Lisp_Object window, rest;
1219 Emchar_dynarr *buf = Dynarr_new (Emchar); 1219 Emchar_dynarr *buf = Dynarr_new (Emchar);
1220 struct frame *f = XFRAME (w->frame); 1220 struct frame *f = XFRAME (w->frame);
1221 struct device *d = XDEVICE (f->device); 1221 struct device *d = XDEVICE (f->device);
1222 int layout_height, layout_width; 1222 int layout_height, layout_width;
1223 /* We bogusly don't take f->extents_changed and f->glyphs_changed 1223 /* We bogusly don't take f->extents_changed and f->glyphs_changed
1224 into account. This is because if we do we always redisplay the 1224 into account. This is because if we do we always redisplay the
1225 entire layout. So far I have seen no ill effects to we'll see. */ 1225 entire layout. So far I have seen no ill effects so we'll see. */
1226 int frame_really_changed = (f->buffers_changed || 1226 int frame_really_changed = (f->buffers_changed ||
1227 f->clip_changed || 1227 f->clip_changed ||
1228 f->faces_changed || 1228 f->faces_changed ||
1229 f->frame_changed || 1229 f->frame_changed ||
1230 f->modeline_changed || 1230 f->modeline_changed ||
1312 cdb.height = db->height; 1312 cdb.height = db->height;
1313 1313
1314 /* First determine if the image is visible at all */ 1314 /* First determine if the image is visible at all */
1315 if (IMAGE_INSTANCEP (child)) 1315 if (IMAGE_INSTANCEP (child))
1316 { 1316 {
1317 struct Lisp_Image_Instance* childii = XIMAGE_INSTANCE (child); 1317 Lisp_Image_Instance* childii = XIMAGE_INSTANCE (child);
1318 /* The enclosing layout offsets are +ve at this point */ 1318 /* The enclosing layout offsets are +ve at this point */
1319 struct display_glyph_area cdga; 1319 struct display_glyph_area cdga;
1320 cdga.xoffset = IMAGE_INSTANCE_XOFFSET (childii) - dga->xoffset; 1320 cdga.xoffset = IMAGE_INSTANCE_XOFFSET (childii) - dga->xoffset;
1321 cdga.yoffset = IMAGE_INSTANCE_YOFFSET (childii) - dga->yoffset; 1321 cdga.yoffset = IMAGE_INSTANCE_YOFFSET (childii) - dga->yoffset;
1322 cdga.width = glyph_width (child, window); 1322 cdga.width = glyph_width (child, window);
1426 face_index findex, int cursor_start, int cursor_width, 1426 face_index findex, int cursor_start, int cursor_width,
1427 int cursor_height, int offset_bitmap) 1427 int cursor_height, int offset_bitmap)
1428 { 1428 {
1429 struct frame *f = XFRAME (w->frame); 1429 struct frame *f = XFRAME (w->frame);
1430 struct device *d = XDEVICE (f->device); 1430 struct device *d = XDEVICE (f->device);
1431 struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); 1431 Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
1432 Lisp_Object window; 1432 Lisp_Object window;
1433 XSETWINDOW (window, w); 1433 XSETWINDOW (window, w);
1434 1434
1435 dga->height = IMAGE_INSTANCE_PIXMAP_HEIGHT (p); 1435 dga->height = IMAGE_INSTANCE_PIXMAP_HEIGHT (p);
1436 dga->width = IMAGE_INSTANCE_PIXMAP_WIDTH (p); 1436 dga->width = IMAGE_INSTANCE_PIXMAP_WIDTH (p);