--- sourceforge.net/trunk/rdesktop/rdesktop.c	2002/07/14 00:34:21	58
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2002/09/01 12:03:33	111
@@ -2,17 +2,17 @@
    rdesktop: A Remote Desktop Protocol client.
    Entrypoint and utility functions
    Copyright (C) Matthew Chapman 1999-2001
-   
+
    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,10 +29,11 @@
 #include <sys/times.h>		/* times */
 #include "rdesktop.h"
 
+char title[32] = "";
 char username[16];
 char hostname[16];
 char keymapname[16];
-int keylayout;
+int keylayout = 0x409;		/* Defaults to US keyboard layout */
 int width;
 int height;
 int tcp_port_rdp = TCP_PORT_RDP;
@@ -43,26 +44,30 @@
 BOOL encryption = True;
 BOOL desktop_save = True;
 BOOL fullscreen = False;
+BOOL grab_keyboard = True;
 
 /* Display usage information */
 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\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\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 */
@@ -72,23 +77,23 @@
 	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");
+	fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n");
+	fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2001 Matt Chapman.\n");
+	fprintf(stderr, "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:fbemlh?")) != -1)
+	while ((c = getopt(argc, argv, "u:d:s:c:p:P:n:k:g:t:fbemlKw:h?")) != -1)
 	{
 		switch (c)
 		{
@@ -113,6 +118,16 @@
 				flags |= RDP_LOGON_AUTO;
 				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':
 				STRNCPY(hostname, optarg, sizeof(hostname));
 				break;
@@ -124,7 +139,7 @@
 			case 'g':
 				width = strtol(optarg, &p, 10);
 				if (*p == 'x')
-					height = strtol(p+1, NULL, 10);
+					height = strtol(p + 1, NULL, 10);
 
 				if ((width == 0) || (height == 0))
 				{
@@ -157,6 +172,14 @@
 				tcp_port_rdp = strtol(optarg, NULL, 10);
 				break;
 
+			case 'K':
+				grab_keyboard = False;
+				break;
+
+			case 'w':
+				strncpy(title, optarg, sizeof(title));
+				break;
+
 			case 'h':
 			case '?':
 			default:
@@ -216,29 +239,41 @@
 		width = 800;
 		height = 600;
 	}
+	else
+	{
+		/* make sure width is a multiple of 4 */
+		width = (width + 3) & ~3;
+	}
 
-	strcpy(title, "rdesktop - ");
-	strncat(title, server, sizeof(title) - sizeof("rdesktop - "));
+	if (!strlen(title)) 
+	{
+		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");
+	fprintf(stderr, "Connection successful.\n");
 
-	if (ui_create_window(title))
+	if (ui_create_window())
 	{
 		rdp_main_loop();
 		ui_destroy_window();
 	}
 
-	printf("Disconnecting...\n");
+	fprintf(stderr, "Disconnecting...\n");
 	rdp_disconnect();
 	return 0;
 }
 
 /* Generate a 32-byte random for the secure transport code. */
 void
-generate_random(uint8 *random)
+generate_random(uint8 * random)
 {
 	struct stat st;
 	struct tms tmsbuf;
@@ -334,23 +369,21 @@
 
 	while (offset < len)
 	{
-		printf("%04x ", offset);
+		fprintf(stderr, "%04x ", offset);
 		thisline = len - offset;
 		if (thisline > 16)
 			thisline = 16;
 
 		for (i = 0; i < thisline; i++)
-			printf("%02x ", line[i]);
+			fprintf(stderr, "%02x ", line[i]);
 
 		for (; i < 16; i++)
-				printf("   ");
+			fprintf(stderr, "   ");
 
 		for (i = 0; i < thisline; i++)
-			printf("%c",
-			       (line[i] >= 0x20
-				&& line[i] < 0x7f) ? line[i] : '.');
+			fprintf(stderr, "%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
 
-		printf("\n");
+		fprintf(stderr, "\n");
 		offset += thisline;
 		line += thisline;
 	}
@@ -369,7 +402,7 @@
 		return -1;
 
 	STRNCPY(path, home, sizeof(path));
-	strncat(path, "/.rdesktop/licence", sizeof(path)-strlen(path)-1);
+	strncat(path, "/.rdesktop/licence", sizeof(path) - strlen(path) - 1);
 
 	fd = open(path, O_RDONLY);
 	if (fd == -1)
@@ -394,12 +427,12 @@
 		return;
 
 	STRNCPY(path, home, sizeof(path));
-	strncat(path, "/.rdesktop", sizeof(path)-strlen(path)-1);
+	strncat(path, "/.rdesktop", sizeof(path) - strlen(path) - 1);
 	mkdir(path, 0700);
 
-	strncat(path, "/licence", sizeof(path)-strlen(path)-1);
+	strncat(path, "/licence", sizeof(path) - strlen(path) - 1);
 
-	fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, 0600);
+	fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
 	if (fd == -1)
 	{
 		perror("open");
@@ -409,4 +442,3 @@
 	write(fd, data, length);
 	close(fd);
 }
-