Mercurial > hg > xemacs-beta

comparison src/redisplay-x.c @ 406:b8cc9ab3f761 r21-2-33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-33
author cvs
date Mon, 13 Aug 2007 11:17:09 +0200
parents 2f8bb876ab1d
children 501cfd01ee6d
comparison
equal deleted inserted replaced
405:0e08f63c74d2 406:b8cc9ab3f761
450 450
451 if (IMAGE_INSTANCEP (instance)) 451 if (IMAGE_INSTANCEP (instance))
452 { 452 {
453 switch (XIMAGE_INSTANCE_TYPE (instance)) 453 switch (XIMAGE_INSTANCE_TYPE (instance))
454 { 454 {
455 case IMAGE_TEXT:
456 {
457 /* #### This is way losing. See the comment in
458 add_glyph_rune(). */
459 Lisp_Object string =
460 XIMAGE_INSTANCE_TEXT_STRING (instance);
461 convert_bufbyte_string_into_emchar_dynarr
462 (XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
463
464 x_output_string (w, dl, buf, xpos,
465 rb->object.dglyph.xoffset,
466 start_pixpos, -1, findex,
467 (rb->cursor_type == CURSOR_ON),
468 cursor_start, cursor_width,
469 cursor_height);
470 Dynarr_reset (buf);
471 }
472 break;
473
474 case IMAGE_MONO_PIXMAP: 455 case IMAGE_MONO_PIXMAP:
475 case IMAGE_COLOR_PIXMAP: 456 case IMAGE_COLOR_PIXMAP:
476 redisplay_output_pixmap (w, instance, &dbox, &dga, findex, 457 redisplay_output_pixmap (w, instance, &dbox, &dga, findex,
477 cursor_start, cursor_width, 458 cursor_start, cursor_width,
478 cursor_height, 0); 459 cursor_height, 0);
493 474
494 case IMAGE_NOTHING: 475 case IMAGE_NOTHING:
495 /* nothing is as nothing does */ 476 /* nothing is as nothing does */
496 break; 477 break;
497 478
479 case IMAGE_TEXT:
498 case IMAGE_POINTER: 480 case IMAGE_POINTER:
499 default: 481 default:
500 abort (); 482 abort ();
501 } 483 }
502 IMAGE_INSTANCE_OPTIMIZE_OUTPUT 484 IMAGE_INSTANCE_OPTIMIZE_OUTPUT