bugfixes in PutImage()

1 files changed, 48 insertions, 873 deletions

diff --git a/xcl/src/PutImage.c b/xcl/src/PutImage.c
index 1fd9543..38dc510 100644
--- a/xcl/src/PutImage.c
+++ b/xcl/src/PutImage.c
@@ -7,764 +7,6 @@
 #include <X11/Xutil.h>
 #include <stdio.h>
 
-#undef USEPUTIMAGE
-#undef USEPUTPIXEL
-
-#if defined(Lynx) && defined(ROUNDUP)
-#undef ROUNDUP
-#endif
-
-/* assumes pad is a power of 2 */
-#define ROUNDUP(nbytes, pad) (((nbytes) + ((pad) - 1)) & ~(long)((pad) - 1))
-
-#ifdef USEPUTIMAGE
-static unsigned char const _reverse_byte[0x100] = {
-	0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-	0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-	0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-	0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-	0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-	0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-	0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-	0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-	0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-	0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-	0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-	0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-	0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-	0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-	0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-	0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-	0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-	0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-	0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-	0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-	0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-	0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-	0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-	0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-	0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-	0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-	0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-	0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-	0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-	0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-	0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-	0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
-};
-
-static unsigned char const _reverse_nibs[0x100] = {
-	0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
-	0x80, 0x90, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0,
-	0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
-	0x81, 0x91, 0xa1, 0xb1, 0xc1, 0xd1, 0xe1, 0xf1,
-	0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
-	0x82, 0x92, 0xa2, 0xb2, 0xc2, 0xd2, 0xe2, 0xf2,
-	0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
-	0x83, 0x93, 0xa3, 0xb3, 0xc3, 0xd3, 0xe3, 0xf3,
-	0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
-	0x84, 0x94, 0xa4, 0xb4, 0xc4, 0xd4, 0xe4, 0xf4,
-	0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
-	0x85, 0x95, 0xa5, 0xb5, 0xc5, 0xd5, 0xe5, 0xf5,
-	0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
-	0x86, 0x96, 0xa6, 0xb6, 0xc6, 0xd6, 0xe6, 0xf6,
-	0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
-	0x87, 0x97, 0xa7, 0xb7, 0xc7, 0xd7, 0xe7, 0xf7,
-	0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
-	0x88, 0x98, 0xa8, 0xb8, 0xc8, 0xd8, 0xe8, 0xf8,
-	0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
-	0x89, 0x99, 0xa9, 0xb9, 0xc9, 0xd9, 0xe9, 0xf9,
-	0x0a, 0x1a, 0x2a, 0x3a, 0x4a, 0x5a, 0x6a, 0x7a,
-	0x8a, 0x9a, 0xaa, 0xba, 0xca, 0xda, 0xea, 0xfa,
-	0x0b, 0x1b, 0x2b, 0x3b, 0x4b, 0x5b, 0x6b, 0x7b,
-	0x8b, 0x9b, 0xab, 0xbb, 0xcb, 0xdb, 0xeb, 0xfb,
-	0x0c, 0x1c, 0x2c, 0x3c, 0x4c, 0x5c, 0x6c, 0x7c,
-	0x8c, 0x9c, 0xac, 0xbc, 0xcc, 0xdc, 0xec, 0xfc,
-	0x0d, 0x1d, 0x2d, 0x3d, 0x4d, 0x5d, 0x6d, 0x7d,
-	0x8d, 0x9d, 0xad, 0xbd, 0xcd, 0xdd, 0xed, 0xfd,
-	0x0e, 0x1e, 0x2e, 0x3e, 0x4e, 0x5e, 0x6e, 0x7e,
-	0x8e, 0x9e, 0xae, 0xbe, 0xce, 0xde, 0xee, 0xfe,
-	0x0f, 0x1f, 0x2f, 0x3f, 0x4f, 0x5f, 0x6f, 0x7f,
-	0x8f, 0x9f, 0xaf, 0xbf, 0xcf, 0xdf, 0xef, 0xff
-};
-
-int
-_XReverse_Bytes (bpt, nb)
-    register unsigned char *bpt;
-    register int nb;
-{
-    do {
-	*bpt = _reverse_byte[*bpt];
-	bpt++;
-    } while (--nb > 0);
-    return 0;
-}
-
-
-/*ARGSUSED*/
-static void
-NoSwap (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long h = height;
-
-    if (srcinc == destinc)
-	memcpy((char *)dest, (char *)src, (int)(srcinc * (h - 1) + srclen));
-    else
-	for (; --h >= 0; src += srcinc, dest += destinc)
-	    memcpy((char *)dest, (char *)src, (int)srclen);
-}
-
-static void
-SwapTwoBytes (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 2);
-    register long h, n;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 2;
-	    if (half_order == MSBFirst)
-		*(dest + length) = *(src + length + 1);
-	    else
-		*(dest + length + 1) = *(src + length);
-	}
-	for (n = length; n > 0; n -= 2, src += 2) {
-	    *dest++ = *(src + 1);
-	    *dest++ = *src;
-	}
-    }
-}
-
-static void
-SwapThreeBytes (src, dest, srclen, srcinc, destinc, height, byte_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int byte_order;
-{
-    long length = ((srclen + 2) / 3) * 3;
-    register long h, n;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 3;
-	    if ((srclen - length) == 2)
-		*(dest + length + 1) = *(src + length + 1);
-	    if (byte_order == MSBFirst)
-		*(dest + length) = *(src + length + 2);
-	    else
-		*(dest + length + 2) = *(src + length);
-	}
-	for (n = length; n > 0; n -= 3, src += 3) {
-	    *dest++ = *(src + 2);
-	    *dest++ = *(src + 1);
-	    *dest++ = *src;
-	}
-    }
-}
-
-static void
-SwapFourBytes (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 4);
-    register long h, n;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 4;
-	    if (half_order == MSBFirst)
-		*(dest + length) = *(src + length + 3);
-	    if (((half_order == LSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == MSBFirst) && (srclen & 2)))
-		*(dest + length + 1) = *(src + length + 2);
-	    if (((half_order == MSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == LSBFirst) && (srclen & 2)))
-		*(dest + length + 2) = *(src + length + 1);
-	    if (half_order == LSBFirst)
-		*(dest + length + 3) = *(src + length);
-	}
-	for (n = length; n > 0; n -= 4, src += 4) {
-	    *dest++ = *(src + 3);
-	    *dest++ = *(src + 2);
-	    *dest++ = *(src + 1);
-	    *dest++ = *src;
-	}
-    }
-}
-
-static void
-SwapWords (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 4);
-    register long h, n;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 4;
-	    if (half_order == MSBFirst)
-		*(dest + length + 1) = *(src + length + 3);
-	    if (((half_order == LSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == MSBFirst) && (srclen & 2)))
-		*(dest + length) = *(src + length + 2);
-	    if (((half_order == MSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == LSBFirst) && (srclen & 2)))
-		*(dest + length + 3) = *(src + length + 1);
-	    if (half_order == LSBFirst)
-		*(dest + length + 2) = *(src + length);
-	}
-	for (n = length; n > 0; n -= 4, src += 2) {
-	    *dest++ = *(src + 2);
-	    *dest++ = *(src + 3);
-	    *dest++ = *src++;
-	    *dest++ = *src++;
-	}
-    }
-}
-
-static void
-SwapNibbles (src, dest, srclen, srcinc, destinc, height)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-{
-    register long h, n;
-    register const unsigned char *rev = _reverse_nibs;
-
-    srcinc -= srclen;
-    destinc -= srclen;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc)
-	for (n = srclen; --n >= 0; )
-	    *dest++ = rev[*src++];
-}
-
-static void
-ShiftNibblesLeft (src, dest, srclen, srcinc, destinc, height, nibble_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int nibble_order;
-{
-    register long h, n;
-    register unsigned char c1, c2;
-
-    srcinc -= srclen;
-    destinc -= srclen;
-    if (nibble_order == MSBFirst) {
-	for (h = height; --h >= 0; src += srcinc, dest += destinc)
-	    for (n = srclen; --n >= 0; ) {
-		c1 = *src++;
-		c2 = *src;
-		*dest++ = ((c1 & 0x0f) << 4) | ((c2 & (unsigned)0xf0) >> 4);
-	    }
-    } else {
-	for (h = height; --h >= 0; src += srcinc, dest += destinc)
-	    for (n = srclen; --n >= 0; ) {
-		c1 = *src++;
-		c2 = *src;
-		*dest++ = ((c2 & 0x0f) << 4) | ((c1 & (unsigned)0xf0) >> 4);
-	    }
-    }
-}
-
-/*ARGSUSED*/
-static void
-SwapBits (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    register long h, n;
-    register const unsigned char *rev = _reverse_byte;
-
-    srcinc -= srclen;
-    destinc -= srclen;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc)
-	for (n = srclen; --n >= 0; )
-	    *dest++ = rev[*src++];
-}
-
-static void
-SwapBitsAndTwoBytes (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-{
-    long length = ROUNDUP(srclen, 2);
-    register long h, n;
-    register const unsigned char *rev = _reverse_byte;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 2;
-	    if (half_order == MSBFirst)
-		*(dest + length) = rev[*(src + length + 1)];
-	    else
-		*(dest + length + 1) = rev[*(src + length)];
-	}
-	for (n = length; n > 0; n -= 2, src += 2) {
-	    *dest++ = rev[*(src + 1)];
-	    *dest++ = rev[*src];
-	}
-    }
-}
-
-static void
-SwapBitsAndFourBytes (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 4);
-    register long h, n;
-    register const unsigned char *rev = _reverse_byte;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 4;
-	    if (half_order == MSBFirst)
-		*(dest + length) = rev[*(src + length + 3)];
-	    if (((half_order == LSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == MSBFirst) && (srclen & 2)))
-		*(dest + length + 1) = rev[*(src + length + 2)];
-	    if (((half_order == MSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == LSBFirst) && (srclen & 2)))
-		*(dest + length + 2) = rev[*(src + length + 1)];
-	    if (half_order == LSBFirst)
-		*(dest + length + 3) = rev[*(src + length)];
-	}
-	for (n = length; n > 0; n -= 4, src += 4) {
-	    *dest++ = rev[*(src + 3)];
-	    *dest++ = rev[*(src + 2)];
-	    *dest++ = rev[*(src + 1)];
-	    *dest++ = rev[*src];
-	}
-    }
-}
-
-static void
-SwapBitsAndWords (src, dest, srclen, srcinc, destinc, height, half_order)
-    register unsigned char *src, *dest;
-    long srclen, srcinc, destinc;
-    unsigned int height;
-    int half_order;
-{
-    long length = ROUNDUP(srclen, 4);
-    register long h, n;
-    register const unsigned char *rev = _reverse_byte;
-
-    srcinc -= length;
-    destinc -= length;
-    for (h = height; --h >= 0; src += srcinc, dest += destinc) {
-	if ((h == 0) && (srclen != length)) {
-	    length -= 4;
-	    if (half_order == MSBFirst)
-		*(dest + length + 1) = rev[*(src + length + 3)];
-	    if (((half_order == LSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == MSBFirst) && (srclen & 2)))
-		*(dest + length) = rev[*(src + length + 2)];
-	    if (((half_order == MSBFirst) && ((srclen - length) == 3)) ||
-		((half_order == LSBFirst) && (srclen & 2)))
-		*(dest + length + 3) = rev[*(src + length + 1)];
-	    if (half_order == LSBFirst)
-		*(dest + length + 2) = rev[*(src + length)];
-	}
-	for (n = length; n > 0; n -= 4, src += 2) {
-	    *dest++ = rev[*(src + 2)];
-	    *dest++ = rev[*(src + 3)];
-	    *dest++ = rev[*src++];
-	    *dest++ = rev[*src++];
-	}
-    }
-}
-
-/*
-
-The following table gives the bit ordering within bytes (when accessed
-sequentially) for a scanline containing 32 bits, with bits numbered 0 to
-31, where bit 0 should be leftmost on the display.  For a given byte
-labelled A-B, A is for the most significant bit of the byte, and B is
-for the least significant bit.
-
-legend:
-	1   scanline-unit = 8
-	2   scanline-unit = 16
-	4   scanline-unit = 32
-	M   byte-order = MostSignificant
-	L   byte-order = LeastSignificant
-	m   bit-order = MostSignificant
-	l   bit-order = LeastSignificant
-
-
-format	ordering
-
-1Mm	00-07 08-15 16-23 24-31
-2Mm	00-07 08-15 16-23 24-31
-4Mm	00-07 08-15 16-23 24-31
-1Ml	07-00 15-08 23-16 31-24
-2Ml	15-08 07-00 31-24 23-16
-4Ml	31-24 23-16 15-08 07-00
-1Lm	00-07 08-15 16-23 24-31
-2Lm	08-15 00-07 24-31 16-23
-4Lm	24-31 16-23 08-15 00-07
-1Ll	07-00 15-08 23-16 31-24
-2Ll	07-00 15-08 23-16 31-24
-4Ll	07-00 15-08 23-16 31-24
-
-
-The following table gives the required conversion between any two
-formats.  It is based strictly on the table above.  If you believe one,
-you should believe the other.
-
-legend:
-	n   no changes
-	s   reverse 8-bit units within 16-bit units
-	l   reverse 8-bit units within 32-bit units
-	w   reverse 16-bit units within 32-bit units
-	R   reverse bits within 8-bit units
-	S   s+R
-	L   l+R
-	W   w+R
-
-*/
-
-static void (* const (SwapFunction[12][12]))() = {
-#define n NoSwap,
-#define s SwapTwoBytes,
-#define l SwapFourBytes,
-#define w SwapWords,
-#define R SwapBits,
-#define S SwapBitsAndTwoBytes,
-#define L SwapBitsAndFourBytes,
-#define W SwapBitsAndWords,
-
-/*         1Mm 2Mm 4Mm 1Ml 2Ml 4Ml 1Lm 2Lm 4Lm 1Ll 2Ll 4Ll   */
-/* 1Mm */ { n   n   n   R   S   L   n   s   l   R   R   R },
-/* 2Mm */ { n   n   n   R   S   L   n   s   l   R   R   R },
-/* 4Mm */ { n   n   n   R   S   L   n   s   l   R   R   R },
-/* 1Ml */ { R   R   R   n   s   l   R   S   L   n   n   n },
-/* 2Ml */ { S   S   S   s   n   w   S   R   W   s   s   s },
-/* 4Ml */ { L   L   L   l   w   n   L   W   R   l   l   l },
-/* 1Lm */ { n   n   n   R   S   L   n   s   l   R   R   R },
-/* 2Lm */ { s   s   s   S   R   W   s   n   w   S   S   S },
-/* 4Lm */ { l   l   l   L   W   R   l   w   n   L   L   L },
-/* 1Ll */ { R   R   R   n   s   l   R   S   L   n   n   n },
-/* 2Ll */ { R   R   R   n   s   l   R   S   L   n   n   n },
-/* 4Ll */ { R   R   R   n   s   l   R   S   L   n   n   n }
-
-#undef n
-#undef s
-#undef l
-#undef w
-#undef R
-#undef S
-#undef L
-#undef W
-
-};
-
-/* Of course, the table above is a lie.  We also need to factor in the
- * order of the source data to cope with swapping half of a unit at the
- * end of a scanline, since we are trying to avoid de-ref'ing off the
- * end of the source.
- *
- * Defines whether the first half of a unit has the first half of the data
- */
-static int const HalfOrder[12] = {
-	LSBFirst, /* 1Mm */
-	LSBFirst, /* 2Mm */
-	LSBFirst, /* 4Mm */
-	LSBFirst, /* 1Ml */
-	MSBFirst, /* 2Ml */
-	MSBFirst, /* 4Ml */
-	LSBFirst, /* 1Lm */
-	MSBFirst, /* 2Lm */
-	MSBFirst, /* 4Lm */
-	LSBFirst, /* 1Ll */
-	LSBFirst, /* 2Ll */
-	LSBFirst  /* 4Ll */
-	};
-
-/* Finally, for SwapWords cases, the half order depends not just on the source
- * but also on the destination scanline unit.  Use of this table changes some
- * MSBFirsts to LSBFirsts that are "do not care" (because the function will be
- * NoSwap or SwapBits) in addition to changing the desired ones.
- */
-
-static int const HalfOrderWord[12] = {
-	MSBFirst, /* 1Mm */
-	MSBFirst, /* 2Mm */
-	MSBFirst, /* 4Mm */
-	MSBFirst, /* 1Ml */
-	MSBFirst, /* 2Ml */
-	LSBFirst, /* 4Ml */
-	MSBFirst, /* 1Lm */
-	MSBFirst, /* 2Lm */
-	LSBFirst, /* 4Lm */
-	MSBFirst, /* 1Ll */
-	MSBFirst, /* 2Ll */
-	MSBFirst  /* 4Ll */
-	};
-
-/*
- * This macro creates a value from 0 to 11 suitable for indexing
- * into the table above.
- */
-#define	ComposeIndex(bitmap_unit, bitmap_bit_order, byte_order)			\
-		(((bitmap_unit == 32) ? 2 : ((bitmap_unit == 16) ? 1 : 0))	\
-		     + (((bitmap_bit_order == MSBFirst) ? 0 : 3)		\
-		     + ((byte_order == MSBFirst) ? 0 : 6)))
-
-struct SendImageParams
-{
-    Display *dpy;
-    int avail_request_size;
-    int dest_bits_per_pixel;
-    int dest_scanline_pad;
-    int req_xoffset;
-    int req_yoffset;
-    DRAWABLE drawable;
-    GCONTEXT gc;
-    int x;
-    int y;
-    unsigned int width;
-    unsigned int height;
-    int format;
-    int leftPad;
-    XImage *image;
-    long total_xoffset;
-    void (*swapfunc)();
-    int half_order;
-};
-
-static void SendImage(dpy, is_xyimage, p, depth)
-    register Display *const dpy;
-    const int is_xyimage;
-    struct SendImageParams *const p;
-    const int depth;
-{
-    long bytes_per_src, bytes_per_dest, length;
-    long bytes_per_line = p->image->bytes_per_line;
-    long bytes_per_src_plane = bytes_per_line * p->image->height;
-    long bytes_per_dest_plane;
-    unsigned char *src, *dest;
-    unsigned char *buf = 0, *extra = 0;
-    register int j;
-
-    p->total_xoffset = (unsigned)(p->total_xoffset - p->leftPad) >> 3;
-    bytes_per_dest = (unsigned long)ROUNDUP((long)p->width * p->dest_bits_per_pixel + p->leftPad, p->dest_scanline_pad) >> 3;
-    bytes_per_dest_plane = bytes_per_dest * p->height;
-    length = bytes_per_dest_plane * depth;
-
-    src = (unsigned char *)p->image->data + (p->req_yoffset * bytes_per_line) + p->total_xoffset;
-    bytes_per_src = (p->width * p->image->bits_per_pixel + p->leftPad + 7) >> 3;
-
-    if (!is_xyimage && (p->image->bits_per_pixel == 4) && ((unsigned int) p->req_xoffset & 0x01)) {
-	if (! (extra = (unsigned char *)
-	       Xmalloc((unsigned) (p->height * bytes_per_line)))) {
-	    goto done;
-	}
-
-	ShiftNibblesLeft(src, extra, bytes_per_src,
-			 bytes_per_line,
-			 bytes_per_line, p->height,
-			 p->image->byte_order);
-	src = extra;
-    }
-
-    /* when total_xoffset > 0, we have to worry about stepping off the
-     * end of p->image->data.
-     */
-    if ((p->swapfunc == NoSwap) &&
-	(bytes_per_line == bytes_per_dest) &&
-	(((p->total_xoffset == 0) &&
-	  ((depth == 1) || (p->image->height == p->height))) ||
-	 ((depth == 1) &&
-	  ((p->req_yoffset + p->height) < (unsigned)p->image->height)))) {
-	XCBPutImage(XCBConnectionOfDisplay(dpy), p->format, p->drawable,
-	    p->gc, p->width, p->height, p->x, p->y, p->leftPad, depth,
-	    length, src);
-	goto done;
-    }
-
-    length = ROUNDUP(length, 4);
-    if ((buf = malloc(length)) == NULL) {
-	goto done;	
-    }
-
-    p->total_xoffset &= (p->image->bitmap_unit - 1) >> 3;
-
-    if (is_xyimage && (p->total_xoffset > 0) &&
-	(p->image->byte_order != p->image->bitmap_bit_order)) {
-	char *temp;
-	long bytes_per_temp_plane, temp_length;
-
-	bytes_per_line = bytes_per_src + p->total_xoffset;
-	src -= p->total_xoffset;
-	bytes_per_temp_plane = bytes_per_line * p->height;
-	temp_length = ROUNDUP(bytes_per_temp_plane * depth, 4);
-	if ((extra = temp = Xmalloc((unsigned) temp_length)) == NULL) {
-	    goto done;
-	}
-
-	p->swapfunc = SwapFunction[ComposeIndex(p->image->bitmap_unit,
-					     p->image->bitmap_bit_order,
-					     p->image->byte_order)]
-			       [ComposeIndex(p->image->bitmap_unit,
-					     dpy->byte_order,
-					     dpy->byte_order)];
-	for (dest = temp, j = depth;
-	     --j >= 0;
-	     src += bytes_per_src_plane, dest += bytes_per_temp_plane)
-	    (*p->swapfunc)((unsigned char *)src, (unsigned char *)dest,
-			bytes_per_line, (long)p->image->bytes_per_line,
-			bytes_per_line, p->height, p->half_order);
-	p->swapfunc = SwapFunction[ComposeIndex(p->image->bitmap_unit,
-					     dpy->byte_order,
-					     dpy->byte_order)]
-			       [ComposeIndex(dpy->bitmap_unit,
-					     dpy->bitmap_bit_order,
-					     dpy->byte_order)];
-	p->half_order = HalfOrder[ComposeIndex(p->image->bitmap_unit,
-					    dpy->byte_order,
-					    dpy->byte_order)];
-	src = temp + p->total_xoffset;
-	bytes_per_src_plane = bytes_per_temp_plane;
-    }
-
-    for (dest = buf, j = depth;
-	 --j >= 0;
-	 src += bytes_per_src_plane, dest += bytes_per_dest_plane)
-	(*p->swapfunc)((unsigned char *)src, (unsigned char *)dest,
-		    bytes_per_src, bytes_per_line,
-		    bytes_per_dest, p->height, p->half_order);
-
-    XCBPutImage(XCBConnectionOfDisplay(dpy), p->format, p->drawable,
-	p->gc, p->width, p->height, p->x, p->y, p->leftPad, depth,
-	length, buf);
-
-done:
-    if (buf)
-	Xfree(buf);
-    if (extra)
-	Xfree(extra);
-}
-
-static void SendXYImage(struct SendImageParams *const p)
-{
-    /* The protocol requires left-pad of zero on all ZPixmap, even
-     * though the 1-bit case is identical to bitmap format.  This is a
-     * bug in the protocol, caused because 1-bit ZPixmap was added late
-     * in the game.  Hairy shifting code compensation isn't worth it,
-     * just use XYPixmap format instead.
-     */
-    if ((p->leftPad != 0) && (p->format == ZPixmap))
-	p->format = XYPixmap;
-
-    SendImage(p->dpy, 1, p, p->image->depth);
-}
-
-static void SendZImage(struct SendImageParams *const p)
-{
-    SendImage(p->dpy, 0, p, 1);
-}
-
-static void
-PutSubImage(p, req_xoffset, req_yoffset, x, y, req_width, req_height)
-    struct SendImageParams *const p;
-    int req_xoffset, req_yoffset;
-    int x, y;
-    unsigned int req_width, req_height;
-{
-    int BytesPerRow;
-
-    if ((req_width == 0) || (req_height == 0))
-	return;
-    
-    if ((p->image->bits_per_pixel == 1) || (p->image->format != ZPixmap)) {
-	p->total_xoffset = p->image->xoffset + req_xoffset;
-	p->leftPad = p->total_xoffset & (p->dpy->bitmap_unit - 1);
-	BytesPerRow = (ROUNDUP((long)req_width + p->leftPad,
-			       p->dpy->bitmap_pad) >> 3) * p->image->depth;
-    } else {
-	p->total_xoffset = req_xoffset * p->image->bits_per_pixel;
-	p->leftPad = 0;
-	BytesPerRow = ROUNDUP((long)req_width * p->dest_bits_per_pixel,
-			      p->dest_scanline_pad) >> 3;
-    }
-
-    if ((BytesPerRow * req_height) <= p->avail_request_size) {
-	p->req_xoffset = req_xoffset;
-	p->req_yoffset = req_yoffset;
-	p->x = x;
-	p->y = y;
-	p->width = req_width;
-	p->height = req_height;
-	p->format = p->image->format;
-	if ((p->image->bits_per_pixel == 1) || (p->image->format != ZPixmap))
-		SendXYImage(p);
-	else
-		SendZImage(p);
-    } else if (req_height > 1) {
-	int SubImageHeight = p->avail_request_size / BytesPerRow;
-
-	if (SubImageHeight == 0)
-	    SubImageHeight = 1;
-
-	PutSubImage(p, req_xoffset, req_yoffset, x, y, 
-		    req_width, (unsigned int) SubImageHeight);
-
-	PutSubImage(p, req_xoffset, 
-		    req_yoffset + SubImageHeight, x, y + SubImageHeight,
-		    req_width, req_height - SubImageHeight);
-    } else {
-	int SubImageWidth = (((p->avail_request_size << 3) / p->dest_scanline_pad)
-				* p->dest_scanline_pad) - p->leftPad;
-
-	PutSubImage(p, req_xoffset, req_yoffset, x, y, 
-		    (unsigned int) SubImageWidth, 1);
-
-	PutSubImage(p, req_xoffset + SubImageWidth, 
-		    req_yoffset, x + SubImageWidth, y,
-		    req_width - SubImageWidth, 1);
-    }
-}
-
-#ifdef USEPUTPIXEL
-extern void _XInitImageFuncPtrs();
-#endif
-
-#endif /* USEPUTIMAGE */
-
 int XPutImage(dpy, d, gc, image, req_xoffset, req_yoffset, x, y, req_width,
 							      req_height)
     register Display *dpy;
@@ -775,123 +17,56 @@ int XPutImage(dpy, d, gc, image, req_xoffset, req_yoffset, x, y, req_width,
     unsigned int req_width, req_height;
     int req_xoffset, req_yoffset;
 {
-#ifdef USEPUTIMAGE
-    long width = req_width;
-    long height = req_height;
-    char *tmp = 0;
-    struct SendImageParams p;
-
-    if (req_xoffset < 0) {
-	width += req_xoffset;
-	req_xoffset = 0;
-    }
-    if (req_yoffset < 0) {
-	height += req_yoffset;
-	req_yoffset = 0;
-    }
-    if ((req_xoffset + width) > image->width)
-	width = image->width - req_xoffset;
-    if ((req_yoffset + height) > image->height)
-	height = image->height - req_yoffset;
-    if ((width <= 0) || (height <= 0))
-	return 0;
-
-    p.dpy = dpy;
-    p.drawable = XCLDRAWABLE(d);
-    p.gc = XCLGCONTEXT(gc->gid);
-    p.image = image;
-    p.avail_request_size = ((65536 < dpy->max_request_size) ?
-		    (65536 << 2) : (dpy->max_request_size << 2))
-	    - SIZEOF(xPutImageReq);
-
-
-    if ((image->bits_per_pixel == 1) || (image->format != ZPixmap)) {
-	p.dest_bits_per_pixel = 1;
-	p.dest_scanline_pad = dpy->bitmap_pad;
-
-	p.swapfunc = SwapFunction[ComposeIndex(image->bitmap_unit,
-						image->bitmap_bit_order,
-						image->byte_order)]
-				  [ComposeIndex(dpy->bitmap_unit,
-						dpy->bitmap_bit_order,
-						dpy->byte_order)];
-	p.half_order = HalfOrder[ComposeIndex(image->bitmap_unit,
-						image->bitmap_bit_order,
-						image->byte_order)];
-	if (p.half_order == MSBFirst)
-	    p.half_order = HalfOrderWord[ComposeIndex(dpy->bitmap_unit,
-						dpy->bitmap_bit_order,
-						dpy->byte_order)];
-    } else {
-	register int n;
-	register ScreenFormat *format;
-
-	if (image->byte_order == dpy->byte_order || image->bits_per_pixel == 8)
-	    p.swapfunc = NoSwap;
-	else
-	    switch (p.image->bits_per_pixel)
-	    {
-	    case 32:
-		p.swapfunc = SwapFourBytes;
-		break;
-	    case 24:
-		p.swapfunc = SwapThreeBytes;
-		break;
-	    case 16:
-		p.swapfunc = SwapTwoBytes;
-		break;
-	    default:
-		p.swapfunc = SwapNibbles;
-	    }
-
-	p.dest_bits_per_pixel = image->bits_per_pixel;
-	p.dest_scanline_pad = image->bitmap_pad;
-	for (n = dpy->nformats, format = dpy->pixmap_format; --n >= 0; format++)
-	    if (format->depth == image->depth) {
-		p.dest_bits_per_pixel = format->bits_per_pixel;
-		p.dest_scanline_pad = format->scanline_pad;
-	    }
-#ifdef USEPUTPIXEL
-	if (p.dest_bits_per_pixel != image->bits_per_pixel) {
-	    XImage img;
-	    register long i, j;
-	    /* XXX slow, but works */
-	    img.width = width;
-	    img.height = height;
-	    img.xoffset = 0;
-	    img.format = ZPixmap;
-	    img.byte_order = dpy->byte_order;
-	    p.swapfunc = NoSwap; /* inv: img.byte_order == dpy->byte_order */
-	    img.bitmap_unit = dpy->bitmap_unit;
-	    img.bitmap_bit_order = dpy->bitmap_bit_order;
-	    img.bitmap_pad = p.dest_scanline_pad;
-	    img.depth = image->depth;
-	    img.bits_per_pixel = p.dest_bits_per_pixel;
-	    img.bytes_per_line = ROUNDUP((p.dest_bits_per_pixel * width),
-					 p.dest_scanline_pad) >> 3;
-	    tmp = Xmalloc((unsigned) (img.bytes_per_line * height));
-	    if (tmp == NULL)
-		return 0;
-	    img.data = tmp;
-	    _XInitImageFuncPtrs(&img);
-	    for (j = height; --j >= 0; )
-		for (i = width; --i >= 0; )
-		    XPutPixel(&img, i, j, XGetPixel(image, req_xoffset + i,
-						    req_yoffset + j));
-	    p.image = &img;
-	    req_xoffset = req_yoffset = 0;
-	}
-#endif /* USEPUTPIXEL */
+ 
+    unsigned int alignment, image_size, bytes_per_line, unaligned_bits;
+    unsigned int unaligned_bytes, bytes_per_image_line;
+    unsigned int image_alignment;
+    char  *image_data, *line_ptr, *image_line_ptr;
+    int index;
+    DRAWABLE drw;
+    XCBConnection *c = XCBConnectionOfDisplay(dpy);
+    drw.pixmap.xid = d;
+    
+    /* find out how large the image is going to be */
+    alignment = image->bitmap_unit >> 3;
+    image_alignment = image->bitmap_pad >> 3;
+    unaligned_bits = image->bits_per_pixel * req_width;
+    /* give it the extra pad byte if it is needed */
+    unaligned_bytes = (unaligned_bits + 7) >> 3;
+    bytes_per_line = ( (unaligned_bytes + (alignment - 1) ) / alignment ) * alignment;
+    image_size = bytes_per_line * req_height;
+
+    bytes_per_image_line = ( (unaligned_bytes + (image_alignment - 1) ) / image_alignment ) * image_alignment;
+
+    /* bytes_per_image_line is the number of bytes per scanline in the 
+     * source image */
+    
+//    fprintf(stdout, "depth:   %2d, bytes_per_line:   %d\n"
+//            "width:        %7d, height:     %7d\n"
+//            "req_width:    %7d, req_height: %7d\n\n"
+//            "bitmap_unit:   %6d, bitmap_pad: %6d\n"
+//            "bits_per_pixel: %5d, unaligned_bytes: %d\n"
+//            "image_size:     %5d\n-------------------------------------------------------------\n",
+//            image->depth, image->bytes_per_line, image->width, image->height, 
+//            req_width, req_height, image->bitmap_unit, image->bitmap_pad,
+//            image->bits_per_pixel, unaligned_bytes, image_size);
+    
+    line_ptr = image_data = malloc( image_size );
+    image_line_ptr = image->data;
+    for(index = 0; index < req_height; index++)
+    {
+        memcpy(line_ptr, image_line_ptr, bytes_per_image_line);
+        line_ptr += bytes_per_line;
+        image_line_ptr += (image->bytes_per_line);
     }
-
+    
+//    fprintf(stdout, "bitmap_unit:          %d\n", image->bitmap_unit);
+//    fprintf(stdout, "bitmap_pad:          %d\n", image->bitmap_pad);
     LockDisplay(dpy);
-    FlushGC(dpy, gc);
-
-    PutSubImage(&p, req_xoffset, req_yoffset, x, y,
-		(unsigned int) width, (unsigned int) height);
-
+    
+    XCBPutImage(c, image->format, drw, XCLGCONTEXT(gc->gid), req_width, req_height, req_xoffset, req_yoffset, 0, image->depth, image_size, image_data );
+    XCBSync(c, 0);
     UnlockDisplay(dpy);
-    Xfree(tmp);
-#endif /* USEPUTIMAGE */
+    free( image_data );
     return 0;
 }