--- sourceforge.net/trunk/rdesktop/rdesktop.c	2002/11/18 15:37:20	262
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2002/11/26 10:09:14	279
@@ -45,7 +45,8 @@
 char hostname[16];
 char keymapname[16];
 int keylayout = 0x409;		/* Defaults to US keyboard layout */
-int width = 800;
+int width = 800;		/* If width or height are reset to zero, the geometry will 
+				   be fetched from _NET_WORKAREA */
 int height = 600;
 int tcp_port_rdp = TCP_PORT_RDP;
 BOOL bitmap_compression = True;
@@ -56,6 +57,7 @@
 BOOL fullscreen = False;
 BOOL grab_keyboard = True;
 BOOL hide_decorations = False;
+extern BOOL owncolmap;
 
 /* Display usage information */
 static void
@@ -78,6 +80,7 @@
 	fprintf(stderr, "   -b: force bitmap updates\n");
 	fprintf(stderr, "   -e: disable encryption (French TS)\n");
 	fprintf(stderr, "   -m: do not send motion events\n");
+	fprintf(stderr, "   -C: use private colour map\n");
 	fprintf(stderr, "   -K: keep window manager key bindings\n");
 	fprintf(stderr, "   -T: window title\n");
 	fprintf(stderr, "   -D: hide window manager decorations\n");
@@ -140,7 +143,7 @@
 	domain[0] = password[0] = shell[0] = directory[0] = 0;
 	strcpy(keymapname, "en-us");
 
-	while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemKT:Dh?")) != -1)
+	while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemCKT:Dh?")) != -1)
 	{
 		switch (c)
 		{
@@ -185,6 +188,12 @@
 				break;
 
 			case 'g':
+				if (!strcmp(optarg, "workarea"))
+				{
+					width = height = 0;
+					break;
+				}
+
 				width = strtol(optarg, &p, 10);
 				if (*p == 'x')
 					height = strtol(p + 1, NULL, 10);
@@ -212,6 +221,10 @@
 				sendmotion = False;
 				break;
 
+			case 'C':
+				owncolmap = True;
+				break;
+
 			case 'K':
 				grab_keyboard = False;
 				break;