--- sourceforge.net/trunk/rdesktop/xwin.c	2003/10/28 03:30:51	517
+++ sourceforge.net/trunk/rdesktop/xwin.c	2003/10/29 08:37:20	528
@@ -57,6 +57,8 @@
 /* endianness */
 static BOOL g_host_be;
 static BOOL g_xserver_be;
+static int g_red_shift_r, g_blue_shift_r, g_green_shift_r;
+static int g_red_shift_l, g_blue_shift_l, g_green_shift_l;
 
 /* software backing store */
 static BOOL g_ownbackstore;
@@ -112,7 +114,7 @@
 static Colormap g_xcolmap;
 static uint32 *g_colmap = NULL;
 
-#define TRANSLATE(col)		( g_server_bpp != 8 ? translate_colour(col) : g_owncolmap ? col : translate_colour(g_colmap[col]) )
+#define TRANSLATE(col)		( g_server_bpp != 8 ? translate_colour(col) : g_owncolmap ? col : g_colmap[col] )
 #define SET_FOREGROUND(col)	XSetForeground(g_display, g_gc, TRANSLATE(col));
 #define SET_BACKGROUND(col)	XSetBackground(g_display, g_gc, TRANSLATE(col));
 
@@ -197,38 +199,11 @@
 }
 
 static uint32
-make_colour16(PixelColour pc)
+make_colour(PixelColour pc)
 {
-	pc.red = (pc.red * 0x1f) / 0xff;
-	pc.green = (pc.green * 0x3f) / 0xff;
-	pc.blue = (pc.blue * 0x1f) / 0xff;
-	return (pc.red << 11) | (pc.green << 5) | pc.blue;
-}
-
-static uint32
-make_colour24(PixelColour pc)
-{
-	if (g_xserver_be)
-	{
-		return pc.red | (pc.green << 8) | (pc.blue << 16);
-	}
-	else
-	{
-		return (pc.red << 16) | (pc.green << 8) | pc.blue;
-	}
-}
-
-static uint32
-make_colour32(PixelColour pc)
-{
-	if (g_xserver_be)
-	{
-		return pc.red | (pc.green << 8) | (pc.blue << 16);
-	}
-	else
-	{
-		return (pc.red << 16) | (pc.green << 8) | pc.blue;
-	}
+	return (((pc.red >> g_red_shift_r) << g_red_shift_l)
+		| ((pc.green >> g_green_shift_r) << g_green_shift_l)
+		| ((pc.blue >> g_blue_shift_r) << g_blue_shift_l));
 }
 
 #define BSWAP16(x) { x = (((x & 0xff) << 8) | (x >> 8)); }
@@ -239,50 +214,20 @@
 static uint32
 translate_colour(uint32 colour)
 {
+	PixelColour pc;
 	switch (g_server_bpp)
 	{
 		case 15:
-			switch (g_bpp)
-			{
-				case 16:
-					colour = make_colour16(split_colour15(colour));
-					break;
-				case 24:
-					colour = make_colour24(split_colour15(colour));
-					break;
-				case 32:
-					colour = make_colour32(split_colour15(colour));
-					break;
-			}
+			pc = split_colour15(colour);
 			break;
 		case 16:
-			switch (g_bpp)
-			{
-				case 16:
-					break;
-				case 24:
-					colour = make_colour24(split_colour16(colour));
-					break;
-				case 32:
-					colour = make_colour32(split_colour16(colour));
-					break;
-			}
+			pc = split_colour16(colour);
 			break;
 		case 24:
-			switch (g_bpp)
-			{
-				case 16:
-					colour = make_colour16(split_colour24(colour));
-					break;
-				case 24:
-					break;
-				case 32:
-					colour = make_colour32(split_colour24(colour));
-					break;
-			}
+			pc = split_colour24(colour);
 			break;
 	}
-	return colour;
+	return make_colour(pc);
 }
 
 static void
@@ -293,10 +238,25 @@
 }
 
 static void
-translate8to16(uint8 * data, uint16 * out, uint16 * end)
+translate8to16(uint8 * data, uint8 * out, uint8 * end)
 {
+	uint16 value;
+
 	while (out < end)
-		*(out++) = (uint16) g_colmap[*(data++)];
+	{
+		value = (uint16) g_colmap[*(data++)];
+		
+		if (g_xserver_be)
+		{
+			*(out++) = value >> 8;
+			*(out++) = value;
+		}
+		else
+		{
+			*(out++) = value;
+			*(out++) = value >> 8;
+		}
+	}
 }
 
 /* little endian - conversion happens when colourmap is built */
@@ -308,17 +268,46 @@
 	while (out < end)
 	{
 		value = g_colmap[*(data++)];
-		*(out++) = value;
-		*(out++) = value >> 8;
-		*(out++) = value >> 16;
+		
+		if (g_xserver_be)
+		{
+			*(out++) = value >> 16;
+			*(out++) = value >> 8;
+			*(out++) = value;
+		}
+		else
+		{
+			*(out++) = value;
+			*(out++) = value >> 8;
+			*(out++) = value >> 16;
+		}
 	}
 }
 
 static void
-translate8to32(uint8 * data, uint32 * out, uint32 * end)
+translate8to32(uint8 * data, uint8 * out, uint8 * end)
 {
+	uint32 value;
+
 	while (out < end)
-		*(out++) = g_colmap[*(data++)];
+	{
+		value = g_colmap[*(data++)];
+
+		if (g_xserver_be)
+		{
+			*(out++) = value >> 24;
+			*(out++) = value >> 16;
+			*(out++) = value >> 8;
+			*(out++) = value;
+		}
+		else
+		{
+			*(out++) = value;
+			*(out++) = value >> 8;
+			*(out++) = value >> 16;
+			*(out++) = value >> 24;
+		}
+	}
 }
 
 /* todo the remaining translate function might need some big endian check ?? */
@@ -335,9 +324,10 @@
 
 		if (g_host_be)
 		{
-		BSWAP16(pixel)}
+			BSWAP16(pixel);
+		}
 
-		value = make_colour16(split_colour15(pixel));
+		value = make_colour(split_colour15(pixel));
 
 		if (g_xserver_be)
 		{
@@ -364,9 +354,10 @@
 
 		if (g_host_be)
 		{
-		BSWAP16(pixel)}
+			BSWAP16(pixel);
+		}
 
-		value = make_colour24(split_colour15(pixel));
+		value = make_colour(split_colour15(pixel));
 		if (g_xserver_be)
 		{
 			*(out++) = value >> 16;
@@ -397,7 +388,7 @@
 			BSWAP16(pixel);
 		}
 
-		value = make_colour32(split_colour15(pixel));
+		value = make_colour(split_colour15(pixel));
 
 		if (g_xserver_be)
 		{
@@ -417,34 +408,35 @@
 }
 
 static void
-translate16to16(uint16 * data, uint16 * out, uint16 * end)
+translate16to16(uint16 * data, uint8 * out, uint8 * end)
 {
+	uint16 pixel;
 	uint16 value;
 
-	if (g_xserver_be)
+	while (out < end)
 	{
-		while (out < end)
+		pixel = *(data++);
+
+		if (g_host_be)
 		{
-			value = *data;
-			BSWAP16(value);
-			*out = value;
-			data++;
-			out++;
+			BSWAP16(pixel);
 		}
 
-	}
-	else
-	{
-		while (out < end)
+		value = make_colour(split_colour16(pixel));
+
+		if (g_xserver_be)
 		{
-			*out = *data;
-			out++;
-			data++;
+			*(out++) = value >> 8;
+			*(out++) = value;
+		}
+		else
+		{
+			*(out++) = value;
+			*(out++) = value >> 8;
 		}
 	}
 }
 
-
 static void
 translate16to24(uint16 * data, uint8 * out, uint8 * end)
 {
@@ -457,9 +449,10 @@
 
 		if (g_host_be)
 		{
-		BSWAP16(pixel)}
+			BSWAP16(pixel);
+		}
 
-		value = make_colour24(split_colour16(pixel));
+		value = make_colour(split_colour16(pixel));
 
 		if (g_xserver_be)
 		{
@@ -490,7 +483,7 @@
 		{
 		BSWAP16(pixel)}
 
-		value = make_colour32(split_colour16(pixel));
+		value = make_colour(split_colour16(pixel));
 
 		if (g_xserver_be)
 		{
@@ -520,7 +513,7 @@
 		pixel |= *(data++) << 8;
 		pixel |= *(data++);
 
-		value = (uint16) make_colour16(split_colour24(pixel));
+		value = (uint16) make_colour(split_colour24(pixel));
 
 		if (g_xserver_be)
 		{
@@ -599,8 +592,7 @@
 					translate16to24((uint16 *) data, out, end);
 					break;
 				case 16:
-					translate16to16((uint16 *) data, (uint16 *) out,
-							(uint16 *) end);
+					translate16to16((uint16 *) data, out, end);
 					break;
 			}
 			break;
@@ -625,13 +617,13 @@
 					translate8to8(data, out, end);
 					break;
 				case 16:
-					translate8to16(data, (uint16 *) out, (uint16 *) end);
+					translate8to16(data, out, end);
 					break;
 				case 24:
 					translate8to24(data, out, end);
 					break;
 				case 32:
-					translate8to32(data, (uint32 *) out, (uint32 *) end);
+					translate8to32(data, out, end);
 					break;
 			}
 			break;
@@ -664,12 +656,21 @@
 	return (state & keysymMask) ? True : False;
 }
 
+static void
+calculate_shifts(uint32 mask, int *shift_r, int *shift_l)
+{
+	*shift_l = ffs(mask) - 1;
+	mask >>= *shift_l;
+	*shift_r = 8 - ffs(mask & ~(mask >> 1));
+}
+
 BOOL
 ui_init(void)
 {
+	XVisualInfo vi;
 	XPixmapFormatValues *pfm;
 	uint16 test;
-	int i;
+	int i, screen_num;
 
 	g_display = XOpenDisplay(NULL);
 	if (g_display == NULL)
@@ -678,11 +679,32 @@
 		return False;
 	}
 
+	screen_num = DefaultScreen(g_display);
 	g_x_socket = ConnectionNumber(g_display);
-	g_screen = DefaultScreenOfDisplay(g_display);
-	g_visual = DefaultVisualOfScreen(g_screen);
+	g_screen = ScreenOfDisplay(g_display, screen_num);
 	g_depth = DefaultDepthOfScreen(g_screen);
 
+	if (g_server_bpp == 8)
+	{
+		/* we use a colourmap, so any visual should do */
+		g_visual = DefaultVisualOfScreen(g_screen);
+	}
+	else
+	{
+		/* need a truecolour visual */
+		if (!XMatchVisualInfo(g_display, screen_num, g_depth, TrueColor, &vi))
+		{
+			error("The display does not support true colour - high colour support unavailable.\n");
+			return False;
+		}
+
+		g_visual = vi.visual;
+		g_owncolmap = False;
+		calculate_shifts(vi.red_mask,   &g_red_shift_r,   &g_red_shift_l);
+		calculate_shifts(vi.blue_mask,  &g_blue_shift_r,  &g_blue_shift_l);
+		calculate_shifts(vi.green_mask, &g_green_shift_r, &g_green_shift_l);
+	}
+
 	pfm = XListPixmapFormats(g_display, &i);
 	if (pfm != NULL)
 	{
@@ -705,10 +727,6 @@
 		return False;
 	}
 
-	/* private colour map code only works for 8 bpp */
-	if (g_owncolmap && (g_bpp > 8))
-		g_owncolmap = False;
-
 	if (!g_owncolmap)
 	{
 		g_xcolmap = DefaultColormapOfScreen(g_screen);
@@ -780,8 +798,7 @@
 
 	xclip_init();
 
-	/* todo take this out when high colour is done */
-	printf("server bpp %d client bpp %d depth %d\n", g_server_bpp, g_bpp, g_depth);
+	DEBUG_RDP5(("server bpp %d client bpp %d depth %d\n", g_server_bpp, g_bpp, g_depth));
 
 	return True;
 }
@@ -1255,11 +1272,24 @@
 	XImage *image;
 	Pixmap bitmap;
 	uint8 *tdata;
+	int bitmap_pad;
+
+	if (g_server_bpp == 8)
+	{
+		bitmap_pad = 8;
+	}
+	else
+	{
+		bitmap_pad = g_bpp;
+
+		if (g_bpp == 24)
+			bitmap_pad = 32;
+	}
 
 	tdata = (g_owncolmap ? data : translate_image(width, height, data));
 	bitmap = XCreatePixmap(g_display, g_wnd, width, height, g_depth);
 	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-			     (char *) tdata, width, height, g_server_bpp == 8 ? 8 : g_bpp, 0);
+			     (char *) tdata, width, height, bitmap_pad, 0);
 
 	XPutImage(g_display, bitmap, g_gc, image, 0, 0, 0, 0, width, height);
 
@@ -1274,9 +1304,23 @@
 {
 	XImage *image;
 	uint8 *tdata;
+	int bitmap_pad;
+
+	if (g_server_bpp == 8)
+	{
+		bitmap_pad = 8;
+	}
+	else
+	{
+		bitmap_pad = g_bpp;
+
+		if (g_bpp == 24)
+			bitmap_pad = 32;
+	}
+
 	tdata = (g_owncolmap ? data : translate_image(width, height, data));
 	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-			     (char *) tdata, width, height, g_server_bpp == 8 ? 8 : g_bpp, 0);
+			     (char *) tdata, width, height, bitmap_pad, 0);
 
 	if (g_ownbackstore)
 	{
@@ -1502,9 +1546,7 @@
 
 			}
 
-
-			/* byte swap here to make translate_image faster */
-			map[i] = translate_colour(colour);
+			map[i] = colour;
 		}
 		return map;
 	}