--- sourceforge.net/trunk/rdesktop/rdesktop.c	2002/11/18 15:30:12	259
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/02/10 12:56:34	317
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Entrypoint and utility functions
-   Copyright (C) Matthew Chapman 1999-2002
+   Copyright (C) Matthew Chapman 1999-2003
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
 #include <unistd.h>		/* read close getuid getgid getpid getppid gethostname */
 #include <fcntl.h>		/* open */
 #include <pwd.h>		/* getpwuid */
-#include <limits.h>		/* PATH_MAX */
 #include <termios.h>		/* tcgetattr tcsetattr */
 #include <sys/stat.h>		/* stat */
 #include <sys/time.h>		/* gettimeofday */
@@ -45,9 +44,11 @@
 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;
+int server_bpp = 8;
 BOOL bitmap_compression = True;
 BOOL sendmotion = True;
 BOOL orders = True;
@@ -55,13 +56,15 @@
 BOOL desktop_save = True;
 BOOL fullscreen = False;
 BOOL grab_keyboard = True;
+BOOL hide_decorations = False;
+extern BOOL owncolmap;
 
 /* Display usage information */
 static void
 usage(char *program)
 {
 	fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n");
-	fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2002 Matt Chapman.\n");
+	fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2003 Matt Chapman.\n");
 	fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");
 
 	fprintf(stderr, "Usage: %s [options] server[:port]\n", program);
@@ -77,8 +80,11 @@
 	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");
+	fprintf(stderr, "   -a: server bpp\n");
 }
 
 static BOOL
@@ -132,18 +138,20 @@
 	uint32 flags;
 	char *p;
 	int c;
+	int username_option = 0;
 
 	flags = RDP_LOGON_NORMAL;
 	prompt_password = False;
 	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:a:fbemCKT:Dh?")) != -1)
 	{
 		switch (c)
 		{
 			case 'u':
 				STRNCPY(username, optarg, sizeof(username));
+				username_option = 1;
 				break;
 
 			case 'd':
@@ -183,6 +191,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 +224,10 @@
 				sendmotion = False;
 				break;
 
+			case 'C':
+				owncolmap = True;
+				break;
+
 			case 'K':
 				grab_keyboard = False;
 				break;
@@ -218,6 +236,19 @@
 				STRNCPY(title, optarg, sizeof(title));
 				break;
 
+			case 'D':
+				hide_decorations = True;
+				break;
+
+			case 'a':
+				server_bpp = strtol(optarg, NULL, 10);
+				if (server_bpp != 8 && server_bpp != 16 && server_bpp != 15 && server_bpp != 24)
+				{
+					error("invalid server bpp\n");
+					return 1;
+				}
+				break;
+
 			case 'h':
 			case '?':
 			default:
@@ -240,7 +271,7 @@
 		*p = 0;
 	}
 
-	if (username[0] == 0)
+	if (!username_option)
 	{
 		pw = getpwuid(getuid());
 		if ((pw == NULL) || (pw->pw_name == NULL))
@@ -426,6 +457,19 @@
 	va_end(ap);
 }
 
+/* report a warning */
+void
+warning(char *format, ...)
+{
+	va_list ap;
+
+	fprintf(stderr, "WARNING: ");
+
+	va_start(ap, format);
+	vfprintf(stderr, format, ap);
+	va_end(ap);
+}
+
 /* report an unimplemented protocol feature */
 void
 unimpl(char *format, ...)
@@ -469,58 +513,3 @@
 	}
 }
 
-#ifdef SAVE_LICENCE
-int
-load_licence(unsigned char **data)
-{
-	char path[PATH_MAX];
-	char *home;
-	struct stat st;
-	int fd;
-
-	home = getenv("HOME");
-	if (home == NULL)
-		return -1;
-
-	STRNCPY(path, home, sizeof(path));
-	strncat(path, "/.rdesktop/licence", sizeof(path) - strlen(path) - 1);
-
-	fd = open(path, O_RDONLY);
-	if (fd == -1)
-		return -1;
-
-	if (fstat(fd, &st))
-		return -1;
-
-	*data = xmalloc(st.st_size);
-	return read(fd, *data, st.st_size);
-}
-
-void
-save_licence(unsigned char *data, int length)
-{
-	char path[PATH_MAX];
-	char *home;
-	int fd;
-
-	home = getenv("HOME");
-	if (home == NULL)
-		return;
-
-	STRNCPY(path, home, sizeof(path));
-	strncat(path, "/.rdesktop", sizeof(path) - strlen(path) - 1);
-	mkdir(path, 0700);
-
-	strncat(path, "/licence", sizeof(path) - strlen(path) - 1);
-
-	fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
-	if (fd == -1)
-	{
-		perror("open");
-		return;
-	}
-
-	write(fd, data, length);
-	close(fd);
-}
-#endif