Changeset 100063 in vbox

Timestamp:

Jun 3, 2023 5:42:36 PM (18 months ago)

Author:

vboxsync

Message:

Nit picking. Renaming VBGHDISPLAYSERVERTYPE_WAYLAND to VBGHDISPLAYSERVERTYPE_PURE_WAYLAND

Location:

trunk

Files:

• include/VBox/GuestHost/DisplayServerType.h (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/main.cpp (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/seamless.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (2 diffs)
• src/VBox/GuestHost/DisplayServerType.cpp (modified) (6 diffs)

trunk/include/VBox/GuestHost/DisplayServerType.h

@@ -62 +62 @@
     VBGHDISPLAYSERVERTYPE_X11,
     /** Wayland. */
-    VBGHDISPLAYSERVERTYPE_WAYLAND,
+    VBGHDISPLAYSERVERTYPE_PURE_WAYLAND,
     /** XWayland; Wayland is running, but some (older) apps need X as a bridge as well. */
     VBGHDISPLAYSERVERTYPE_XWAYLAND

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

@@ -96 +96 @@
         }
     }
-    else if (VBClGetDisplayServerType() == VBGHDISPLAYSERVERTYPE_WAYLAND)
+    else if (VBClGetDisplayServerType() == VBGHDISPLAYSERVERTYPE_PURE_WAYLAND)
     {
         VBClLogError("Shared Clipboard for Wayland not supported yet!\n");

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

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

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

@@ -48 +48 @@
             break;
 
-        case VBGHDISPLAYSERVERTYPE_WAYLAND:
+        case VBGHDISPLAYSERVERTYPE_PURE_WAYLAND:
             RT_FALL_THROUGH();
         default:

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

@@ -693 +693 @@
                     g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_X11;
                 else if (!RTStrICmp(ValueUnion.psz, "wayland"))
-                    g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_WAYLAND;
+                    g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
                 else if (!RTStrICmp(ValueUnion.psz, "none"))
                     g_enmDisplayServerType = VBGHDISPLAYSERVERTYPE_NONE;

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

@@ -90 +90 @@
             break;
 
-        case VBGHDISPLAYSERVERTYPE_WAYLAND:
+        case VBGHDISPLAYSERVERTYPE_PURE_WAYLAND:
             RT_FALL_THROUGH();
         default:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -1961 +1961 @@
 void UIMachineView::keyPressEvent(QKeyEvent *pEvent)
 {
-    if (uiCommon().displayServerType() == VBGHDISPLAYSERVERTYPE_WAYLAND)
+    if (uiCommon().displayServerType() == VBGHDISPLAYSERVERTYPE_PURE_WAYLAND)
         uimachine()->putScancode(pEvent->nativeScanCode() - 8);
     QAbstractScrollArea::keyPressEvent(pEvent);
@@ -1968 +1968 @@
 void UIMachineView::keyReleaseEvent(QKeyEvent *pEvent)
 {
-    if (uiCommon().displayServerType() == VBGHDISPLAYSERVERTYPE_WAYLAND)
+    if (uiCommon().displayServerType() == VBGHDISPLAYSERVERTYPE_PURE_WAYLAND)
         uimachine()->putScancode((pEvent->nativeScanCode() - 8) | 0x80);
     QAbstractScrollArea::keyReleaseEvent(pEvent);

trunk/src/VBox/GuestHost/DisplayServerType.cpp

@@ -56 +56 @@
         RT_CASE_RET_STR(VBGHDISPLAYSERVERTYPE_AUTO);
         RT_CASE_RET_STR(VBGHDISPLAYSERVERTYPE_X11);
-        RT_CASE_RET_STR(VBGHDISPLAYSERVERTYPE_WAYLAND);
+        RT_CASE_RET_STR(VBGHDISPLAYSERVERTYPE_PURE_WAYLAND);
         RT_CASE_RET_STR(VBGHDISPLAYSERVERTYPE_XWAYLAND);
         default: break;
@@ -193 +193 @@
         retSessionType = VBGHDISPLAYSERVERTYPE_XWAYLAND;
     else if (fHasWayland)
-        retSessionType = VBGHDISPLAYSERVERTYPE_WAYLAND;
+        retSessionType = VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
     else if (fHasX)
         retSessionType = VBGHDISPLAYSERVERTYPE_X11;
@@ -212 +212 @@
     const char *const pWaylandDisplayType = RTEnvGet(VBGH_ENV_WAYLAND_DISPLAY);
     if (pWaylandDisplayType != NULL)
-        waylandDisplayType = VBGHDISPLAYSERVERTYPE_WAYLAND;
+        waylandDisplayType = VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
 
     LogRel2(("Wayland display type is: %s\n", VBGHDisplayServerTypeToStr(waylandDisplayType)));
@@ -221 +221 @@
     {
         if (RTStrIStartsWith(pSessionType, "wayland"))
-            xdgSessionType = VBGHDISPLAYSERVERTYPE_WAYLAND;
+            xdgSessionType = VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
         else if (RTStrIStartsWith(pSessionType, "x11"))
             xdgSessionType = VBGHDISPLAYSERVERTYPE_X11;
@@ -234 +234 @@
     {
         if (RTStrIStr(pszCurDesktop, "wayland"))
-            xdgCurrentDesktopType = VBGHDISPLAYSERVERTYPE_WAYLAND;
+            xdgCurrentDesktopType = VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
         else if (RTStrIStr(pszCurDesktop, "x11"))
             xdgCurrentDesktopType = VBGHDISPLAYSERVERTYPE_X11;
@@ -291 +291 @@
 {
     return    enmType == VBGHDISPLAYSERVERTYPE_XWAYLAND
-           || enmType == VBGHDISPLAYSERVERTYPE_WAYLAND;
-}
-
+           || enmType == VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
+}
+