Changeset 84538 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

May 26, 2020 1:25:05 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138267

Message:

bugref:9637

• Renaming vmsvga-x11 service to vmsvga service
• Replacing display-svga.cpp with display-wayland.cpp

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (3 diffs)
• display-wayland.cpp (moved) (moved from trunk/src/VBox/Additions/x11/VBoxClient/display-svga.cpp ) (5 diffs)
• main.cpp (modified) (5 diffs)

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

@@ -26 +26 @@
 #
 PROGRAMS += VBoxClient
+PROGRAMS += VBoxWaylandClient
 
 VBoxClient_TEMPLATE = NewVBoxGuestR3Exe
@@ -41 +42 @@
 VBoxClient_SOURCES = \
         main.cpp \
-        display-svga.cpp \
         display-svga-x11.cpp \
         seamless.cpp \
@@ -47 +47 @@
         logging.cpp \
         hostversion.cpp
+
+VBoxWaylandClient_TEMPLATE = NewVBoxGuestR3Exe
+VBoxWaylandClient_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
+VBoxWaylandClient_SOURCES = \
+    display-wayland.cpp \
+    logging.cpp
+
 
 VBoxClient_SOURCES.linux = \

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

@@ -49 +49 @@
 #include <stdio.h>
 
+
 /** Maximum number of supported screens.  DRM and X11 both limit this to 32. */
 /** @todo if this ever changes, dynamically allocate resizeable arrays in the
@@ -63 +64 @@
 
 #define DRM_DRIVER_NAME "vmwgfx"
+
+/** Counter of how often our daemon has been respawned. */
+unsigned      g_cRespawn = 0;
+/** Logging verbosity level. */
+unsigned      g_cVerbosity = 0;
 
 /** DRM version structure. */
@@ -167 +173 @@
 }
 
-static const char *getName()
-{
-    return "Display SVGA";
-}
-
-static const char *getPidFilePath()
-{
-    return ".vboxclient-display-svga.pid";
-}
-
-static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
-{
-    (void)ppInterface;
-    (void)fDaemonised;
+int main()
+{
     struct DRMCONTEXT drmContext = { NIL_RTFILE };
     static struct VMMDevDisplayDef aMonitors[VMW_MAX_HEADS];
@@ -199 +193 @@
     if (RT_FAILURE(rc))
         VBClLogFatalError("Failed to register resizing support, rc=%Rrc\n", rc);
+
     for (;;)
     {
@@ -262 +257 @@
             VBClLogFatalError("Failure waiting for event, rc=%Rrc\n", rc);
     }
+    return 0;
 }
-
-static struct VBCLSERVICE interface =
-{
-    getName,
-    getPidFilePath,
-    VBClServiceDefaultHandler, /* Init */
-    run,
-    VBClServiceDefaultCleanup
-}, *pInterface = &interface;
-
-struct VBCLSERVICE **VBClDisplaySVGAService()
-{
-    return &pInterface;
-}

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

@@ -48 +48 @@
 #define VBOXCLIENT_OPT_SEAMLESS             VBOXCLIENT_OPT_SERVICES + 3
 #define VBOXCLIENT_OPT_VMSVGA               VBOXCLIENT_OPT_SERVICES + 4
-#define VBOXCLIENT_OPT_VMSVGA_X11           VBOXCLIENT_OPT_SERVICES + 5
 
 
@@ -175 +174 @@
 #endif
              "--seamless|"
-             "--vmsvga|--vmsvga-x11"
+             "--vmsvga"
              "[-d|--nodaemon]\n", pcszFileName);
     RTPrintf("Starts the VirtualBox DRM/X Window System guest services.\n\n");
@@ -189 +188 @@
 #endif
     RTPrintf("  --seamless         starts the seamless windows service\n");
-    RTPrintf("  --vmsvga           starts VMSVGA dynamic resizing for DRM\n");
-    RTPrintf("  --vmsvga-x11       starts VMSVGA dynamic resizing for X11\n");
+    RTPrintf("  --vmsvga           starts VMSVGA dynamic resizing for x11/Wayland guests\n");
     RTPrintf("  -f, --foreground   run in the foreground (no daemonizing)\n");
     RTPrintf("  -d, --nodaemon     continues running as a system service\n");
@@ -252 +250 @@
         { "--seamless",                     VBOXCLIENT_OPT_SEAMLESS,                  RTGETOPT_REQ_NOTHING },
         { "--vmsvga",                       VBOXCLIENT_OPT_VMSVGA,                    RTGETOPT_REQ_NOTHING },
-        { "--vmsvga-x11",                   VBOXCLIENT_OPT_VMSVGA_X11,                RTGETOPT_REQ_NOTHING }
     };
 
@@ -351 +348 @@
 
             case VBOXCLIENT_OPT_VMSVGA:
-            {
-                if (g_pService)
-                    return vbclSyntaxOnlyOneService();
-                g_pService = VBClDisplaySVGAService();
-                break;
-            }
-
-            case VBOXCLIENT_OPT_VMSVGA_X11:
             {
                 if (g_pService)