/[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 867 by stargo, Wed Mar 23 12:25:54 2005 UTC revision 962 by astrand, Wed Aug 3 09:56:17 2005 UTC
# Line 30  Line 30 
30  #include <errno.h>  #include <errno.h>
31  #include "rdesktop.h"  #include "rdesktop.h"
32    
 #ifdef HAVE_ICONV  
33  #ifdef HAVE_LOCALE_H  #ifdef HAVE_LOCALE_H
34  #include <locale.h>  #include <locale.h>
35  #endif  #endif
36    #ifdef HAVE_ICONV
37  #ifdef HAVE_LANGINFO_H  #ifdef HAVE_LANGINFO_H
38  #include <langinfo.h>  #include <langinfo.h>
39  #endif  #endif
40  #endif  #endif
41    
42  #ifdef EGD_SOCKET  #ifdef EGD_SOCKET
43    #include <sys/types.h>
44  #include <sys/socket.h>         /* socket connect */  #include <sys/socket.h>         /* socket connect */
45  #include <sys/un.h>             /* sockaddr_un */  #include <sys/un.h>             /* sockaddr_un */
46  #endif  #endif
# Line 49  Line 50 
50  char g_title[64] = "";  char g_title[64] = "";
51  char g_username[64];  char g_username[64];
52  char g_hostname[16];  char g_hostname[16];
53  char keymapname[16];  char keymapname[PATH_MAX] = "en-us";
54  int g_keylayout = 0x409;        /* Defaults to US keyboard layout */  int g_keylayout = 0x409;        /* Defaults to US keyboard layout */
55    
56  int g_width = 800;              /* width is special: If 0, the  int g_width = 800;              /* width is special: If 0, the
# Line 170  usage(char *program) Line 171  usage(char *program)
171          fprintf(stderr, "   -5: use RDP version 5 (default)\n");          fprintf(stderr, "   -5: use RDP version 5 (default)\n");
172  }  }
173    
174  void  static void
175  print_disconnect_reason(uint16 reason)  print_disconnect_reason(uint16 reason)
176  {  {
177          char *text;          char *text;
# Line 369  main(int argc, char *argv[]) Line 370  main(int argc, char *argv[])
370          uint32 flags, ext_disc_reason = 0;          uint32 flags, ext_disc_reason = 0;
371          char *p;          char *p;
372          int c;          int c;
373            char *locale;
374          int username_option = 0;          int username_option = 0;
375    
376            /* Set locale according to environment */
377            locale = setlocale(LC_ALL, "");
378            if (locale)
379            {
380                    xkeymap_from_locale(locale);
381            }
382    
383          flags = RDP_LOGON_NORMAL;          flags = RDP_LOGON_NORMAL;
384          prompt_password = False;          prompt_password = False;
385          domain[0] = password[0] = shell[0] = directory[0] = 0;          domain[0] = password[0] = shell[0] = directory[0] = 0;
         strcpy(keymapname, "en-us");  
386          g_embed_wnd = 0;          g_embed_wnd = 0;
387    
388          g_num_devices = 0;          g_num_devices = 0;
# Line 558  main(int argc, char *argv[]) Line 565  main(int argc, char *argv[])
565                                  break;                                  break;
566    
567                          case 'X':                          case 'X':
568                                  g_embed_wnd = strtol(optarg, NULL, 10);                                  g_embed_wnd = strtol(optarg, NULL, 0);
569                                  break;                                  break;
570    
571                          case 'a':                          case 'a':
# Line 573  main(int argc, char *argv[]) Line 580  main(int argc, char *argv[])
580    
581                          case 'z':                          case 'z':
582                                  DEBUG(("rdp compression enabled\n"));                                  DEBUG(("rdp compression enabled\n"));
583                                  flags |= RDP_COMPRESSION;                                  flags |= (RDP_LOGON_COMPRESSION | RDP_LOGON_COMPRESSION2);
584                                  break;                                  break;
585    
586                          case 'x':                          case 'x':
# Line 739  main(int argc, char *argv[]) Line 746  main(int argc, char *argv[])
746                  STRNCPY(g_hostname, fullhostname, sizeof(g_hostname));                  STRNCPY(g_hostname, fullhostname, sizeof(g_hostname));
747          }          }
748    
         if ((flags & RDP_COMPRESSION) && (g_server_bpp > 8))  
         {  
                 warning("rdp compression not supported for bpp > 8, compression disabled\n");  
                 flags ^= RDP_COMPRESSION;  
         }  
   
749          if (prompt_password && read_password(password, sizeof(password)))          if (prompt_password && read_password(password, sizeof(password)))
750                  flags |= RDP_LOGON_AUTO;                  flags |= RDP_LOGON_AUTO;
751    
Legend:
Removed from v.867  
changed lines
  Added in v.962
  ViewVC Help
Powered by ViewVC 1.1.26