--- sourceforge.net/trunk/rdesktop/xwin.c	2003/10/31 04:51:10	537
+++ sourceforge.net/trunk/rdesktop/xwin.c	2004/01/16 23:15:33	564
@@ -311,8 +311,6 @@
 	}
 }
 
-/* todo the remaining translate function might need some big endian check ?? */
-
 static void
 translate15to16(uint16 * data, uint8 * out, uint8 * end)
 {
@@ -543,7 +541,7 @@
 		pixel |= *(data++);
 
 		value = make_colour(split_colour24(pixel));
-		
+
 		if (g_xserver_be)
 		{
 			*(out++) = value >> 16;
@@ -777,7 +775,12 @@
 	/*
 	 * Determine desktop size
 	 */
-	if (g_width < 0)
+	if (g_fullscreen)
+	{
+		g_width = WidthOfScreen(g_screen);
+		g_height = HeightOfScreen(g_screen);
+	}
+	else if (g_width < 0)
 	{
 		/* Percent of screen */
 		g_height = HeightOfScreen(g_screen) * (-g_width) / 100;
@@ -800,11 +803,6 @@
 			g_height = 600;
 		}
 	}
-	else if (g_fullscreen)
-	{
-		g_width = WidthOfScreen(g_screen);
-		g_height = HeightOfScreen(g_screen);
-	}
 
 	/* make sure width is a multiple of 4 */
 	g_width = (g_width + 3) & ~3;
@@ -945,8 +943,6 @@
 void
 ui_destroy_window(void)
 {
-	ui_destroy_cursor(g_null_cursor);
-
 	if (g_IC != NULL)
 		XDestroyIC(g_IC);
 
@@ -990,9 +986,6 @@
 	key_translation tr;
 	char str[256];
 	Status status;
-	unsigned int state;
-	Window wdummy;
-	int dummy;
 
 	while (XPending(g_display) > 0)
 	{
@@ -1165,9 +1158,7 @@
 				if (xevent.xfocus.mode == NotifyGrab)
 					break;
 				g_focused = True;
-				XQueryPointer(g_display, g_wnd, &wdummy, &wdummy, &dummy, &dummy,
-					      &dummy, &dummy, &state);
-				reset_modifier_keys(state);
+				reset_modifier_keys();
 				if (g_grab_keyboard && g_mouse_in_wnd)
 					XGrabKeyboard(g_display, g_wnd, True,
 						      GrabModeAsync, GrabModeAsync, CurrentTime);
@@ -1832,33 +1823,34 @@
 {\
   glyph = cache_get_font (font, ttext[idx]);\
   if (!(flags & TEXT2_IMPLICIT_X))\
+  {\
+    xyoffset = ttext[++idx];\
+    if ((xyoffset & 0x80))\
     {\
-      xyoffset = ttext[++idx];\
-      if ((xyoffset & 0x80))\
-	{\
-	  if (flags & TEXT2_VERTICAL) \
-	    y += ttext[idx+1] | (ttext[idx+2] << 8);\
-	  else\
-	    x += ttext[idx+1] | (ttext[idx+2] << 8);\
-	  idx += 2;\
-	}\
+      if (flags & TEXT2_VERTICAL)\
+        y += ttext[idx+1] | (ttext[idx+2] << 8);\
       else\
-	{\
-	  if (flags & TEXT2_VERTICAL) \
-	    y += xyoffset;\
-	  else\
-	    x += xyoffset;\
-	}\
+        x += ttext[idx+1] | (ttext[idx+2] << 8);\
+      idx += 2;\
     }\
-  if (glyph != NULL)\
+    else\
     {\
-      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)\
-	x += glyph->width;\
+      if (flags & TEXT2_VERTICAL)\
+        y += xyoffset;\
+      else\
+        x += xyoffset;\
     }\
+  }\
+  if (glyph != NULL)\
+  {\
+    x1 = x + glyph->offset;\
+    y1 = y + glyph->baseline;\
+    XSetStipple(g_display, g_gc, (Pixmap) glyph->pixmap);\
+    XSetTSOrigin(g_display, g_gc, x1, y1);\
+    FILL_RECTANGLE_BACKSTORE(x1, y1, glyph->width, glyph->height);\
+    if (flags & TEXT2_IMPLICIT_X)\
+      x += glyph->width;\
+  }\
 }
 
 void
@@ -1868,7 +1860,7 @@
 	     int fgcolour, uint8 * text, uint8 length)
 {
 	FONTGLYPH *glyph;
-	int i, j, xyoffset;
+	int i, j, xyoffset, x1, y1;
 	DATABLOB *entry;
 
 	SET_FOREGROUND(bgcolour);
@@ -1882,6 +1874,10 @@
 		FILL_RECTANGLE_BACKSTORE(clipx, clipy, clipcx, clipcy);
 	}
 
+	SET_FOREGROUND(fgcolour);
+	SET_BACKGROUND(bgcolour);
+	XSetFillStyle(g_display, g_gc, FillStippled);
+
 	/* Paint text, character by character */
 	for (i = 0; i < length;)
 	{
@@ -1932,6 +1928,9 @@
 				break;
 		}
 	}
+
+	XSetFillStyle(g_display, g_gc, FillSolid);
+
 	if (g_ownbackstore)
 	{
 		if (boxcx > 1)