Changeset 21922 in vbox

Timestamp:

Jul 31, 2009 6:01:58 PM (16 years ago)

Author:

vboxsync

Message:

Additions/x11: rename VBoxClient --autoresize to VBoxClient --display in preparation for making it handle mouse cursor switches too

Location:

trunk/src/VBox/Additions/x11

Files:

• Installer/98vboxadd-xclient (modified) (1 diff)
• VBoxClient/Makefile.kmk (modified) (1 diff)
• VBoxClient/VBoxClient.h (modified) (1 diff)
• VBoxClient/display.cpp (moved) (moved from trunk/src/VBox/Additions/x11/VBoxClient/autoresize.cpp ) (5 diffs)
• VBoxClient/main.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/Installer/98vboxadd-xclient

@@ -19 +19 @@
 
 /usr/bin/VBoxClient --clipboard
-/usr/bin/VBoxClient --autoresize
+/usr/bin/VBoxClient --display
 /usr/bin/VBoxClient --seamless

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -58 +58 @@
         seamless-x11.cpp \
         thread.cpp \
-        autoresize.cpp
+        display.cpp
  VBoxClient_LIBS += \
         Xext Xmu

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -45 +45 @@
 extern Service *GetClipboardService();
 extern Service *GetSeamlessService();
-extern Service *GetAutoResizeService();
+extern Service *GetDisplayService();
 
 extern void CleanUp();

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * X11 guest client - display auto-resize.
+ * X11 guest client - display management.
  */
 
@@ -38 +38 @@
 #include "VBoxClient.h"
 
-static int initAutoResize()
+static int initDisplay()
 {
     int rc = VINF_SUCCESS;
@@ -62 +62 @@
 }
 
-void cleanupAutoResize(void)
+void cleanupDisplay(void)
 {
     LogFlowFunc(("\n"));
@@ -87 +87 @@
  * stale.
  */
-int runAutoResize()
+int runDisplay()
 {
     LogFlowFunc(("\n"));
@@ -125 +125 @@
 }
 
-class AutoResizeService : public VBoxClient::Service
+class DisplayService : public VBoxClient::Service
 {
 public:
     virtual const char *getPidFilePath()
     {
-        return ".vboxclient-autoresize.pid";
+        return ".vboxclient-display.pid";
     }
     virtual int run()
     {
-        int rc = initAutoResize();
+        int rc = initDisplay();
         if (RT_SUCCESS(rc))
-            rc = runAutoResize();
+            rc = runDisplay();
         return rc;
     }
     virtual void cleanup()
     {
-        cleanupAutoResize();
+        cleanupDisplay();
     }
 };
 
-VBoxClient::Service *VBoxClient::GetAutoResizeService()
+VBoxClient::Service *VBoxClient::GetDisplayService()
 {
-    return new AutoResizeService;
+    return new DisplayService;
 }

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -147 +147 @@
 void vboxClientUsage(const char *pcszFileName)
 {
-    RTPrintf("Usage: %s --clipboard|--autoresize|--seamless [-d|--nodaemon]\n", pcszFileName);
+    RTPrintf("Usage: %s --clipboard|--display|--seamless [-d|--nodaemon]\n", pcszFileName);
     RTPrintf("Start the VirtualBox X Window System guest services.\n\n");
     RTPrintf("Options:\n");
     RTPrintf("  --clipboard      start the shared clipboard service\n");
-    RTPrintf("  --autoresize     start the display auto-resize service\n");
+    RTPrintf("  --display     start the display management service\n");
     RTPrintf("  --seamless       start the seamless windows service\n");
     RTPrintf("  -d, --nodaemon   continue running as a system service\n");
@@ -190 +190 @@
                 fSuccess = false;
         }
-        else if (!strcmp(argv[i], "--autoresize"))
+        else if (!strcmp(argv[i], "--display"))
         {
             if (g_pService == NULL)
-                g_pService = VBoxClient::GetAutoResizeService();
+                g_pService = VBoxClient::GetDisplayService();
             else
                 fSuccess = false;