--- sourceforge.net/trunk/rdesktop/xwin.c	2006/03/01 13:54:19	1049
+++ sourceforge.net/trunk/rdesktop/xwin.c	2006/03/07 08:17:40	1057
@@ -1259,6 +1259,7 @@
 	{
 		g_width = WidthOfScreen(g_screen);
 		g_height = HeightOfScreen(g_screen);
+		g_using_full_workarea = True;
 	}
 	else if (g_width < 0)
 	{
@@ -1272,18 +1273,17 @@
 	{
 		/* Fetch geometry from _NET_WORKAREA */
 		uint32 x, y, cx, cy;
-		g_using_full_workarea = True;
-
 		if (get_current_workarea(&x, &y, &cx, &cy) == 0)
 		{
 			g_width = cx;
 			g_height = cy;
+			g_using_full_workarea = True;
 		}
 		else
 		{
 			warning("Failed to get workarea: probably your window manager does not support extended hints\n");
-			g_width = 800;
-			g_height = 600;
+			g_width = WidthOfScreen(g_screen);
+			g_height = HeightOfScreen(g_screen);
 		}
 	}