--- sourceforge.net/trunk/rdesktop/bitmap.c	2000/08/15 10:23:24	10
+++ sourceforge.net/trunk/rdesktop/bitmap.c	2001/09/14 13:51:38	30
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Bitmap decompression routines
-   Copyright (C) Matthew Chapman 1999-2000
+   Copyright (C) Matthew Chapman 1999-2001
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,21 +23,41 @@
 #define CVAL(p)   (*(p++))
 #define SVAL(p)   ((*((p++) + 1) << 8) | CVAL(p))
 
-#define REPEAT(statement) { while ((count > 0) && (x < width)) { statement; count--; x++; } }
-#define MASK_UPDATE() { mixmask <<= 1; if (mixmask == 0) { mask = CVAL(input); mixmask = 1; } }
+#define UNROLL8(exp) { exp exp exp exp exp exp exp exp }
 
-BOOL bitmap_decompress(unsigned char *output, int width, int height,
-		       unsigned char *input, int size)
+#define REPEAT(statement) \
+{ \
+	while((count & ~0x7) && ((x+8) < width)) \
+		UNROLL8( statement; count--; x++; ); \
+	\
+	while((count > 0) && (x < width)) { statement; count--; x++; } \
+}
+
+#define MASK_UPDATE() \
+{ \
+	mixmask <<= 1; \
+	if (mixmask == 0) \
+	{ \
+		mask = fom_mask ? fom_mask : CVAL(input); \
+		mixmask = 1; \
+	} \
+}
+
+BOOL
+bitmap_decompress(unsigned char *output, int width, int height,
+		  unsigned char *input, int size)
 {
 	unsigned char *end = input + size;
 	unsigned char *prevline = NULL, *line = NULL;
 	int opcode, count, offset, isfillormix, x = width;
-	int lastopcode = -1, insertmix = False;
+	int lastopcode = -1, insertmix = False, bicolour = False;
 	uint8 code, colour1 = 0, colour2 = 0;
 	uint8 mixmask, mask = 0, mix = 0xff;
+	int fom_mask = 0;
 
 	while (input < end)
 	{
+		fom_mask = 0;
 		code = CVAL(input);
 		opcode = code >> 4;
 
@@ -54,7 +74,10 @@
 
 			case 0xf:
 				opcode = code & 0xf;
-				count = (opcode < 13) ? SVAL(input) : 1;
+				if (opcode < 9)
+					count = SVAL(input);
+				else
+					count = (opcode < 0xb) ? 8 : 1;
 				offset = 0;
 				break;
 
@@ -84,25 +107,38 @@
 		}
 
 		/* Read preliminary data */
-		mixmask = 0;
 		switch (opcode)
 		{
-			case 0: /* Fill */
-				if ((lastopcode == opcode) && (x != width))
+			case 0:	/* Fill */
+				if ((lastopcode == opcode)
+				    && !((x == width) && (prevline == NULL)))
 					insertmix = True;
 				break;
-			case 8: /* Bicolour */
+			case 8:	/* Bicolour */
 				colour1 = CVAL(input);
-			case 3: /* Colour */
+			case 3:	/* Colour */
 				colour2 = CVAL(input);
 				break;
-			case 6: /* SetMix/Mix */
-			case 7: /* SetMix/FillOrMix */
+			case 6:	/* SetMix/Mix */
+			case 7:	/* SetMix/FillOrMix */
 				mix = CVAL(input);
 				opcode -= 5;
 				break;
+			case 9:	/* FillOrMix_1 */
+				mask = 0x03;
+				opcode = 0x02;
+				fom_mask = 3;
+				break;
+			case 0x0a:	/* FillOrMix_2 */
+				mask = 0x05;
+				opcode = 0x02;
+				fom_mask = 5;
+				break;
+
 		}
+
 		lastopcode = opcode;
+		mixmask = 0;
 
 		/* Output body */
 		while (count > 0)
@@ -121,13 +157,15 @@
 
 			switch (opcode)
 			{
-				case 0: /* Fill */
+				case 0:	/* Fill */
 					if (insertmix)
 					{
 						if (prevline == NULL)
 							line[x] = mix;
 						else
-							line[x] = prevline[x] ^ mix;
+							line[x] =
+								prevline[x] ^
+								mix;
 
 						insertmix = False;
 						count--;
@@ -135,61 +173,79 @@
 					}
 
 					if (prevline == NULL)
-						REPEAT(line[x] = 0)
+					{
+						REPEAT(line[x] = 0);
+					}
 					else
-						REPEAT(line[x] = prevline[x])
+					{
+						REPEAT(line[x] = prevline[x]);
+					}
 					break;
 
-				case 1: /* Mix */
+				case 1:	/* Mix */
 					if (prevline == NULL)
-						REPEAT(line[x] = mix)
+					{
+						REPEAT(line[x] = mix);
+					}
 					else
-						REPEAT(line[x] = prevline[x] ^ mix)
+					{
+						REPEAT(line[x] =
+						       prevline[x] ^ mix);
+					}
 					break;
 
-				case 2: /* Fill or Mix */
+				case 2:	/* Fill or Mix */
 					if (prevline == NULL)
-					    REPEAT( 
-						   MASK_UPDATE();
-
-						   if (mask & mixmask)
-							line[x] = mix;
-						   else
-							line[x] = 0;
-					    )
+					{
+						REPEAT(MASK_UPDATE();
+						       if (mask & mixmask)
+						       line[x] = mix;
+						       else
+						       line[x] = 0;);
+					}
 					else
-					    REPEAT(
-						   MASK_UPDATE();
-
-						   if (mask & mixmask)
-							line[x] = prevline[x] ^ mix;
-						   else
-							line[x] = prevline[x];
-					    )
+					{
+						REPEAT(MASK_UPDATE();
+						       if (mask & mixmask)
+						       line[x] =
+						       prevline[x] ^ mix;
+						       else
+						       line[x] =
+						       prevline[x];);
+					}
 					break;
 
-				case 3: /* Colour */
-					REPEAT(line[x] = colour2)
+				case 3:	/* Colour */
+					REPEAT(line[x] = colour2);
 					break;
 
-				case 4: /* Copy */
-					REPEAT(line[x] = CVAL(input))
+				case 4:	/* Copy */
+					REPEAT(line[x] = CVAL(input));
 					break;
 
-				case 8: /* Bicolour */
-					REPEAT(line[x] = colour1; line[++x] = colour2)
+				case 8:	/* Bicolour */
+					REPEAT(if (bicolour)
+					       {
+					       line[x] = colour2;
+					       bicolour = False;}
+					       else
+					       {
+					       line[x] = colour1;
+					       bicolour = True; count++;}
+					);
 					break;
 
-				case 13: /* White */
-					REPEAT(line[x] = 0xff)
+				case 0xd:	/* White */
+					REPEAT(line[x] = 0xff);
 					break;
 
-				case 14: /* Black */
-					REPEAT(line[x] = 0x00)
+				case 0xe:	/* Black */
+					REPEAT(line[x] = 0x00);
 					break;
 
 				default:
-					NOTIMP("bitmap opcode 0x%x\n", opcode);
+					unimpl("bitmap opcode 0x%x\n",
+					       opcode);
 					return False;
 			}
 		}