X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.h;h=0d8dd27a807b7c4fdcdd560de1577afb460783f0;hb=2e99b0c26d334eb287486b8933b52b5048c6cc0c;hp=c3c1e0d16a2ff3f287a28729910a9f6920996a10;hpb=959794cfda1f83edc51512211ae5a9f6b1e0b179;p=rocksndiamonds.git diff --git a/src/libgame/image.h b/src/libgame/image.h index c3c1e0d1..0d8dd27a 100644 --- a/src/libgame/image.h +++ b/src/libgame/image.h @@ -17,65 +17,6 @@ #include "system.h" -#if defined(TARGET_X11) - -#define MAX_COLORS 256 /* maximal number of colors for each image */ - -typedef unsigned short Intensity; /* RGB intensity for X11 */ - -typedef struct -{ - Display *display; /* destination display */ - int depth; /* depth of destination drawable */ - Pixel index[MAX_COLORS]; /* array of pixel values */ - int no; /* number of pixels in the array */ - Colormap cmap; /* colormap used for image */ - Pixmap pixmap; /* final pixmap */ - Pixmap pixmap_mask; /* final pixmap of mask */ -} XImageInfo; - -struct RGBMap -{ - unsigned int used; /* number of colors used in RGB map */ - Intensity red[MAX_COLORS]; /* color values in X style */ - Intensity green[MAX_COLORS]; - Intensity blue[MAX_COLORS]; - boolean color_used[MAX_COLORS]; /* flag if color cell is used */ -}; - -typedef struct -{ - unsigned int type; /* type of image (True-Color etc.) */ - struct RGBMap rgb; /* RGB map of image if IRGB type */ - unsigned int width; /* width of image in pixels */ - unsigned int height; /* height of image in pixels */ - unsigned int depth; /* depth of image in bits if IRGB type */ - unsigned int bytes_per_pixel;/* (depth + 7) / 8 */ - unsigned int bytes_per_row; /* width * bytes_per_pixel */ - byte *data; /* image data */ -} Image; - -#define IMAGETYPE_BITMAP 0 /* monochrome bitmap */ -#define IMAGETYPE_RGB 1 /* RGB image with colormap */ -#define IMAGETYPE_TRUECOLOR 2 /* true-color image */ - -#define TRUECOLOR_RED(pixel) (((unsigned int)((pixel) & 0xff0000)) >> 16) -#define TRUECOLOR_GREEN(pixel) (((unsigned int)((pixel) & 0xff00)) >> 8) -#define TRUECOLOR_BLUE(pixel) ( (unsigned int)((pixel) & 0xff)) -#define RGB_TO_TRUECOLOR(r,g,b) ((((unsigned int)((r) & 0xff00)) << 8) | ((g) & 0xff00) | (((unsigned short)(b)) >> 8)) - -Image *newImage(unsigned int, unsigned int, unsigned int); -void freeImage(Image *); -void freeXImage(Image *, XImageInfo *); - -Pixmap Pixmap_to_Mask(Pixmap, int, int); - -void ZoomPixmap(Display *, GC, Pixmap, Pixmap, int, int, int, int); - -int Read_PCX_to_Pixmap(Display *, Window, GC, char *, Pixmap *, Pixmap *); - -#endif /* TARGET_X11 */ - int getImageListSize(); struct FileInfo *getImageListEntryFromImageID(int); Bitmap *getBitmapFromImageID(int);