Mercurial > hg > xemacs-beta
diff src/glyphs-x.c @ 48:56c54cf7c5b6 r19-16b90
Import from CVS: tag r19-16b90
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 08:56:04 +0200 |
| parents | 8d2a9b52c682 |
| children | ee648375d8d6 |
line wrap: on
line diff
--- a/src/glyphs-x.c Mon Aug 13 08:55:32 2007 +0200 +++ b/src/glyphs-x.c Mon Aug 13 08:56:04 2007 +0200 @@ -57,7 +57,11 @@ #include "sysfile.h" +#ifdef HAVE_PNG +#include <png.h> +#else #include <setjmp.h> +#endif #define LISP_DEVICE_TO_X_SCREEN(dev) \ XDefaultScreenOfDisplay (DEVICE_X_DISPLAY (XDEVICE (dev))) @@ -110,7 +114,8 @@ Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask); + int dest_mask, + Lisp_Object domain); #include "bitmaps.h" @@ -1034,7 +1039,7 @@ static void xbm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); CONST char *gcc_go_home; @@ -1268,7 +1273,7 @@ static void jpeg_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); @@ -1745,7 +1750,7 @@ static void gif_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); @@ -1919,8 +1924,6 @@ #ifdef HAVE_PNG -#include <png.h> - /********************************************************************** * PNG * **********************************************************************/ @@ -2030,7 +2033,7 @@ static void png_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); @@ -2324,7 +2327,7 @@ static void tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { abort (); } @@ -2554,6 +2557,7 @@ static XpmColorSymbol * extract_xpm_color_names (XpmAttributes *xpmattrs, Lisp_Object device, + Lisp_Object domain, Lisp_Object color_symbol_alist) { /* This function can GC */ @@ -2587,7 +2591,7 @@ else { assert (COLOR_SPECIFIERP (value)); - value = Fspecifier_instance (value, Qnil, Qnil, Qnil); + value = Fspecifier_instance (value, domain, Qnil, Qnil); } if (NILP (value)) continue; @@ -2636,7 +2640,7 @@ static void xpm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { /* This function can GC */ struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); @@ -2697,7 +2701,7 @@ xpmattrs.valuemask |= XpmCloseness; } - color_symbols = extract_xpm_color_names (&xpmattrs, device, + color_symbols = extract_xpm_color_names (&xpmattrs, device, domain, color_symbol_alist); result = XpmCreatePixmapFromBuffer (dpy, @@ -3048,7 +3052,7 @@ static void xface_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); int i, stattis; @@ -3213,7 +3217,7 @@ static void autodetect_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); struct gcpro gcpro1, gcpro2, gcpro3; @@ -3241,10 +3245,10 @@ if (is_cursor_font) cursor_font_instantiate (image_instance, result, pointer_fg, - pointer_bg, dest_mask); + pointer_bg, dest_mask, domain); else string_instantiate (image_instance, result, pointer_fg, - pointer_bg, dest_mask); + pointer_bg, dest_mask, domain); UNGCPRO; } @@ -3310,7 +3314,7 @@ static void font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { /* This function can GC */ Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); @@ -3408,7 +3412,7 @@ static void cursor_font_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, - int dest_mask) + int dest_mask, Lisp_Object domain) { /* This function can GC */ Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);