/[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 886 by stargo, Sat Apr 16 11:42:34 2005 UTC revision 974 by astrand, Thu Aug 4 12:50:15 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
# Line 50  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 85  BOOL g_console_session = False; Line 89  BOOL g_console_session = False;
89  BOOL g_numlock_sync = False;  BOOL g_numlock_sync = False;
90  BOOL g_owncolmap = False;  BOOL g_owncolmap = False;
91  BOOL g_ownbackstore = True;     /* We can't rely on external BackingStore */  BOOL g_ownbackstore = True;     /* We can't rely on external BackingStore */
 BOOL g_rdp_compression = False;  
92  uint32 g_embed_wnd;  uint32 g_embed_wnd;
93  uint32 g_rdp5_performanceflags =  uint32 g_rdp5_performanceflags =
94          RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;          RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS;
# Line 172  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 371  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 = xstrdup(locale);
386            }
387    
388    #endif
389          flags = RDP_LOGON_NORMAL;          flags = RDP_LOGON_NORMAL;
390          prompt_password = False;          prompt_password = False;
391          domain[0] = password[0] = shell[0] = directory[0] = 0;          domain[0] = password[0] = shell[0] = directory[0] = 0;
         strcpy(keymapname, "en-us");  
392          g_embed_wnd = 0;          g_embed_wnd = 0;
393    
394          g_num_devices = 0;          g_num_devices = 0;
# Line 575  main(int argc, char *argv[]) Line 586  main(int argc, char *argv[])
586    
587                          case 'z':                          case 'z':
588                                  DEBUG(("rdp compression enabled\n"));                                  DEBUG(("rdp compression enabled\n"));
589                                  flags |= RDP_COMPRESSION;                                  flags |= (RDP_LOGON_COMPRESSION | RDP_LOGON_COMPRESSION2);
                                 g_rdp_compression = True;  
590                                  break;                                  break;
591    
592                          case 'x':                          case 'x':
# Line 742  main(int argc, char *argv[]) Line 752  main(int argc, char *argv[])
752                  STRNCPY(g_hostname, fullhostname, sizeof(g_hostname));                  STRNCPY(g_hostname, fullhostname, sizeof(g_hostname));
753          }          }
754    
755            if (keymapname[0] == 0)
756            {
757                    if (locale && xkeymap_from_locale(locale))
758                    {
759                            fprintf(stderr, "Autoselected keyboard map %s\n", keymapname);
760                    }
761                    else
762                    {
763                            STRNCPY(keymapname, "en-us", sizeof(keymapname));
764                    }
765            }
766            if (locale)
767                    xfree(locale);
768    
769    
770          if (prompt_password && read_password(password, sizeof(password)))          if (prompt_password && read_password(password, sizeof(password)))
771                  flags |= RDP_LOGON_AUTO;                  flags |= RDP_LOGON_AUTO;
772    
# Line 909  xmalloc(int size) Line 934  xmalloc(int size)
934                  exit(1);                  exit(1);
935          }          }
936          return mem;          return mem;
937    }
938    
939    /* strdup */
940    char *
941    xstrdup(const char *s)
942    {
943            char *mem = strdup(s);
944            if (mem == NULL)
945            {
946                    perror("strdup");
947                    exit(1);
948            }
949            return mem;
950  }  }
951    
952  /* realloc; exit if out of memory */  /* realloc; exit if out of memory */
Legend:
Removed from v.886  
changed lines
  Added in v.974
  ViewVC Help
Powered by ViewVC 1.1.26