--- sourceforge.net/trunk/rdesktop/xwin.c	2003/01/28 12:07:55	296
+++ sourceforge.net/trunk/rdesktop/xwin.c	2003/02/04 05:32:13	309
@@ -31,6 +31,7 @@
 extern BOOL grab_keyboard;
 extern BOOL hide_decorations;
 extern char title[];
+extern int server_bpp;
 BOOL enable_compose = False;
 BOOL focused;
 BOOL mouse_in_wnd;
@@ -62,11 +63,11 @@
 #define PROP_MOTIF_WM_HINTS_ELEMENTS    5
 typedef struct
 {
-	unsigned long flags;
-	unsigned long functions;
-	unsigned long decorations;
-	long inputMode;
-	unsigned long status;
+	uint32 flags;
+	uint32 functions;
+	uint32 decorations;
+	sint32 inputMode;
+	uint32 status;
 }
 PropMotifWmHints;
 
@@ -88,7 +89,7 @@
 static Colormap xcolmap;
 static uint32 *colmap;
 
-#define TRANSLATE(col)		( owncolmap ? col : translate_colour(colmap[col]) )
+#define TRANSLATE(col)		( server_bpp != 8 ? col : owncolmap ? col : translate_colour(colmap[col]) )
 #define SET_FOREGROUND(col)	XSetForeground(display, gc, TRANSLATE(col));
 #define SET_BACKGROUND(col)	XSetBackground(display, gc, TRANSLATE(col));
 
@@ -128,7 +129,7 @@
 	hintsatom = XInternAtom(display, "_MOTIF_WM_HINTS", False);
 	if (!hintsatom)
 	{
-		error("Failed to get atom _MOTIF_WM_HINTS\n");
+		warning("Failed to get atom _MOTIF_WM_HINTS: probably your window manager does not support MWM hints\n");
 		return;
 	}
 
@@ -300,10 +301,7 @@
 	{
 		xcolmap = DefaultColormapOfScreen(screen);
 		if (depth <= 8)
-		{
-			printf("You're using a screen depth of 8-bits or lower\n");
-			printf("If you get scewed colours, try the -C switch\n");
-		}
+			warning("Screen depth is 8 bits or lower: you may want to use -C for a private colourmap\n");
 	}
 
 	gc = XCreateGC(display, RootWindowOfScreen(screen), 0, NULL);
@@ -318,13 +316,16 @@
 	if ((width == 0) || (height == 0))
 	{
 		/* Fetch geometry from _NET_WORKAREA */
-		uint32 xpos, ypos;
+		uint32 x, y, cx, cy;
 
-		if (get_current_workarea(&xpos, &ypos, &width, &height) < 0)
+		if (get_current_workarea(&x, &y, &cx, &cy) == 0)
+		{
+			width = cx;
+			height = cy;
+		}
+		else
 		{
-			error("Failed to get workarea.\n");
-			error("Perhaps your window manager does not support EWMH?\n");
-			error("Defaulting to geometry 800x600\n");
+			warning("Failed to get workarea: probably your window manager does not support extended hints\n");
 			width = 800;
 			height = 600;
 		}
@@ -749,6 +750,24 @@
 	XImage *image;
 	uint8 *tdata;
 
+	if (server_bpp == 16)
+	{
+		image = XCreateImage(display, visual, depth, ZPixmap, 0,
+				     (char *) data, width, height, 16, 0);
+
+		if (ownbackstore)
+		{
+			XPutImage(display, backstore, gc, image, 0, 0, x, y, cx, cy);
+			XCopyArea(display, backstore, wnd, gc, x, y, cx, cy, x, y);
+		}
+		else
+		{
+			XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy);
+		}
+
+		XFree(image);
+		return;
+	}
 	tdata = (owncolmap ? data : translate_image(width, height, data));
 	image = XCreateImage(display, visual, depth, ZPixmap, 0,
 			     (char *) tdata, width, height, 8, 0);
@@ -1221,8 +1240,8 @@
     }\
   if (glyph != NULL)\
     {\
-      ui_draw_glyph (mixmode, x + (short) glyph->offset,\
-		     y + (short) glyph->baseline,\
+      ui_draw_glyph (mixmode, x + glyph->offset,\
+		     y + glyph->baseline,\
 		     glyph->width, glyph->height,\
 		     glyph->pixmap, 0, 0, bgcolour, fgcolour);\
       if (flags & TEXT2_IMPLICIT_X)\