comparison src/glyphs-x.h @ 269:b2472a1930f2 r20-5b33

Import from CVS: tag r20-5b33
author cvs
date Mon, 13 Aug 2007 10:27:19 +0200
parents 6b37e6ddd302
children bbff43aa5eb7
comparison
equal deleted inserted replaced
268:6ced69ccd85f 269:b2472a1930f2
44 Cursor cursor; 44 Cursor cursor;
45 45
46 /* If depth>0, then that means that other colors were allocated when 46 /* If depth>0, then that means that other colors were allocated when
47 this pixmap was loaded. These are they; we need to free them when 47 this pixmap was loaded. These are they; we need to free them when
48 finalizing the image instance. */ 48 finalizing the image instance. */
49 Colormap colormap;
49 unsigned long *pixels; 50 unsigned long *pixels;
50 int npixels; 51 int npixels;
51 52
52 /* Should we hang on to the extra info from the XpmAttributes, like 53 /* Should we hang on to the extra info from the XpmAttributes, like
53 the textual color table and the comments? Is that useful? */ 54 the textual color table and the comments? Is that useful? */
56 #define X_IMAGE_INSTANCE_DATA(i) ((struct x_image_instance_data *) (i)->data) 57 #define X_IMAGE_INSTANCE_DATA(i) ((struct x_image_instance_data *) (i)->data)
57 58
58 #define IMAGE_INSTANCE_X_PIXMAP(i) (X_IMAGE_INSTANCE_DATA (i)->pixmap) 59 #define IMAGE_INSTANCE_X_PIXMAP(i) (X_IMAGE_INSTANCE_DATA (i)->pixmap)
59 #define IMAGE_INSTANCE_X_MASK(i) (X_IMAGE_INSTANCE_DATA (i)->mask) 60 #define IMAGE_INSTANCE_X_MASK(i) (X_IMAGE_INSTANCE_DATA (i)->mask)
60 #define IMAGE_INSTANCE_X_CURSOR(i) (X_IMAGE_INSTANCE_DATA (i)->cursor) 61 #define IMAGE_INSTANCE_X_CURSOR(i) (X_IMAGE_INSTANCE_DATA (i)->cursor)
62 #define IMAGE_INSTANCE_X_COLORMAP(i) (X_IMAGE_INSTANCE_DATA (i)->colormap)
61 #define IMAGE_INSTANCE_X_PIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->pixels) 63 #define IMAGE_INSTANCE_X_PIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->pixels)
62 #define IMAGE_INSTANCE_X_NPIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->npixels) 64 #define IMAGE_INSTANCE_X_NPIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->npixels)
63 65
64 #define XIMAGE_INSTANCE_X_PIXMAP(i) \ 66 #define XIMAGE_INSTANCE_X_PIXMAP(i) \
65 IMAGE_INSTANCE_X_PIXMAP (XIMAGE_INSTANCE (i)) 67 IMAGE_INSTANCE_X_PIXMAP (XIMAGE_INSTANCE (i))