--- sourceforge.net/trunk/rdesktop/rdesktop.c	2003/08/01 17:01:58	438
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/10/17 08:23:47	501
@@ -40,28 +40,37 @@
 #include "crypto/md5.h"
 #endif
 
-char 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 width = 800;		/* If width or height are reset to zero, the geometry will
-				   be fetched from _NET_WORKAREA */
-int height = 600;
+
+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;
-int win_button_size = 0;	/* If zero, disable single app mode */
+int g_win_button_size = 0;	/* If zero, disable single app mode */
 BOOL g_bitmap_compression = True;
-BOOL sendmotion = True;
+BOOL g_sendmotion = True;
 BOOL g_orders = True;
 BOOL g_encryption = True;
 BOOL packet_encryption = True;
 BOOL g_desktop_save = True;
-BOOL fullscreen = False;
-BOOL grab_keyboard = True;
-BOOL hide_decorations = False;
-BOOL g_use_rdp5 = False;
-extern BOOL owncolmap;
+BOOL g_fullscreen = False;
+BOOL g_grab_keyboard = True;
+BOOL g_hide_decorations = False;
+BOOL g_use_rdp5 = True;
+BOOL g_console_session = False;
+extern BOOL g_owncolmap;
+
+#ifdef WITH_RDPSND
+BOOL g_rdpsnd = True;
+#endif
 
 #ifdef RDP2VNC
 extern int rfb_port;
@@ -81,7 +90,7 @@
 	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");
@@ -95,14 +104,19 @@
 	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, "   -K: keep window manager key bindings\n");
 	fprintf(stderr, "   -T: window title\n");
 	fprintf(stderr, "   -D: hide window manager decorations\n");
+#ifdef WITH_RDPSND
+	fprintf(stderr, "   -A: disable audio-redirection\n");
+#endif
 	fprintf(stderr, "   -a: server bpp\n");
-	fprintf(stderr, "   -5: Use RDP5 (EXPERIMENTAL!)\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
@@ -141,6 +155,54 @@
 	return ret;
 }
 
+static void
+parse_server_and_port(char *server)
+{
+	char *p;
+#ifdef IPv6
+	int addr_colons;
+#endif
+
+#ifdef IPv6
+	p = server;
+	addr_colons = 0;
+	while (*p)
+		if (*p++ == ':')
+			addr_colons++;
+	if (addr_colons >= 2)
+	{
+		/* numeric IPv6 style address format - [1:2:3::4]:port */
+		p = strchr(server, ']');
+		if (*server == '[' && p != NULL)
+		{
+			if (*(p + 1) == ':' && *(p + 2) != '\0')
+				tcp_port_rdp = strtol(p + 2, NULL, 10);
+			/* remove the port number and brackets from the address */
+			*p = '\0';
+			strncpy(server, server + 1, strlen(server));
+		}
+	}
+	else
+	{
+		/* dns name or IPv4 style address format - server.example.com:port or 1.2.3.4:port */
+		p = strchr(server, ':');
+		if (p != NULL)
+		{
+			tcp_port_rdp = strtol(p + 1, NULL, 10);
+			*p = 0;
+		}
+	}
+#else /* no IPv6 support */
+	p = strchr(server, ':');
+	if (p != NULL)
+	{
+		tcp_port_rdp = strtol(p + 1, NULL, 10);
+		*p = 0;
+	}
+#endif /* IPv6 */
+
+}
+
 /* Client program */
 int
 main(int argc, char *argv[])
@@ -148,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;
@@ -164,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:S:c:p:n:k:g:a:fbeEmCKT:AD045h?")) != -1)
 	{
 		switch (c)
 		{
@@ -180,7 +242,7 @@
 					rfb_port += 5900;
 				break;
 
-			case 'E':
+			case 'Q':
 				defer_time = strtol(optarg, NULL, 10);
 				if (defer_time < 0)
 					defer_time = 0;
@@ -203,11 +265,11 @@
 			case 'S':
 				if (!strcmp(optarg, "standard"))
 				{
-					win_button_size = 18;
+					g_win_button_size = 18;
 					break;
 				}
 
-				win_button_size = strtol(optarg, &p, 10);
+				g_win_button_size = strtol(optarg, &p, 10);
 
 				if (*p)
 				{
@@ -248,23 +310,33 @@
 			case 'g':
 				if (!strcmp(optarg, "workarea"))
 				{
-					width = height = 0;
+					g_width = g_height = 0;
 					break;
 				}
 
-				width = strtol(optarg, &p, 10);
+				g_width = strtol(optarg, &p, 10);
+				if (g_width <= 0)
+				{
+					error("invalid geometry\n");
+					return 1;
+				}
+
 				if (*p == 'x')
-					height = strtol(p + 1, NULL, 10);
+					g_height = strtol(p + 1, NULL, 10);
 
-				if ((width == 0) || (height == 0))
+				if (g_height <= 0)
 				{
 					error("invalid geometry\n");
 					return 1;
 				}
+
+				if (*p == '%')
+					g_width = -g_width;
+
 				break;
 
 			case 'f':
-				fullscreen = True;
+				g_fullscreen = True;
 				break;
 
 			case 'b':
@@ -278,23 +350,23 @@
 				packet_encryption = False;
 				break;
 			case 'm':
-				sendmotion = False;
+				g_sendmotion = False;
 				break;
 
 			case 'C':
-				owncolmap = True;
+				g_owncolmap = True;
 				break;
 
 			case 'K':
-				grab_keyboard = False;
+				g_grab_keyboard = False;
 				break;
 
 			case 'T':
-				STRNCPY(title, optarg, sizeof(title));
+				STRNCPY(g_title, optarg, sizeof(g_title));
 				break;
 
 			case 'D':
-				hide_decorations = True;
+				g_hide_decorations = True;
 				break;
 
 			case 'a':
@@ -307,9 +379,23 @@
 				}
 				break;
 
+#ifdef WITH_RDPSND
+			case 'A':
+				g_rdpsnd = False;
+				break;
+#endif
+			case '0':
+				g_console_session = True;
+				break;
+
+			case '4':
+				g_use_rdp5 = False;
+				break;
+
 			case '5':
 				g_use_rdp5 = True;
 				break;
+
 			case 'h':
 			case '?':
 			default:
@@ -325,12 +411,7 @@
 	}
 
 	STRNCPY(server, argv[optind], sizeof(server));
-	p = strchr(server, ':');
-	if (p != NULL)
-	{
-		tcp_port_rdp = strtol(p + 1, NULL, 10);
-		*p = 0;
-	}
+	parse_server_and_port(server);
 
 	if (!username_option)
 	{
@@ -362,10 +443,10 @@
 	if (prompt_password && read_password(password, sizeof(password)))
 		flags |= RDP_LOGON_AUTO;
 
-	if (title[0] == 0)
+	if (g_title[0] == 0)
 	{
-		strcpy(title, "rdesktop - ");
-		strncat(title, server, sizeof(title) - sizeof("rdesktop - "));
+		strcpy(g_title, "rdesktop - ");
+		strncat(g_title, server, sizeof(g_title) - sizeof("rdesktop - "));
 	}
 
 #ifdef RDP2VNC
@@ -376,7 +457,12 @@
 	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))