/[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 968 by astrand, Thu Aug 4 11:19:06 2005 UTC revision 973 by astrand, Thu Aug 4 12:44:10 2005 UTC
# Line 27  Line 27 
27  #include <sys/time.h>           /* gettimeofday */  #include <sys/time.h>           /* gettimeofday */
28  #include <sys/times.h>          /* times */  #include <sys/times.h>          /* times */
29  #include <ctype.h>              /* toupper */  #include <ctype.h>              /* toupper */
30  #include <limits.h>             /* PATH_MAX */  #include <limits.h>             /* PATH_MAX */
31  #include <errno.h>  #include <errno.h>
32  #include "rdesktop.h"  #include "rdesktop.h"
33    
# Line 51  Line 51 
51  char g_title[64] = "";  char g_title[64] = "";
52  char g_username[64];  char g_username[64];
53  char g_hostname[16];  char g_hostname[16];
54  char keymapname[PATH_MAX] = "en-us";  char keymapname[PATH_MAX] = "";
55  int g_keylayout = 0x409;        /* Defaults to US keyboard layout */  int g_keylayout = 0x409;        /* Defaults to US keyboard layout */
56  int g_keyboard_type = 0x4;      /* Defaults to US keyboard layout */  int g_keyboard_type = 0x4;      /* Defaults to US keyboard layout */
57  int g_keyboard_subtype = 0x0;   /* Defaults to US keyboard layout */  int g_keyboard_subtype = 0x0;   /* Defaults to US keyboard layout */
# Line 374  main(int argc, char *argv[]) Line 374  main(int argc, char *argv[])
374          uint32 flags, ext_disc_reason = 0;          uint32 flags, ext_disc_reason = 0;
375          char *p;          char *p;
376          int c;          int c;
377          char *locale;          char *locale = NULL;
378          int username_option = 0;          int username_option = 0;
379    
380    #ifdef HAVE_LOCALE_H
381          /* Set locale according to environment */          /* Set locale according to environment */
382          locale = setlocale(LC_ALL, "");          locale = setlocale(LC_ALL, "");
383          if (locale)          if (locale)
384          {          {
385                  xkeymap_from_locale(locale);                  locale = strdup(locale);
386                    if (locale == NULL)
387                    {
388                            perror("strdup");
389                            exit(1);
390                    }
391          }          }
392    
393    #endif
394          flags = RDP_LOGON_NORMAL;          flags = RDP_LOGON_NORMAL;
395          prompt_password = False;          prompt_password = False;
396          domain[0] = password[0] = shell[0] = directory[0] = 0;          domain[0] = password[0] = shell[0] = directory[0] = 0;
# Line 750  main(int argc, char *argv[]) Line 757  main(int argc, char *argv[])
757                  STRNCPY(g_hostname, fullhostname, sizeof(g_hostname));                  STRNCPY(g_hostname, fullhostname, sizeof(g_hostname));
758          }          }
759    
760            if (keymapname[0] == 0)
761            {
762                    if (locale && xkeymap_from_locale(locale))
763                    {
764                            fprintf(stderr, "Autoselected keyboard map %s\n", keymapname);
765                    }
766                    else
767                    {
768                            STRNCPY(keymapname, "en-us", sizeof(keymapname));
769                    }
770            }
771            if (locale)
772                    xfree(locale);
773    
774    
775          if (prompt_password && read_password(password, sizeof(password)))          if (prompt_password && read_password(password, sizeof(password)))
776                  flags |= RDP_LOGON_AUTO;                  flags |= RDP_LOGON_AUTO;
777    
Legend:
Removed from v.968  
changed lines
  Added in v.973
  ViewVC Help
Powered by ViewVC 1.1.26