Changeset 100246 in vbox for trunk

Timestamp:

Jun 22, 2023 10:55:10 AM (18 months ago)

Author:

vboxsync

Message:

Additions: Linux: Added a skeleton for Wayland service, bugref:10194.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxClient.h (modified) (1 diff)
• main.cpp (modified) (4 diffs)
• wayland-helper-dcp.cpp (added)
• wayland-helper-gtk.cpp (added)
• wayland-helper.h (added)
• wayland.cpp (added)

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

@@ -72 +72 @@
         main.cpp \
         logging.cpp
+
+ifdef VBOX_WITH_WAYLAND_ADDITIONS
+VBoxClient_DEFS += VBOX_WITH_WAYLAND_ADDITIONS
+VBoxClient_SOURCES += \
+        wayland-helper-dcp.cpp \
+        wayland-helper-gtk.cpp \
+        wayland.cpp
+endif
+
 VBoxClient_SOURCES += $(VBOX_GH_SOURCES)
 

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

@@ -133 +133 @@
 extern VBCLSERVICE g_SvcHostVersion;
 extern VBCLSERVICE g_SvcSeamless;
+# ifdef VBOX_WITH_WAYLAND_ADDITIONS
+extern VBCLSERVICE g_SvcWayland;
+# endif
 
 extern unsigned    g_cVerbosity;

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

@@ -66 +66 @@
 #define VBOXCLIENT_OPT_SESSION_DETECT       VBOXCLIENT_OPT_SERVICES + 7
 #define VBOXCLIENT_OPT_SESSION_TYPE         VBOXCLIENT_OPT_SERVICES + 8
+#define VBOXCLIENT_OPT_WAYLAND              VBOXCLIENT_OPT_SERVICES + 9
 
 
@@ -330 +331 @@
     RTPrintf("  --session-detect     detects and prints the current session type\n"
              "                       (exit code 0 if detection succeeded)\n");
+#ifdef VBOX_WITH_WAYLAND_ADDITIONS
+    RTPrintf("  --wayland            starts the shared clipboard and drag-and-drop services for Wayland\n");
+#endif
     RTPrintf("  -f, --foreground     run in the foreground (no daemonizing)\n");
     RTPrintf("  -d, --nodaemon       continues running as a system service\n");
@@ -538 +542 @@
 #endif
         { "--session-detect",               VBOXCLIENT_OPT_SESSION_DETECT,      RTGETOPT_REQ_NOTHING },
-        { "--session-type",                 VBOXCLIENT_OPT_SESSION_TYPE,        RTGETOPT_REQ_STRING }
+        { "--session-type",                 VBOXCLIENT_OPT_SESSION_TYPE,        RTGETOPT_REQ_STRING  },
+#ifdef VBOX_WITH_WAYLAND_ADDITIONS
+        { "--wayland",                      VBOXCLIENT_OPT_WAYLAND,             RTGETOPT_REQ_NOTHING }
+#endif
     };
 
@@ -705 +712 @@
                 break;
             }
+#ifdef VBOX_WITH_WAYLAND_ADDITIONS
+            case VBOXCLIENT_OPT_WAYLAND:
+            {
+                if (g_Service.pDesc)
+                    return vbclSyntaxOnlyOneService();
+                g_Service.pDesc = &g_SvcWayland;
+                break;
+            }
+#endif
 
             case VINF_GETOPT_NOT_OPTION: