/[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 871 by stargo, Wed Mar 30 19:51:41 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 */
31  #include <errno.h>  #include <errno.h>
32  #include "rdesktop.h"  #include "rdesktop.h"
33    
 #ifdef HAVE_ICONV  
34  #ifdef HAVE_LOCALE_H  #ifdef HAVE_LOCALE_H
35  #include <locale.h>  #include <locale.h>
36  #endif  #endif
37    #ifdef HAVE_ICONV
38  #ifdef HAVE_LANGINFO_H  #ifdef HAVE_LANGINFO_H
39  #include <langinfo.h>  #include <langinfo.h>
40  #endif  #endif
41  #endif  #endif
42    
43  #ifdef EGD_SOCKET  #ifdef EGD_SOCKET
44    #include <sys/types.h>
45  #include <sys/socket.h>         /* socket connect */  #include <sys/socket.h>         /* socket connect */
46  #include <sys/un.h>             /* sockaddr_un */  #include <sys/un.h>             /* sockaddr_un */
47  #endif  #endif
# Line 49  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[16];  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 */
57    int g_keyboard_subtype = 0x0;   /* Defaults to US keyboard layout */
58    int g_keyboard_functionkeys = 0xc;      /* Defaults to US keyboard layout */
59    
60  int g_width = 800;              /* width is special: If 0, the  int g_width = 800;              /* width is special: If 0, the
61                                     geometry will be fetched from                                     geometry will be fetched from
# Line 170  usage(char *program) Line 175  usage(char *program)
175          fprintf(stderr, "   -5: use RDP version 5 (default)\n");          fprintf(stderr, "   -5: use RDP version 5 (default)\n");
176  }  }
177    
178  void  static void
179  print_disconnect_reason(uint16 reason)  print_disconnect_reason(uint16 reason)
180  {  {
181          char *text;          char *text;
# Line 369  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 = NULL;
378          int username_option = 0;          int username_option = 0;
379    
380    #ifdef HAVE_LOCALE_H
381            /* Set locale according to environment */
382            locale = setlocale(LC_ALL, "");
383            if (locale)
384            {
385                    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;
         strcpy(keymapname, "en-us");  
397          g_embed_wnd = 0;          g_embed_wnd = 0;
398    
399          g_num_devices = 0;          g_num_devices = 0;
# Line 573  main(int argc, char *argv[]) Line 591  main(int argc, char *argv[])
591    
592                          case 'z':                          case 'z':
593                                  DEBUG(("rdp compression enabled\n"));                                  DEBUG(("rdp compression enabled\n"));
594                                  flags |= RDP_COMPRESSION;                                  flags |= (RDP_LOGON_COMPRESSION | RDP_LOGON_COMPRESSION2);
595                                  break;                                  break;
596    
597                          case 'x':                          case 'x':
# Line 739  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 ((flags & RDP_COMPRESSION) && (g_server_bpp > 8))          if (keymapname[0] == 0)
761          {          {
762                  warning("rdp compression not supported for bpp > 8, compression disabled\n");                  if (locale && xkeymap_from_locale(locale))
763                  flags ^= RDP_COMPRESSION;                  {
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;
Legend:
Removed from v.871  
changed lines
  Added in v.973
  ViewVC Help
Powered by ViewVC 1.1.26