--- sourceforge.net/trunk/rdesktop/rdesktop.c	2003/09/02 09:32:13	458
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/12/08 12:01:25	552
@@ -40,13 +40,17 @@
 #include "crypto/md5.h"
 #endif
 
-char g_title[32] = "";
-char g_username[16];
+char g_title[64] = "";
+char g_username[64];
 char hostname[16];
 char keymapname[16];
 int keylayout = 0x409;		/* Defaults to US keyboard layout */
-int g_width = 800;		/* If width or height are reset to zero, the geometry will
-				   be fetched from _NET_WORKAREA */
+
+int g_width = 800;		/* width is special: If 0, the
+				   geometry will be fetched from
+				   _NET_WORKAREA. If negative,
+				   absolute value specifies the
+				   percent of the whole screen. */
 int g_height = 600;
 int tcp_port_rdp = TCP_PORT_RDP;
 int g_server_bpp = 8;
@@ -61,8 +65,14 @@
 BOOL g_grab_keyboard = True;
 BOOL g_hide_decorations = False;
 BOOL g_use_rdp5 = True;
+BOOL g_console_session = False;
+BOOL g_numlock_sync = False;
 extern BOOL g_owncolmap;
 
+#ifdef WITH_RDPSND
+BOOL g_rdpsnd = False;
+#endif
+
 #ifdef RDP2VNC
 extern int rfb_port;
 extern int defer_time;
@@ -81,29 +91,32 @@
 	fprintf(stderr, "Usage: %s [options] server[:port]\n", program);
 #ifdef RDP2VNC
 	fprintf(stderr, "   -V: vnc port\n");
-	fprintf(stderr, "   -E: defer time (ms)\n");
+	fprintf(stderr, "   -Q: defer time (ms)\n");
 #endif
 	fprintf(stderr, "   -u: user name\n");
 	fprintf(stderr, "   -d: domain\n");
 	fprintf(stderr, "   -s: shell\n");
-	fprintf(stderr, "   -S: caption button size (single application mode)\n");
 	fprintf(stderr, "   -c: working directory\n");
 	fprintf(stderr, "   -p: password (- to prompt)\n");
 	fprintf(stderr, "   -n: client hostname\n");
-	fprintf(stderr, "   -k: keyboard layout on terminal server (us,sv,gr,etc.)\n");
+	fprintf(stderr, "   -k: keyboard layout on server (en-us, de, sv, 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, "   -E: disable encryption of everything but the logon packet\n");
+	fprintf(stderr, "   -E: disable encryption from client to server\n");
 	fprintf(stderr, "   -m: do not send motion events\n");
 	fprintf(stderr, "   -C: use private colour map\n");
+	fprintf(stderr, "   -D: hide window manager decorations\n");
 	fprintf(stderr, "   -K: keep window manager key bindings\n");
+	fprintf(stderr, "   -S: caption button size (single application mode)\n");
 	fprintf(stderr, "   -T: window title\n");
-	fprintf(stderr, "   -D: hide window manager decorations\n");
-	fprintf(stderr, "   -a: server bpp\n");
-	fprintf(stderr, "   -4: Use RDP version 4\n");
-	fprintf(stderr, "   -5: Use RDP version 5 (default)\n");
+	fprintf(stderr, "   -N: enable numlock syncronization\n");
+	fprintf(stderr, "   -a: connection colour depth\n");
+	fprintf(stderr, "   -r: enable specified device redirection (currently: sound)\n");
+	fprintf(stderr, "   -0: attach to console\n");
+	fprintf(stderr, "   -4: use RDP version 4\n");
+	fprintf(stderr, "   -5: use RDP version 5 (default)\n");
 }
 
 static BOOL
@@ -197,7 +210,7 @@
 	char server[64];
 	char fullhostname[64];
 	char domain[16];
-	char password[16];
+	char password[64];
 	char shell[128];
 	char directory[32];
 	BOOL prompt_password, rdp_retval = False;
@@ -213,12 +226,12 @@
 	strcpy(keymapname, "en-us");
 
 #ifdef RDP2VNC
-#define VNCOPT "V:E:"
+#define VNCOPT "V:Q:"
 #else
 #define VNCOPT
 #endif
 
-	while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbeEmCKT:Dh?54")) != -1)
+	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:Na:r:045h?")) != -1)
 	{
 		switch (c)
 		{
@@ -229,7 +242,7 @@
 					rfb_port += 5900;
 				break;
 
-			case 'E':
+			case 'Q':
 				defer_time = strtol(optarg, NULL, 10);
 				if (defer_time < 0)
 					defer_time = 0;
@@ -249,23 +262,6 @@
 				STRNCPY(shell, optarg, sizeof(shell));
 				break;
 
-			case 'S':
-				if (!strcmp(optarg, "standard"))
-				{
-					g_win_button_size = 18;
-					break;
-				}
-
-				g_win_button_size = strtol(optarg, &p, 10);
-
-				if (*p)
-				{
-					error("invalid button size\n");
-					return 1;
-				}
-
-				break;
-
 			case 'c':
 				STRNCPY(directory, optarg, sizeof(directory));
 				break;
@@ -295,6 +291,7 @@
 				break;
 
 			case 'g':
+				g_fullscreen = False;
 				if (!strcmp(optarg, "workarea"))
 				{
 					g_width = g_height = 0;
@@ -302,14 +299,24 @@
 				}
 
 				g_width = strtol(optarg, &p, 10);
+				if (g_width <= 0)
+				{
+					error("invalid geometry\n");
+					return 1;
+				}
+
 				if (*p == 'x')
 					g_height = strtol(p + 1, NULL, 10);
 
-				if ((g_width == 0) || (g_height == 0))
+				if (g_height <= 0)
 				{
 					error("invalid geometry\n");
 					return 1;
 				}
+
+				if (*p == '%')
+					g_width = -g_width;
+
 				break;
 
 			case 'f':
@@ -334,16 +341,37 @@
 				g_owncolmap = True;
 				break;
 
+			case 'D':
+				g_hide_decorations = True;
+				break;
+
 			case 'K':
 				g_grab_keyboard = False;
 				break;
 
+			case 'S':
+				if (!strcmp(optarg, "standard"))
+				{
+					g_win_button_size = 18;
+					break;
+				}
+
+				g_win_button_size = strtol(optarg, &p, 10);
+
+				if (*p)
+				{
+					error("invalid button size\n");
+					return 1;
+				}
+
+				break;
+
 			case 'T':
 				STRNCPY(g_title, optarg, sizeof(g_title));
 				break;
 
-			case 'D':
-				g_hide_decorations = True;
+			case 'N':
+				g_numlock_sync = True;
 				break;
 
 			case 'a':
@@ -356,6 +384,19 @@
 				}
 				break;
 
+			case 'r':
+				if (!strcmp(optarg, "sound"))
+#ifdef WITH_RDPSND
+					g_rdpsnd = True;
+#else
+					warning("Not compiled with sound support");
+#endif
+				break;
+
+			case '0':
+				g_console_session = True;
+				break;
+
 			case '4':
 				g_use_rdp5 = False;
 				break;
@@ -425,7 +466,10 @@
 	if (!ui_init())
 		return 1;
 
-	/* rdpsnd_init(); */
+#ifdef WITH_RDPSND
+	if (g_rdpsnd)
+		rdpsnd_init();
+#endif
 	/* rdpdr_init(); */
 
 	if (!rdp_connect(server, flags, domain, password, shell, directory))