/[rdesktop]/sourceforge.net/branches/seamlessrdp-branch/rdesktop/rdesktop.c
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /sourceforge.net/branches/seamlessrdp-branch/rdesktop/rdesktop.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 848 by jsorg71, Sun Mar 13 03:29:19 2005 UTC revision 855 by stargo, Sun Mar 13 13:18:48 2005 UTC
# Line 30  Line 30 
30  #include <errno.h>  #include <errno.h>
31  #include "rdesktop.h"  #include "rdesktop.h"
32    
33    #ifdef HAVE_ICONV
34    #include <locale.h>
35    #include <langinfo.h>
36    #endif
37    
38  #ifdef EGD_SOCKET  #ifdef EGD_SOCKET
39  #include <sys/socket.h>         /* socket connect */  #include <sys/socket.h>         /* socket connect */
40  #include <sys/un.h>             /* sockaddr_un */  #include <sys/un.h>             /* sockaddr_un */
# Line 79  uint32 g_rdp5_performanceflags = Line 84  uint32 g_rdp5_performanceflags =
84  BOOL g_rdpsnd = False;  BOOL g_rdpsnd = False;
85  #endif  #endif
86    
87    #ifdef HAVE_ICONV
88    char g_codepage[16] = "";
89    #endif
90    
91  extern RDPDR_DEVICE g_rdpdr_device[];  extern RDPDR_DEVICE g_rdpdr_device[];
92  extern uint32 g_num_devices;  extern uint32 g_num_devices;
93  extern char *g_rdpdr_clientname;  extern char *g_rdpdr_clientname;
# Line 113  usage(char *program) Line 122  usage(char *program)
122          fprintf(stderr, "   -g: desktop geometry (WxH)\n");          fprintf(stderr, "   -g: desktop geometry (WxH)\n");
123          fprintf(stderr, "   -f: full-screen mode\n");          fprintf(stderr, "   -f: full-screen mode\n");
124          fprintf(stderr, "   -b: force bitmap updates\n");          fprintf(stderr, "   -b: force bitmap updates\n");
125    #ifdef HAVE_ICONV
126            fprintf(stderr, "   -L: local codepage\n");
127    #endif
128          fprintf(stderr, "   -B: use BackingStore of X-server (if available)\n");          fprintf(stderr, "   -B: use BackingStore of X-server (if available)\n");
129          fprintf(stderr, "   -e: disable encryption (French TS)\n");          fprintf(stderr, "   -e: disable encryption (French TS)\n");
130          fprintf(stderr, "   -E: disable encryption from client to server\n");          fprintf(stderr, "   -E: disable encryption from client to server\n");
# Line 367  main(int argc, char *argv[]) Line 379  main(int argc, char *argv[])
379  #endif  #endif
380    
381          while ((c = getopt(argc, argv,          while ((c = getopt(argc, argv,
382                             VNCOPT "u:d:s:c:p:n:k:g:fbBeEmzCDKS:T:NX:a:x:Pr:045h?")) != -1)                             VNCOPT "u:L:d:s:c:p:n:k:g:fbBeEmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
383          {          {
384                  switch (c)                  switch (c)
385                  {                  {
# Line 390  main(int argc, char *argv[]) Line 402  main(int argc, char *argv[])
402                                  username_option = 1;                                  username_option = 1;
403                                  break;                                  break;
404    
405                            case 'L':
406    #ifdef HAVE_ICONV
407                                    STRNCPY(g_codepage, optarg, sizeof(g_codepage));
408    #else
409                                    error("iconv support not available\n");
410    #endif
411                                    break;
412    
413                          case 'd':                          case 'd':
414                                  STRNCPY(domain, optarg, sizeof(domain));                                  STRNCPY(domain, optarg, sizeof(domain));
415                                  break;                                  break;
# Line 676  main(int argc, char *argv[]) Line 696  main(int argc, char *argv[])
696                  STRNCPY(g_username, pw->pw_name, sizeof(g_username));                  STRNCPY(g_username, pw->pw_name, sizeof(g_username));
697          }          }
698    
699    #ifdef HAVE_ICONV
700            if (g_codepage[0] == 0)
701            {
702                    if (setlocale(LC_CTYPE, ""))
703                    {
704                            STRNCPY(g_codepage, nl_langinfo(CODESET), sizeof(g_codepage));
705                    }
706                    else
707                    {
708                            STRNCPY(g_codepage, DEFAULT_CODEPAGE, sizeof(g_codepage));
709                    }
710            }
711    #endif
712    
713          if (g_hostname[0] == 0)          if (g_hostname[0] == 0)
714          {          {
715                  if (gethostname(fullhostname, sizeof(fullhostname)) == -1)                  if (gethostname(fullhostname, sizeof(fullhostname)) == -1)
Legend:
Removed from v.848  
changed lines
  Added in v.855
  ViewVC Help
Powered by ViewVC 1.1.26