/[rdesktop]/sourceforge.net/trunk/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/trunk/rdesktop/rdesktop.c

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

revision 82 by astrand, Tue Jul 30 07:18:48 2002 UTC revision 107 by astrand, Sun Sep 1 11:27:58 2002 UTC
# Line 2  Line 2 
2     rdesktop: A Remote Desktop Protocol client.     rdesktop: A Remote Desktop Protocol client.
3     Entrypoint and utility functions     Entrypoint and utility functions
4     Copyright (C) Matthew Chapman 1999-2001     Copyright (C) Matthew Chapman 1999-2001
5      
6     This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
7     it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
8     the Free Software Foundation; either version 2 of the License, or     the Free Software Foundation; either version 2 of the License, or
9     (at your option) any later version.     (at your option) any later version.
10      
11     This program is distributed in the hope that it will be useful,     This program is distributed in the hope that it will be useful,
12     but WITHOUT ANY WARRANTY; without even the implied warranty of     but WITHOUT ANY WARRANTY; without even the implied warranty of
13     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14     GNU General Public License for more details.     GNU General Public License for more details.
15      
16     You should have received a copy of the GNU General Public License     You should have received a copy of the GNU General Public License
17     along with this program; if not, write to the Free Software     along with this program; if not, write to the Free Software
18     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Line 29  Line 29 
29  #include <sys/times.h>          /* times */  #include <sys/times.h>          /* times */
30  #include "rdesktop.h"  #include "rdesktop.h"
31    
32    char title[32] = "";
33  char username[16];  char username[16];
34  char hostname[16];  char hostname[16];
35  char keymapname[16];  char keymapname[16];
# Line 55  usage(char *program) Line 56  usage(char *program)
56          printf("   -s: shell\n");          printf("   -s: shell\n");
57          printf("   -c: working directory\n");          printf("   -c: working directory\n");
58          printf("   -p: password (autologon)\n");          printf("   -p: password (autologon)\n");
59            printf("   -P: askpass-program (autologon)\n");
60          printf("   -n: client hostname\n");          printf("   -n: client hostname\n");
61          printf("   -k: keyboard layout on terminal server (us,sv,gr etc.)\n");          printf("   -k: keyboard layout on terminal server (us,sv,gr etc.)\n");
62          printf("   -g: desktop geometry (WxH)\n");          printf("   -g: desktop geometry (WxH)\n");
# Line 65  usage(char *program) Line 67  usage(char *program)
67          printf("   -l: do not request licence\n");          printf("   -l: do not request licence\n");
68          printf("   -t: rdp tcp port\n");          printf("   -t: rdp tcp port\n");
69          printf("   -K: keep window manager key bindings\n");          printf("   -K: keep window manager key bindings\n");
70            printf("   -w: window title\n");
71  }  }
72    
73  /* Client program */  /* Client program */
# Line 74  main(int argc, char *argv[]) Line 77  main(int argc, char *argv[])
77          char fullhostname[64];          char fullhostname[64];
78          char domain[16];          char domain[16];
79          char password[16];          char password[16];
80            char *askpass_result;
81          char shell[32];          char shell[32];
82          char directory[32];          char directory[32];
         char title[32];  
83          struct passwd *pw;          struct passwd *pw;
84          char *server, *p;          char *server, *p;
85          uint32 flags;          uint32 flags;
# Line 90  main(int argc, char *argv[]) Line 93  main(int argc, char *argv[])
93          domain[0] = password[0] = shell[0] = directory[0] = 0;          domain[0] = password[0] = shell[0] = directory[0] = 0;
94          strcpy(keymapname, "us");          strcpy(keymapname, "us");
95    
96          while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:t:fbemlKh?")) != -1)          while ((c = getopt(argc, argv, "u:d:s:c:p:P:n:k:g:t:fbemlKw:h?")) != -1)
97          {          {
98                  switch (c)                  switch (c)
99                  {                  {
# Line 115  main(int argc, char *argv[]) Line 118  main(int argc, char *argv[])
118                                  flags |= RDP_LOGON_AUTO;                                  flags |= RDP_LOGON_AUTO;
119                                  break;                                  break;
120    
121                            case 'P':
122                                    askpass_result = askpass(optarg, "Enter password");
123                                    if (askpass_result == NULL)
124                                            exit(1);
125    
126                                    STRNCPY(password, askpass_result, sizeof(password));
127                                    free(askpass_result);
128                                    flags |= RDP_LOGON_AUTO;
129                                    break;
130    
131                          case 'n':                          case 'n':
132                                  STRNCPY(hostname, optarg, sizeof(hostname));                                  STRNCPY(hostname, optarg, sizeof(hostname));
133                                  break;                                  break;
# Line 163  main(int argc, char *argv[]) Line 176  main(int argc, char *argv[])
176                                  grab_keyboard = False;                                  grab_keyboard = False;
177                                  break;                                  break;
178    
179                            case 'w':
180                                    strncpy(title, optarg, sizeof(title));
181                                    break;
182    
183                          case 'h':                          case 'h':
184                          case '?':                          case '?':
185                          default:                          default:
# Line 222  main(int argc, char *argv[]) Line 239  main(int argc, char *argv[])
239                  width = 800;                  width = 800;
240                  height = 600;                  height = 600;
241          }          }
242            else
243            {
244                    /* make sure width is a multiple of 4 */
245                    width = (width + 3) & ~3;
246            }
247    
248          strcpy(title, "rdesktop - ");          if (!strlen(title))
249          strncat(title, server, sizeof(title) - sizeof("rdesktop - "));          {
250                    strcpy(title, "rdesktop - ");
251                    strncat(title, server, sizeof(title) - sizeof("rdesktop - "));
252            }
253    
254          xkeymap_init1();          xkeymap_init1();
255          if (!ui_init())          if (!ui_init())
# Line 235  main(int argc, char *argv[]) Line 260  main(int argc, char *argv[])
260    
261          printf("Connection successful.\n");          printf("Connection successful.\n");
262    
263          if (ui_create_window(title))          if (ui_create_window())
264          {          {
265                  rdp_main_loop();                  rdp_main_loop();
266                  ui_destroy_window();                  ui_destroy_window();

Legend:
Removed from v.82  
changed lines
  Added in v.107

  ViewVC Help
Powered by ViewVC 1.1.26