--- sourceforge.net/trunk/rdesktop/rdesktop.c	2002/11/26 14:39:50	280
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/02/04 05:32:13	309
@@ -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
@@ -45,10 +45,11 @@
 char hostname[16];
 char keymapname[16];
 int keylayout = 0x409;		/* Defaults to US keyboard layout */
-int width = 800;		/* If width or height are reset to zero, the geometry will 
+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;
@@ -64,7 +65,7 @@
 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);
@@ -84,6 +85,7 @@
 	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
@@ -137,18 +139,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:fbemCKT:Dh?")) != -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':
@@ -237,6 +241,15 @@
 				hide_decorations = True;
 				break;
 
+			case 'a':
+				server_bpp = strtol(optarg, NULL, 10);
+				if (server_bpp != 8 && server_bpp != 16)
+				{
+					error("invalid server bpp\n");
+					return 1;
+				}
+				break;
+
 			case 'h':
 			case '?':
 			default:
@@ -259,7 +272,7 @@
 		*p = 0;
 	}
 
-	if (username[0] == 0)
+	if (!username_option)
 	{
 		pw = getpwuid(getuid());
 		if ((pw == NULL) || (pw->pw_name == NULL))
@@ -442,6 +455,19 @@
 
 	va_start(ap, format);
 	vfprintf(stderr, format, ap);
+	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);
 }