--- sourceforge.net/trunk/rdesktop/xwin.c	2004/05/11 07:34:03	695
+++ sourceforge.net/trunk/rdesktop/xwin.c	2004/06/27 17:51:54	725
@@ -47,6 +47,8 @@
 BOOL g_enable_compose = False;
 BOOL g_Unobscured;		/* used for screenblt */
 static GC g_gc = NULL;
+static GC g_create_bitmap_gc = NULL;
+static GC g_create_glyph_gc = NULL;
 static Visual *g_visual;
 static int g_depth;
 static int g_bpp;
@@ -172,9 +174,9 @@
 split_colour15(uint32 colour)
 {
 	PixelColour rv;
-	rv.red = (colour & 0x7c00) >> 7;
-	rv.green = (colour & 0x03e0) >> 2;
-	rv.blue = (colour & 0x001f) << 3;
+	rv.red = ((colour >> 7) & 0xf8) | ((colour >> 12) & 0x7);
+	rv.green = ((colour >> 2) & 0xf8) | ((colour >> 8) & 0x7);
+	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
 	return rv;
 }
 
@@ -182,9 +184,9 @@
 split_colour16(uint32 colour)
 {
 	PixelColour rv;
-	rv.red = (colour & 0xf800) >> 8;
-	rv.green = (colour & 0x07e0) >> 3;
-	rv.blue = (colour & 0x001f) << 3;
+	rv.red = ((colour >> 8) & 0xf8) | ((colour >> 13) & 0x7);
+	rv.green = ((colour >> 3) & 0xfc) | ((colour >> 9) & 0x3);
+	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
 	return rv;
 }
 
@@ -230,8 +232,25 @@
 	return make_colour(pc);
 }
 
+/* indent is confused by UNROLL8 */
+/* *INDENT-OFF* */
+
+/* repeat and unroll, similar to bitmap.c */
+/* potentialy any of the following translate */
+/* functions can use repeat but just doing */
+/* the most common ones */
+
 #define UNROLL8(stm) { stm stm stm stm stm stm stm stm }
-#define REPEAT(stm) \
+/* 2 byte output repeat */
+#define REPEAT2(stm) \
+{ \
+	while (out <= end - 8 * 2) \
+		UNROLL8(stm) \
+	while (out < end) \
+		{ stm } \
+}
+/* 4 byte output repeat */
+#define REPEAT4(stm) \
 { \
 	while (out <= end - 8 * 4) \
 		UNROLL8(stm) \
@@ -252,8 +271,13 @@
 	uint16 value;
 
 	if (g_arch_match)
-		REPEAT(*((uint16*)out) = g_colmap[*(data++)]; out += 2;
+	{
+		REPEAT2
+		(
+			*((uint16 *) out) = g_colmap[*(data++)];
+			out += 2;
 		)
+	}
 	else if (g_xserver_be)
 	{
 		while (out < end)
@@ -308,8 +332,13 @@
 	uint32 value;
 
 	if (g_arch_match)
-		REPEAT(*((uint32 *)out) = g_colmap[*(data++)]; out += 4;
+	{
+		REPEAT4
+		(
+			*((uint32 *) out) = g_colmap[*(data++)];
+			out += 4;
 		)
+	}
 	else if (g_xserver_be)
 	{
 		while (out < end)
@@ -334,6 +363,8 @@
 	}
 }
 
+/* *INDENT-ON* */
+
 static void
 translate15to16(uint16 * data, uint8 * out, uint8 * end)
 {
@@ -940,6 +971,9 @@
 	if (g_gc == NULL)
 		g_gc = XCreateGC(g_display, g_wnd, 0, NULL);
 
+	if (g_create_bitmap_gc == NULL)
+		g_create_bitmap_gc = XCreateGC(g_display, g_wnd, 0, NULL);
+
 	if ((g_ownbackstore) && (g_backstore == 0))
 	{
 		g_backstore = XCreatePixmap(g_display, g_wnd, g_width, g_height, g_depth);
@@ -1029,6 +1063,7 @@
 ui_resize_window()
 {
 	XSizeHints *sizehints;
+	Pixmap bs;
 
 	sizehints = XAllocSizeHints();
 	if (sizehints)
@@ -1044,6 +1079,17 @@
 	{
 		XResizeWindow(g_display, g_wnd, g_width, g_height);
 	}
+
+	/* create new backstore pixmap */
+	if (g_backstore != 0)
+	{
+		bs = XCreatePixmap(g_display, g_wnd, g_width, g_height, g_depth);
+		XSetForeground(g_display, g_gc, BlackPixelOfScreen(g_screen));
+		XFillRectangle(g_display, bs, g_gc, 0, 0, g_width, g_height);
+		XCopyArea(g_display, g_backstore, bs, g_gc, 0, 0, g_width, g_height, 0, 0);
+		XFreePixmap(g_display, g_backstore);
+		g_backstore = bs;
+	}
 }
 
 void
@@ -1440,7 +1486,7 @@
 	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
 			     (char *) tdata, width, height, bitmap_pad, 0);
 
-	XPutImage(g_display, bitmap, g_gc, image, 0, 0, 0, 0, width, height);
+	XPutImage(g_display, bitmap, g_create_bitmap_gc, image, 0, 0, 0, 0, width, height);
 
 	XFree(image);
 	if (tdata != data)
@@ -1498,12 +1544,12 @@
 	XImage *image;
 	Pixmap bitmap;
 	int scanline;
-	GC gc;
 
 	scanline = (width + 7) / 8;
 
 	bitmap = XCreatePixmap(g_display, g_wnd, width, height, 1);
-	gc = XCreateGC(g_display, bitmap, 0, NULL);
+	if (g_create_glyph_gc == 0)
+		g_create_glyph_gc = XCreateGC(g_display, bitmap, 0, NULL);
 
 	image = XCreateImage(g_display, g_visual, 1, ZPixmap, 0, (char *) data,
 			     width, height, 8, scanline);
@@ -1511,10 +1557,9 @@
 	image->bitmap_bit_order = MSBFirst;
 	XInitImage(image);
 
-	XPutImage(g_display, bitmap, gc, image, 0, 0, 0, 0, width, height);
+	XPutImage(g_display, bitmap, g_create_glyph_gc, image, 0, 0, 0, 0, width, height);
 
 	XFree(image);
-	XFreeGC(g_display, gc);
 	return (HGLYPH) bitmap;
 }
 
@@ -2142,3 +2187,14 @@
 
 	XFree(image);
 }
+
+/* these do nothing here but are used in uiports */
+void
+ui_begin_update(void)
+{
+}
+
+void
+ui_end_update(void)
+{
+}