--- sourceforge.net/trunk/rdesktop/rdesktop.c	2002/10/24 08:21:33	240
+++ 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;
@@ -55,6 +56,8 @@
 BOOL desktop_save = True;
 BOOL fullscreen = False;
 BOOL grab_keyboard = True;
+BOOL hide_decorations = False;
+extern BOOL owncolmap;
 
 /* Display usage information */
 static void
@@ -77,8 +80,10 @@
 	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");
 }
 
 static BOOL
@@ -138,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:h?")) != -1)
+	while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemCKT:Dh?")) != -1)
 	{
 		switch (c)
 		{
@@ -183,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);
@@ -210,6 +221,10 @@
 				sendmotion = False;
 				break;
 
+			case 'C':
+				owncolmap = True;
+				break;
+
 			case 'K':
 				grab_keyboard = False;
 				break;
@@ -218,6 +233,10 @@
 				STRNCPY(title, optarg, sizeof(title));
 				break;
 
+			case 'D':
+				hide_decorations = True;
+				break;
+
 			case 'h':
 			case '?':
 			default:
@@ -312,16 +331,16 @@
 
 	addr.sun_family = AF_UNIX;
 	memcpy(addr.sun_path, EGD_SOCKET, sizeof(EGD_SOCKET));
-	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1)
+	if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
 		goto err;
 
 	/* PRNGD and EGD use a simple communications protocol */
-	buf[0] = 1;  /* Non-blocking (similar to /dev/urandom) */
-	buf[1] = 32; /* Number of requested random bytes */
+	buf[0] = 1;		/* Non-blocking (similar to /dev/urandom) */
+	buf[1] = 32;		/* Number of requested random bytes */
 	if (write(fd, buf, 2) != 2)
 		goto err;
 
-	if ((read(fd, buf, 1) != 1) || (buf[0] == 0)) /* Available? */
+	if ((read(fd, buf, 1) != 1) || (buf[0] == 0))	/* Available? */
 		goto err;
 
 	if (read(fd, buf, 32) != 32)
@@ -329,7 +348,7 @@
 
 	ret = True;
 
-err:
+      err:
 	close(fd);
 	return ret;
 }
@@ -362,7 +381,7 @@
 #endif
 
 	/* Otherwise use whatever entropy we can gather - ideas welcome. */
-	r = (uint32 *)random;
+	r = (uint32 *) random;
 	r[0] = (getpid()) | (getppid() << 16);
 	r[1] = (getuid()) | (getgid() << 16);
 	r[2] = times(&tmsbuf);	/* system uptime (clocks) */
@@ -374,10 +393,10 @@
 
 	/* Hash both halves with MD5 to obscure possible patterns */
 	MD5_Init(&md5);
-	MD5_Update(&md5, random, 16); 
+	MD5_Update(&md5, random, 16);
 	MD5_Final(random, &md5);
-	MD5_Update(&md5, random+16, 16);
-	MD5_Final(random+16, &md5);
+	MD5_Update(&md5, random + 16, 16);
+	MD5_Final(random + 16, &md5);
 }
 
 /* malloc; exit if out of memory */