--- sourceforge.net/trunk/rdesktop/xwin.c	2004/03/03 10:41:53	619
+++ sourceforge.net/trunk/rdesktop/xwin.c	2004/03/24 18:16:58	643
@@ -43,6 +43,7 @@
 static int g_x_socket;
 static Screen *g_screen;
 Window g_wnd;
+uint32 g_embed_wnd;
 BOOL g_enable_compose = False;
 static GC g_gc = NULL;
 static Visual *g_visual;
@@ -239,17 +240,20 @@
 {
 	uint16 value;
 
-	while (out < end)
+	if (g_xserver_be)
 	{
-		value = (uint16) g_colmap[*(data++)];
-
-		if (g_xserver_be)
+		while (out < end)
 		{
+			value = (uint16) g_colmap[*(data++)];
 			*(out++) = value >> 8;
 			*(out++) = value;
 		}
-		else
+	}
+	else
+	{
+		while (out < end)
 		{
+			value = (uint16) g_colmap[*(data++)];
 			*(out++) = value;
 			*(out++) = value >> 8;
 		}
@@ -262,18 +266,21 @@
 {
 	uint32 value;
 
-	while (out < end)
+	if (g_xserver_be)
 	{
-		value = g_colmap[*(data++)];
-
-		if (g_xserver_be)
+		while (out < end)
 		{
+			value = g_colmap[*(data++)];
 			*(out++) = value >> 16;
 			*(out++) = value >> 8;
 			*(out++) = value;
 		}
-		else
+	}
+	else
+	{
+		while (out < end)
 		{
+			value = g_colmap[*(data++)];
 			*(out++) = value;
 			*(out++) = value >> 8;
 			*(out++) = value >> 16;
@@ -286,19 +293,22 @@
 {
 	uint32 value;
 
-	while (out < end)
+	if (g_xserver_be)
 	{
-		value = g_colmap[*(data++)];
-
-		if (g_xserver_be)
+		while (out < end)
 		{
+			value = g_colmap[*(data++)];
 			*(out++) = value >> 24;
 			*(out++) = value >> 16;
 			*(out++) = value >> 8;
 			*(out++) = value;
 		}
-		else
+	}
+	else
+	{
+		while (out < end)
 		{
+			value = g_colmap[*(data++)];
 			*(out++) = value;
 			*(out++) = value >> 8;
 			*(out++) = value >> 16;
@@ -925,6 +935,11 @@
 		XFree(sizehints);
 	}
 
+        if ( g_embed_wnd )
+        {
+                XReparentWindow(g_display, g_wnd, (Window)g_embed_wnd, 0, 0);
+        }
+
 	input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
 		VisibilityChangeMask | FocusChangeMask;
 
@@ -1922,6 +1937,12 @@
 
 	SET_FOREGROUND(bgcolour);
 
+	/* Sometimes, the boxcx value is something really large, like
+	   32691. This makes XCopyArea fail with Xvnc. The code below
+	   is a quick fix. */
+	if (boxx + boxcx > g_width)
+		boxcx = g_width - boxx;
+
 	if (boxcx > 1)
 	{
 		FILL_RECTANGLE_BACKSTORE(boxx, boxy, boxcx, boxcy);