Changeset 55123 in vbox for trunk/src/VBox/RDP/client-1.8.3/rdesktop.c

Timestamp:

Apr 8, 2015 9:40:02 AM (10 years ago)

Author:

vboxsync

Message:

rdesktop 1.8.3 modified for VBox

File:

• trunk/src/VBox/RDP/client-1.8.3/rdesktop.c (modified) (16 diffs)

trunk/src/VBox/RDP/client-1.8.3/rdesktop.c

@@ -19 +19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+/*
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
+ * the General Public License version 2 (GPLv2) at this time for any software where
+ * a choice of GPL license versions is made available with the language indicating
+ * that GPLv2 or any later version may be used, or where a choice of which version
+ * of the GPL is applied is otherwise unspecified.
+ */
 
 #include <stdarg.h>             /* va_list va_start va_end */
@@ -33 +42 @@
 #include <signal.h>
 #include "rdesktop.h"
+
+#ifdef VBOX
+# include <VBox/version.h>
+# include <iprt/log.h>
+#endif
 
 #ifdef HAVE_LOCALE_H
@@ -102 +116 @@
 RD_BOOL g_rdpclip = True;
 RD_BOOL g_console_session = False;
+#ifndef VBOX
 RD_BOOL g_numlock_sync = False;
+#else /* VBOX */
+/* Always use numlock synchronization with VRDP. */
+RD_BOOL g_numlock_sync = True;
+#endif /* VBOX */
 RD_BOOL g_lspci_enabled = False;
 RD_BOOL g_owncolmap = False;
@@ -142 +161 @@
 #endif
 
+#ifdef WITH_RDPUSB
+RD_BOOL g_rdpusb = False;
+#endif
+
+#ifdef WITH_BIRD_VD_HACKS
+RD_BOOL g_keep_virtual_desktop_shortcuts = False;
+#endif
+
 #ifdef HAVE_ICONV
 char g_codepage[16] = "";
@@ -169 +196 @@
         fprintf(stderr,
                 "Version " PACKAGE_VERSION ". Copyright (C) 1999-2011 Matthew Chapman et al.\n");
+#ifdef VBOX
+        fprintf(stderr, "Modified for VirtualBox by " VBOX_VENDOR "\n");
+#endif
         fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");
 
@@ -231 +261 @@
         rdpsnd_show_help();
 #endif
+#ifdef WITH_RDPUSB
+        fprintf(stderr, 
+                "         '-r usb': enable USB redirection\n");
+#endif
         fprintf(stderr,
                 "         '-r clipboard:[off|PRIMARYCLIPBOARD|CLIPBOARD]': enable clipboard\n");
@@ -256 +290 @@
         fprintf(stderr, "   -4: use RDP version 4\n");
         fprintf(stderr, "   -5: use RDP version 5 (default)\n");
+#ifdef WITH_BIRD_VD_HACKS
+    fprintf(stderr, "   -H keep-virtual-desktop-shortcuts: Keep keyboard shortcuts typical\n"
+                    "      for switching virtual desktops (C-A-Left/Right). \n");
+#endif
 #ifdef WITH_SCARD
         fprintf(stderr, "   -o: name=value: Adds an additional option to rdesktop.\n");
@@ -516 +554 @@
 
 }
+
+#ifdef VBOX
+/* This disables iprt logging */
+DECLEXPORT(PRTLOGGER) RTLogDefaultInit(void)
+{
+    return NULL;
+}
+#endif
 
 /* Client program */
@@ -571 +617 @@
 #define VNCOPT
 #endif
+#ifdef WITH_BIRD_VD_HACKS
+#define VDHOPT "H:"
+#else
+#define VDHOPT
+#endif
+
         while ((c = getopt(argc, argv,
-                           VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
+                           VNCOPT VDHOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
         {
                 switch (c)
@@ -853 +905 @@
 #endif
                                         }
+                                }
+                                else if (str_startswith(optarg, "usb"))
+                                {
+#ifdef WITH_RDPUSB
+                                        g_rdpusb = True;
+#else
+                                        warning("Not compiled with USB support\n");
+#endif
                                 }
                                 else if (str_startswith(optarg, "disk"))
@@ -950 +1010 @@
                                 break;
 #endif
+
+#ifdef WITH_BIRD_VD_HACKS
+                        case 'H': /* hacks */
+                                if (!strcmp(optarg, "keep-virtual-desktop-shortcuts"))
+                                        g_keep_virtual_desktop_shortcuts = True;
+                                else
+                                        error("Unknown -H argument\n\n\tPossible argument is: keep-virtual-desktop-shortcuts\n");
+                                break;
+#endif
+
                         case 'h':
                         case '?':
@@ -1111 +1181 @@
 #endif
 
-        if (g_lspci_enabled)
+#ifdef WITH_RDPUSB
+        if (g_rdpusb)
+                rdpusb_init();
+#endif
+
+        if (g_lspci_enabled)
                 lspci_init();
 
@@ -1215 +1290 @@
         cache_save_state();
         ui_deinit();
+
+#ifdef WITH_RDPUSB
+        if (g_rdpusb)
+                rdpusb_close();
+#endif
 
         if (g_user_quit)
@@ -1794 +1874 @@
                 return False;
 
+#ifdef VBOX
+        snprintf(bmpcache_dir, sizeof(bmpcache_dir), "%s/%s", home, ".rdesktop");
+#else
         sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop");
+#endif
 
         if ((mkdir(bmpcache_dir, S_IRWXU) == -1) && errno != EEXIST)
@@ -1802 +1886 @@
         }
 
+#ifdef VBOX
+        snprintf(bmpcache_dir, sizeof(bmpcache_dir), "%s/%s", home, ".rdesktop/cache");
+#else
         sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop/cache");
+#endif
 
         if ((mkdir(bmpcache_dir, S_IRWXU) == -1) && errno != EEXIST)
@@ -1824 +1912 @@
         if (home == NULL)
                 return -1;
+#ifdef VBOX
+        snprintf(fn, sizeof(fn), "%s/.rdesktop/%s", home, filename);
+#else
         sprintf(fn, "%s/.rdesktop/%s", home, filename);
+#endif
         fd = open(fn, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
         if (fd == -1)