--- sourceforge.net/trunk/rdesktop/rdesktop.c 2004/01/21 14:40:40 569 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2004/04/02 15:34:38 646 @@ -26,6 +26,7 @@ #include /* stat */ #include /* gettimeofday */ #include /* times */ +#include /* toupper */ #include #include "rdesktop.h" @@ -68,6 +69,9 @@ BOOL g_console_session = False; BOOL g_numlock_sync = False; extern BOOL g_owncolmap; +extern BOOL g_ownbackstore; +extern uint32 g_embed_wnd; +uint32 g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS; #ifdef WITH_RDPSND BOOL g_rdpsnd = False; @@ -75,6 +79,7 @@ extern RDPDR_DEVICE g_rdpdr_device[]; extern uint32 g_num_devices; +extern char * g_rdpdr_clientname; #ifdef RDP2VNC extern int rfb_port; @@ -106,6 +111,7 @@ fprintf(stderr, " -g: desktop geometry (WxH)\n"); fprintf(stderr, " -f: full-screen mode\n"); fprintf(stderr, " -b: force bitmap updates\n"); + fprintf(stderr, " -B: use BackingStore of X-server (if available)\n"); fprintf(stderr, " -e: disable encryption (French TS)\n"); fprintf(stderr, " -E: disable encryption from client to server\n"); fprintf(stderr, " -m: do not send motion events\n"); @@ -115,17 +121,26 @@ 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"); - fprintf(stderr, " or :COM1=/dev/ttyS0:9600,0|1|2,0|2,5|6|7|8:dtr \n"); - fprintf(stderr, " '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n"); + fprintf(stderr, + " '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n"); + fprintf(stderr, " or COM1=/dev/ttyS0,COM2=/dev/ttyS1\n"); + 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 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 clientname=': 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"); + fprintf(stderr, + " 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"); @@ -237,6 +252,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; @@ -246,7 +262,7 @@ #define VNCOPT #endif - while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS: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) { @@ -342,6 +358,10 @@ g_orders = False; break; + case 'B': + g_ownbackstore = False; + break; + case 'e': g_encryption = False; break; @@ -389,6 +409,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 @@ -399,15 +423,61 @@ } 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) { @@ -426,6 +496,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"); @@ -452,7 +527,7 @@ } } - if (argc - optind < 1) + if (argc - optind != 1) { usage(argv[0]); return 1; @@ -727,7 +802,9 @@ } /* - input: src is the string we look in for needle + input: src is the string we look in for needle. + Needle may be escaped by a backslash, in + that case we ignore that particular needle. return value: returns next src pointer, for succesive executions, like in a while loop if retval is 0, then there are no more args. @@ -748,31 +825,58 @@ next_arg(char *src, char needle) { char *nextval; + char *p; + char *mvp = 0; - // EOS + /* EOS */ if (*src == (char) 0x00) return 0; - // more args available. - nextval = strchr(src, needle); + p = src; + /* skip escaped needles */ + while ((nextval = strchr(p, needle))) + { + mvp = nextval - 1; + /* found backslashed needle */ + if (*mvp == '\\' && (mvp > src)) + { + /* move string one to the left */ + while (*(mvp + 1) != (char) 0x00) + { + *mvp = *(mvp + 1); + *mvp++; + } + *mvp = (char) 0x00; + p = nextval; + } + else + { + p = nextval + 1; + break; + } + + } + + /* more args available */ if (nextval) { *nextval = (char) 0x00; return ++nextval; } - // no more args after this, jump to EOS + /* no more args after this, jump to EOS */ nextval = src + strlen(src); return nextval; } -char * -toupper(char* p) +void +toupper_str(char *p) { - while( *p ){ - if( (*p >= 'a') && (*p <= 'z') ) - *p = *p - 32; + while (*p) + { + if ((*p >= 'a') && (*p <= 'z')) + *p = toupper((int) *p); p++; } } @@ -782,43 +886,35 @@ #define LTOA_BUFSIZE (sizeof(long) * 8 + 1) char * -ltoa(long N, int base) +l_to_a(long N, int base) { static char ret[LTOA_BUFSIZE]; - register int i = 2; - long uarg; - char *tail, *head = ret, buf[LTOA_BUFSIZE]; + char *head = ret, buf[LTOA_BUFSIZE], *tail = buf + sizeof(buf); - if (36 < base || 2 > base) - base = 10; + register int divrem; - tail = &buf[LTOA_BUFSIZE - 1]; - *tail-- = '\0'; + if (base < 36 || 2 > base) + base = 10; - if (10 == base && N < 0L) + if (N < 0) { *head++ = '-'; - uarg = -N; + N = -N; } - else - uarg = N; - if (uarg) - { - for (i = 1; uarg; ++i) - { - register ldiv_t r; + tail = buf + sizeof(buf); + *--tail = 0; - r = ldiv(uarg, base); - *tail-- = (char) (r.rem + ((9L < r.rem) ? ('A' - 10L) : '0')); - uarg = r.quot; - } + do + { + divrem = N % base; + *--tail = (divrem <= 9) ? divrem + '0' : divrem + 'a' - 10; + N /= base; } - else - *tail-- = '0'; + while (N); - memcpy(head, ++tail, i); + strcpy(head, tail); return ret; }