--- sourceforge.net/trunk/rdesktop/rdesktop.c	2001/09/15 12:34:34	33
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2002/08/09 09:11:01	96
@@ -23,6 +23,7 @@
 #include <unistd.h>		/* read close getuid getgid getpid getppid gethostname */
 #include <fcntl.h>		/* open */
 #include <pwd.h>		/* getpwuid */
+#include <limits.h>		/* PATH_MAX */
 #include <sys/stat.h>		/* stat */
 #include <sys/time.h>		/* gettimeofday */
 #include <sys/times.h>		/* times */
@@ -30,9 +31,11 @@
 
 char username[16];
 char hostname[16];
+char keymapname[16];
+int keylayout = 0x409;		/* Defaults to US keyboard layout */
 int width;
 int height;
-int keylayout = 0x409;
+int tcp_port_rdp = TCP_PORT_RDP;
 BOOL bitmap_compression = True;
 BOOL sendmotion = True;
 BOOL orders = True;
@@ -40,6 +43,7 @@
 BOOL encryption = True;
 BOOL desktop_save = True;
 BOOL fullscreen = False;
+BOOL grab_keyboard = True;
 
 /* Display usage information */
 static void
@@ -51,14 +55,17 @@
 	printf("   -s: shell\n");
 	printf("   -c: working directory\n");
 	printf("   -p: password (autologon)\n");
+	printf("   -P: askpass-program (autologon)\n");
 	printf("   -n: client hostname\n");
-	printf("   -k: keyboard layout (hex)\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\n");
+	printf("   -l: do not request licence\n");
+	printf("   -t: rdp tcp port\n");
+	printf("   -K: keep window manager key bindings\n");
 }
 
 /* Client program */
@@ -68,6 +75,7 @@
 	char fullhostname[64];
 	char domain[16];
 	char password[16];
+	char *askpass_result;
 	char shell[32];
 	char directory[32];
 	char title[32];
@@ -82,8 +90,9 @@
 
 	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:fbemlh?")) != -1)
+	while ((c = getopt(argc, argv, "u:d:s:c:p:P:n:k:g:t:fbemlKh?")) != -1)
 	{
 		switch (c)
 		{
@@ -108,23 +117,28 @@
 				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;
 
 			case 'k':
-				keylayout = strtol(optarg, NULL, 16);
-				if (keylayout == 0)
-				{
-					error("invalid keyboard layout\n");
-					return 1;
-				}
+				STRNCPY(keymapname, optarg, sizeof(keymapname));
 				break;
 
 			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))
 				{
@@ -153,6 +167,14 @@
 				licence = False;
 				break;
 
+			case 't':
+				tcp_port_rdp = strtol(optarg, NULL, 10);
+				break;
+
+			case 'K':
+				grab_keyboard = False;
+				break;
+
 			case 'h':
 			case '?':
 			default:
@@ -216,25 +238,29 @@
 	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");
+
 	if (ui_create_window(title))
 	{
-		if (!rdp_connect(server, flags, domain, password, shell,
-				 directory))
-			return 1;
-
-		printf("Connection successful.\n");
 		rdp_main_loop();
-		printf("Disconnecting...\n");
 		ui_destroy_window();
 	}
 
+	printf("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;
@@ -339,15 +365,67 @@
 			printf("%02x ", line[i]);
 
 		for (; i < 16; i++)
-				printf("   ");
+			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;
 		line += thisline;
 	}
 }
+
+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);
+}