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

Timestamp:

May 5, 2023 9:08:00 AM (23 months ago)

Author:

vboxsync

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

157146

Message:

Guest / Host: Renamed SessionType -> DisplayServerType (better naming to reflect its purpose). bugref:10427

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxClient.h (modified) (2 diffs)
• clipboard.cpp (modified) (2 diffs)
• display-helper-gnome3.cpp (modified) (2 diffs)
• display-svga-x11.cpp (modified) (1 diff)
• draganddrop.cpp (modified) (1 diff)
• main.cpp (modified) (5 diffs)
• seamless.cpp (modified) (1 diff)
• testcase/tstSeamlessX11.cpp (modified) (2 diffs)

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

@@ -52 +52 @@
 VBOX_GH_SOURCES := \
         $(PATH_ROOT)/src/VBox/GuestHost/Log.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SessionType.cpp
+        $(PATH_ROOT)/src/VBox/GuestHost/DisplayServerType.cpp
 
 VBoxClient_TEMPLATE = VBoxGuestR3Exe

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

@@ -38 +38 @@
 
 #include <VBox/GuestHost/Log.h>
-#include <VBox/GuestHost/SessionType.h>
+#include <VBox/GuestHost/DisplayServerType.h>
 
 int VBClShowNotify(const char *pszHeader, const char *pszBody);
@@ -54 +54 @@
 extern void VBClShutdown(bool fExit = true);
 
-extern VBGHSESSIONTYPE VBClGetSessionType(void);
+extern VBGHDISPLAYSERVERTYPE VBClGetDisplayServerType(void);
 
 /**

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

@@ -83 +83 @@
     int rc = VINF_SUCCESS;
 
-    if (VBClGetSessionType() == VBGHSESSIONTYPE_X11)
+    if (VBClGetDisplayServerType() == VBGHDISPLAYSERVERTYPE_X11)
     {
         rc = VBClX11ClipboardInit();
@@ -95 +95 @@
     }
 #if 0
-    else (VBClGetSessionType() == VBGHSESSIONTYPE_WAYLAND)
+    else (VBClGetSessionType() == GHDISPLAYSERVERTYPE_WAYLAND)
     {
 

trunk/src/VBox/Additions/x11/VBoxClient/display-helper-gnome3.cpp

@@ -982 +982 @@
     int rc;
 
-    if (VBClGetSessionType() == VBGHSESSIONTYPE_X11)
+    if (VBClGetDisplayServerType() == VBGHDISPLAYSERVERTYPE_X11)
     {
         rc = vbcl_hlp_generic_init();
@@ -998 +998 @@
     int rc;
 
-    if (VBClGetSessionType() == VBGHSESSIONTYPE_X11)
+    if (VBClGetDisplayServerType() == VBGHDISPLAYSERVERTYPE_X11)
     {
         rc = vbcl_hlp_generic_term();

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

@@ -581 +581 @@
     }
 
-    if (VBClGetSessionType() == VBGHSESSIONTYPE_WAYLAND)
+    if (VBClGetDisplayServerType() == VBGHDISPLAYSERVERTYPE_WAYLAND)
     {
         rc = VbglR3DrmClientStart();

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

@@ -42 +42 @@
 static DECLCALLBACK(int) vbclDnDInit(void)
 {
-    switch (VBClGetSessionType())
+    switch (VBClGetDisplayServerType())
     {
-        case VBGHSESSIONTYPE_X11:
+        case VBGHDISPLAYSERVERTYPE_X11:
             g_pSvc = new VBClX11DnDSvc();
             break;
 
-        case VBGHSESSIONTYPE_WAYLAND:
+        case VBGHDISPLAYSERVERTYPE_WAYLAND:
             RT_FALL_THROUGH();
         default:

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

@@ -114 +114 @@
 /** The file handle of parent process pidfile. */
 static RTFILE          g_hControlPidFile;
-/** The session type to use. */
-static VBGHSESSIONTYPE g_enmSessionType = VBGHSESSIONTYPE_AUTO;
+/** The display server type to use. */
+static VBGHDISPLAYSERVERTYPE g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_AUTO;
 
 /** Global critical section held during the clean-up routine (to prevent it
@@ -165 +165 @@
 
 /**
- * Returns the current session type.
+ * Returns the current display server type.
  *
- * @returns The session type.
- */
-VBGHSESSIONTYPE VBClGetSessionType(void)
-{
-    return g_enmSessionType;
+ * @returns The display server type.
+ */
+VBGHDISPLAYSERVERTYPE VBClGetDisplayServerType(void)
+{
+    return g_enmDisplayServerType;
 }
 
@@ -668 +668 @@
             {
                 if (!RTStrICmp(ValueUnion.psz, "x11"))
-                    g_enmSessionType = VBGHSESSIONTYPE_X11;
+                    g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_X11;
                 else if (!RTStrICmp(ValueUnion.psz, "wayland"))
-                    g_enmSessionType = VBGHSESSIONTYPE_WAYLAND;
+                    g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_WAYLAND;
                 else if (!RTStrICmp(ValueUnion.psz, "none"))
-                    g_enmSessionType = VBGHSESSIONTYPE_NONE;
+                    g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_NONE;
                 else if (!RTStrICmp(ValueUnion.psz, "auto"))
-                    g_enmSessionType = VBGHSESSIONTYPE_AUTO;
+                    g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_AUTO;
                 else
                 {
                     RTMsgError("Session type \"%s\" is invalid; defaulting to \"auto\" instead.\n", ValueUnion.psz);
-                    g_enmSessionType = VBGHSESSIONTYPE_AUTO;
+                    g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_AUTO;
                 }
                 break;
@@ -741 +741 @@
 
     /* Try to detect the current session type early on, if needed. */
-    if (g_enmSessionType == VBGHSESSIONTYPE_AUTO)
-    {
-        g_enmSessionType = VBGHSessionTypeDetect();
+    if (g_enmDisplayServerType == VBGHDISPLAYSERVERTYPE_AUTO)
+    {
+        g_enmDisplayServerType = VBGHDisplayServerTypeDetect();
     }
     else
-        VBClLogInfo("Session type was manually set to: %s\n", VBGHSessionTypeToStr(g_enmSessionType));
-
-    VBClLogInfo("Session type is: %s\n", VBGHSessionTypeToStr(g_enmSessionType));
+        VBClLogInfo("Session type was manually set to: %s\n", VBGHDisplayServerTypeToStr(g_enmDisplayServerType));
+
+    VBClLogInfo("Session type is: %s\n", VBGHDisplayServerTypeToStr(g_enmDisplayServerType));
 
     VBClLogInfo("Service: %s\n", g_Service.pDesc->pszDesc);
@@ -796 +796 @@
     }
 
-    if (g_enmSessionType == VBGHSESSIONTYPE_X11)
+    if (g_enmDisplayServerType == VBGHDISPLAYSERVERTYPE_X11)
     {
         /* This should never be called twice in one process - in fact one Display

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

@@ -84 +84 @@
 static DECLCALLBACK(int) vbclSeamlessInit(void)
 {
-    switch (VBClGetSessionType())
+    switch (VBClGetDisplayServerType())
     {
-        case VBGHSESSIONTYPE_X11:
+        case VBGHDISPLAYSERVERTYPE_X11:
             g_pSvc = new VBClX11SeamlessSvc();
             break;
 
-        case VBGHSESSIONTYPE_WAYLAND:
+        case VBGHDISPLAYSERVERTYPE_WAYLAND:
             RT_FALL_THROUGH();
         default:

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp

@@ -35 +35 @@
 
 #include <VBox/VBoxGuestLib.h>
-#include <VBox/GuestHost/SessionType.h>
+#include <VBox/GuestHost/DisplayServerType.h>
 
 #include "../seamless.h"
@@ -41 +41 @@
 static RTSEMEVENT eventSem;
 
-VBGHSESSIONTYPE VBClGetSessionType(void)
+VBGHDISPLAYSERVERTYPE VBClGetDisplayServerType(void)
 {
-    return VBGHSESSIONTYPE_X11;
+    return VBGHDISPLAYSERVERTYPE_X11;
 }