summaryrefslogtreecommitdiff
path: root/include/X11/XWDFile.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/X11/XWDFile.h')
-rw-r--r--include/X11/XWDFile.h58
1 files changed, 29 insertions, 29 deletions
diff --git a/include/X11/XWDFile.h b/include/X11/XWDFile.h
index 1e53749..3d0ab89 100644
--- a/include/X11/XWDFile.h
+++ b/include/X11/XWDFile.h
@@ -51,44 +51,44 @@ typedef CARD32 xwdval; /* for old broken programs */
typedef struct _xwd_file_header {
/* header_size = SIZEOF(XWDheader) + length of null-terminated
* window name. */
- CARD32 header_size B32;
+ CARD32 header_size;
- CARD32 file_version B32; /* = XWD_FILE_VERSION above */
- CARD32 pixmap_format B32; /* ZPixmap or XYPixmap */
- CARD32 pixmap_depth B32; /* Pixmap depth */
- CARD32 pixmap_width B32; /* Pixmap width */
- CARD32 pixmap_height B32; /* Pixmap height */
- CARD32 xoffset B32; /* Bitmap x offset, normally 0 */
- CARD32 byte_order B32; /* of image data: MSBFirst, LSBFirst */
+ CARD32 file_version; /* = XWD_FILE_VERSION above */
+ CARD32 pixmap_format; /* ZPixmap or XYPixmap */
+ CARD32 pixmap_depth; /* Pixmap depth */
+ CARD32 pixmap_width; /* Pixmap width */
+ CARD32 pixmap_height; /* Pixmap height */
+ CARD32 xoffset; /* Bitmap x offset, normally 0 */
+ CARD32 byte_order; /* of image data: MSBFirst, LSBFirst */
/* bitmap_unit applies to bitmaps (depth 1 format XY) only.
* It is the number of bits that each scanline is padded to. */
- CARD32 bitmap_unit B32;
+ CARD32 bitmap_unit;
- CARD32 bitmap_bit_order B32; /* bitmaps only: MSBFirst, LSBFirst */
+ CARD32 bitmap_bit_order; /* bitmaps only: MSBFirst, LSBFirst */
/* bitmap_pad applies to pixmaps (non-bitmaps) only.
* It is the number of bits that each scanline is padded to. */
- CARD32 bitmap_pad B32;
+ CARD32 bitmap_pad;
- CARD32 bits_per_pixel B32; /* Bits per pixel */
+ CARD32 bits_per_pixel; /* Bits per pixel */
/* bytes_per_line is pixmap_width padded to bitmap_unit (bitmaps)
* or bitmap_pad (pixmaps). It is the delta (in bytes) to get
* to the same x position on an adjacent row. */
- CARD32 bytes_per_line B32;
- CARD32 visual_class B32; /* Class of colormap */
- CARD32 red_mask B32; /* Z red mask */
- CARD32 green_mask B32; /* Z green mask */
- CARD32 blue_mask B32; /* Z blue mask */
- CARD32 bits_per_rgb B32; /* Log2 of distinct color values */
- CARD32 colormap_entries B32; /* Number of entries in colormap; not used? */
- CARD32 ncolors B32; /* Number of XWDColor structures */
- CARD32 window_width B32; /* Window width */
- CARD32 window_height B32; /* Window height */
- CARD32 window_x B32; /* Window upper left X coordinate */
- CARD32 window_y B32; /* Window upper left Y coordinate */
- CARD32 window_bdrwidth B32; /* Window border width */
+ CARD32 bytes_per_line;
+ CARD32 visual_class; /* Class of colormap */
+ CARD32 red_mask; /* Z red mask */
+ CARD32 green_mask; /* Z green mask */
+ CARD32 blue_mask; /* Z blue mask */
+ CARD32 bits_per_rgb; /* Log2 of distinct color values */
+ CARD32 colormap_entries; /* Number of entries in colormap; not used? */
+ CARD32 ncolors; /* Number of XWDColor structures */
+ CARD32 window_width; /* Window width */
+ CARD32 window_height; /* Window height */
+ CARD32 window_x; /* Window upper left X coordinate */
+ CARD32 window_y; /* Window upper left Y coordinate */
+ CARD32 window_bdrwidth; /* Window border width */
} XWDFileHeader;
/* Null-terminated window name follows the above structure. */
@@ -99,10 +99,10 @@ typedef struct _xwd_file_header {
*/
typedef struct {
- CARD32 pixel B32;
- CARD16 red B16;
- CARD16 green B16;
- CARD16 blue B16;
+ CARD32 pixel;
+ CARD16 red;
+ CARD16 green;
+ CARD16 blue;
CARD8 flags;
CARD8 pad;
} XWDColor;