--- sourceforge.net/trunk/rdesktop/rdesktop.c	2002/07/29 20:35:13	79
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2002/09/17 09:20:13	171
@@ -1,18 +1,18 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Entrypoint and utility functions
-   Copyright (C) Matthew Chapman 1999-2001
-   
+   Copyright (C) Matthew Chapman 1999-2002
+
    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
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -29,12 +29,13 @@
 #include <sys/times.h>		/* times */
 #include "rdesktop.h"
 
+char title[32] = "";
 char username[16];
 char hostname[16];
 char keymapname[16];
 int keylayout = 0x409;		/* Defaults to US keyboard layout */
-int width;
-int height;
+int width = 800;
+int height = 600;
 int tcp_port_rdp = TCP_PORT_RDP;
 BOOL bitmap_compression = True;
 BOOL sendmotion = True;
@@ -49,22 +50,28 @@
 static void
 usage(char *program)
 {
-	printf("Usage: %s [options] server\n", program);
-	printf("   -u: user name\n");
-	printf("   -d: domain\n");
-	printf("   -s: shell\n");
-	printf("   -c: working directory\n");
-	printf("   -p: password (autologon)\n");
-	printf("   -n: client hostname\n");
-	printf("   -k: keyboard layout on terminal server (us,sv,gr etc.)\n");
-	printf("   -g: desktop geometry (WxH)\n");
-	printf("   -f: full-screen mode\n");
-	printf("   -b: force bitmap updates\n");
-	printf("   -e: disable encryption (French TS)\n");
-	printf("   -m: do not send motion events\n");
-	printf("   -l: do not request licence\n");
-	printf("   -t: rdp tcp port\n");
-	printf("   -K: keep window manager key bindings\n");
+	fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n");
+	fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2002 Matt Chapman.\n");
+	fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");
+
+	fprintf(stderr, "Usage: %s [options] server\n", program);
+	fprintf(stderr, "   -u: user name\n");
+	fprintf(stderr, "   -d: domain\n");
+	fprintf(stderr, "   -s: shell\n");
+	fprintf(stderr, "   -c: working directory\n");
+	fprintf(stderr, "   -p: password (autologon)\n");
+	fprintf(stderr, "   -P: askpass-program (autologon)\n");
+	fprintf(stderr, "   -n: client hostname\n");
+	fprintf(stderr, "   -k: keyboard layout on terminal server (us,sv,gr etc.)\n");
+	fprintf(stderr, "   -g: desktop geometry (WxH)\n");
+	fprintf(stderr, "   -f: full-screen mode\n");
+	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, "   -l: do not request licence\n");
+	fprintf(stderr, "   -t: rdp tcp port\n");
+	fprintf(stderr, "   -K: keep window manager key bindings\n");
+	fprintf(stderr, "   -w: window title\n");
 }
 
 /* Client program */
@@ -74,24 +81,19 @@
 	char fullhostname[64];
 	char domain[16];
 	char password[16];
+	char *askpass_result;
 	char shell[32];
 	char directory[32];
-	char title[32];
 	struct passwd *pw;
 	char *server, *p;
 	uint32 flags;
 	int c;
 
-	printf("rdesktop: A Remote Desktop Protocol client.\n");
-	printf("Version " VERSION
-	       ". Copyright (C) 1999-2001 Matt Chapman.\n");
-	printf("See http://www.rdesktop.org/ for more information.\n\n");
-
 	flags = RDP_LOGON_NORMAL;
 	domain[0] = password[0] = shell[0] = directory[0] = 0;
 	strcpy(keymapname, "us");
 
-	while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:t:fbemlKh?")) != -1)
+	while ((c = getopt(argc, argv, "u:d:s:c:p:P:n:k:g:t:fbemlKw:h?")) != -1)
 	{
 		switch (c)
 		{
@@ -114,6 +116,19 @@
 			case 'p':
 				STRNCPY(password, optarg, sizeof(password));
 				flags |= RDP_LOGON_AUTO;
+				p = optarg;
+				while (*p)
+					*(p++) = 'X';
+				break;
+
+			case 'P':
+				askpass_result = askpass(optarg, "Enter password");
+				if (askpass_result == NULL)
+					exit(1);
+
+				STRNCPY(password, askpass_result, sizeof(password));
+				free(askpass_result);
+				flags |= RDP_LOGON_AUTO;
 				break;
 
 			case 'n':
@@ -121,8 +136,7 @@
 				break;
 
 			case 'k':
-				STRNCPY(keymapname, optarg,
-					sizeof(keymapname));
+				STRNCPY(keymapname, optarg, sizeof(keymapname));
 				break;
 
 			case 'g':
@@ -165,6 +179,10 @@
 				grab_keyboard = False;
 				break;
 
+			case 'w':
+				strncpy(title, optarg, sizeof(title));
+				break;
+
 			case 'h':
 			case '?':
 			default:
@@ -219,29 +237,27 @@
 		STRNCPY(password, p, sizeof(password));
 	}
 
-	if ((width == 0) || (height == 0))
+	if (!strlen(title))
 	{
-		width = 800;
-		height = 600;
+		strcpy(title, "rdesktop - ");
+		strncat(title, server, sizeof(title) - sizeof("rdesktop - "));
 	}
 
-	strcpy(title, "rdesktop - ");
-	strncat(title, server, sizeof(title) - sizeof("rdesktop - "));
-
-	xkeymap_init1();
+	if (!ui_init())
+		return 1;
 
 	if (!rdp_connect(server, flags, domain, password, shell, directory))
 		return 1;
 
-	printf("Connection successful.\n");
+	DEBUG(("Connection successful.\n"));
 
-	if (ui_create_window(title))
+	if (ui_create_window())
 	{
 		rdp_main_loop();
 		ui_destroy_window();
 	}
 
-	printf("Disconnecting...\n");
+	DEBUG(("Disconnecting...\n"));
 	rdp_disconnect();
 	return 0;
 }
@@ -356,9 +372,7 @@
 			printf("   ");
 
 		for (i = 0; i < thisline; i++)
-			printf("%c",
-			       (line[i] >= 0x20
-				&& line[i] < 0x7f) ? line[i] : '.');
+			printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
 
 		printf("\n");
 		offset += thisline;
@@ -366,6 +380,7 @@
 	}
 }
 
+#ifdef SAVE_LICENCE
 int
 load_licence(unsigned char **data)
 {
@@ -419,3 +434,4 @@
 	write(fd, data, length);
 	close(fd);
 }
+#endif