--- sourceforge.net/trunk/rdesktop/rdesktop.c	2004/02/16 20:28:09	609
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2004/04/15 20:12:42	651
@@ -68,8 +68,11 @@
 BOOL g_use_rdp5 = True;
 BOOL g_console_session = False;
 BOOL g_numlock_sync = False;
-extern BOOL g_owncolmap;
-extern BOOL g_ownbackstore;
+BOOL g_owncolmap = False;
+BOOL g_ownbackstore = True;	/* We can't rely on external BackingStore */
+uint32 g_embed_wnd;
+uint32 g_rdp5_performanceflags =
+	RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
 
 #ifdef WITH_RDPSND
 BOOL g_rdpsnd = False;
@@ -77,6 +80,7 @@
 
 extern RDPDR_DEVICE g_rdpdr_device[];
 extern uint32 g_num_devices;
+extern char *g_rdpdr_clientname;
 
 #ifdef RDP2VNC
 extern int rfb_port;
@@ -118,7 +122,10 @@
 	fprintf(stderr, "   -S: caption button size (single application mode)\n");
 	fprintf(stderr, "   -T: window title\n");
 	fprintf(stderr, "   -N: enable numlock syncronization\n");
+	fprintf(stderr, "   -X: embed into another window with a given id.\n");
 	fprintf(stderr, "   -a: connection colour depth\n");
+	fprintf(stderr,
+		"   -x: RDP5 experience (m[odem 28.8], b[roadband], l[an] or hex number)\n");
 	fprintf(stderr, "   -r: enable specified device redirection (this flag can be repeated)\n");
 	fprintf(stderr,
 		"         '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n");
@@ -126,13 +133,16 @@
 	fprintf(stderr,
 		"         '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n");
 	fprintf(stderr, "             or   A=/mnt/floppy,D=/mnt/cdrom'\n");
+	fprintf(stderr, "         '-r clientname=<client name>': Set the client name displayed\n");
+	fprintf(stderr, "             for redirected disks\n");
 	fprintf(stderr,
 		"         '-r lptport:LPT1=/dev/lp0': enable parallel redirection of /dev/lp0 to LPT1\n");
 	fprintf(stderr, "             or      LPT1=/dev/lp0,LPT2=/dev/lp1\n");
 	fprintf(stderr, "         '-r printer:mydeskjet': enable printer redirection\n");
 	fprintf(stderr,
-		"             or       mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n");
-	fprintf(stderr, "         '-r sound': enable sound redirection\n");
+		"             or      mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n");
+	fprintf(stderr, "         '-r sound:[local|off|remote]': enable sound redirection\n");
+	fprintf(stderr, "                     remote would leave sound on server\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");
@@ -244,6 +254,7 @@
 	prompt_password = False;
 	domain[0] = password[0] = shell[0] = directory[0] = 0;
 	strcpy(keymapname, "en-us");
+	g_embed_wnd = 0;
 
 	g_num_devices = 0;
 
@@ -253,7 +264,7 @@
 #define VNCOPT
 #endif
 
-	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS:T:Na:r:045h?")) != -1)
+	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS:T:NX:a:x:r:045h?")) != -1)
 	{
 		switch (c)
 		{
@@ -400,6 +411,10 @@
 				g_numlock_sync = True;
 				break;
 
+			case 'X':
+				g_embed_wnd = strtol(optarg, NULL, 10);
+				break;
+
 			case 'a':
 				g_server_bpp = strtol(optarg, NULL, 10);
 				if (g_server_bpp != 8 && g_server_bpp != 16 && g_server_bpp != 15
@@ -410,15 +425,63 @@
 				}
 				break;
 
+			case 'x':
+
+				if (strncmp("modem", optarg, 1) == 0)
+				{
+					g_rdp5_performanceflags =
+						RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG |
+						RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING;
+				}
+				else if (strncmp("broadband", optarg, 1) == 0)
+				{
+					g_rdp5_performanceflags = RDP5_NO_WALLPAPER;
+				}
+				else if (strncmp("lan", optarg, 1) == 0)
+				{
+					g_rdp5_performanceflags = RDP5_DISABLE_NOTHING;
+				}
+				else
+				{
+					g_rdp5_performanceflags = strtol(optarg, NULL, 16);
+				}
+				break;
+
 			case 'r':
 
 				if (strncmp("sound", optarg, 5) == 0)
 				{
+					optarg += 5;
+
+					if (*optarg == ':')
+					{
+						*optarg++;
+						while ((p = next_arg(optarg, ',')))
+						{
+							if (strncmp("remote", optarg, 6) == 0)
+								flags |= RDP_LOGON_LEAVE_AUDIO;
+
+							if (strncmp("local", optarg, 5) == 0)
+#ifdef WITH_RDPSND
+								g_rdpsnd = True;
+#else
+								warning("Not compiled with sound support");
+#endif
+
+							if (strncmp("off", optarg, 3) == 0)
+								g_rdpsnd = False;
+
+							optarg = p;
+						}
+					}
+					else
+					{
 #ifdef WITH_RDPSND
-					g_rdpsnd = True;
+						g_rdpsnd = True;
 #else
-					warning("Not compiled with sound support");
+						warning("Not compiled with sound support");
 #endif
+					}
 				}
 				else if (strncmp("disk", optarg, 4) == 0)
 				{
@@ -437,6 +500,11 @@
 				{
 					printer_enum_devices(&g_num_devices, optarg + 7);
 				}
+				else if (strncmp("clientname", optarg, 7) == 0)
+				{
+					g_rdpdr_clientname = xmalloc(strlen(optarg + 11) + 1);
+					strcpy(g_rdpdr_clientname, optarg + 11);
+				}
 				else
 				{
 					warning("Unknown -r argument\n\n\tPossible arguments are: comport, disk, lptport, printer, sound\n");
@@ -463,7 +531,7 @@
 		}
 	}
 
-	if (argc - optind < 1)
+	if (argc - optind != 1)
 	{
 		usage(argv[0]);
 		return 1;