Changeset 101673 in vbox

Timestamp:

Oct 31, 2023 9:57:18 AM (15 months ago)

Author:

vboxsync

Message:

GuestHost: DisplayServerType: Add runtime detection if Gtk library is present in the system, bugref:10194.

Location:

trunk

Files:

• include/VBox/GuestHost/DisplayServerType.h (modified) (1 diff)
• src/VBox/GuestHost/DisplayServerType.cpp (modified) (4 diffs)

trunk/include/VBox/GuestHost/DisplayServerType.h

@@ -69 +69 @@
 const char *VBGHDisplayServerTypeToStr(VBGHDISPLAYSERVERTYPE enmType);
 VBGHDISPLAYSERVERTYPE VBGHDisplayServerTypeDetect(void);
+bool VBGHDisplayServerTypeIsGtkAvailable(void);
 bool VBGHDisplayServerTypeIsXAvailable(VBGHDISPLAYSERVERTYPE enmType);
 bool VBGHDisplayServerTypeIsWaylandAvailable(VBGHDISPLAYSERVERTYPE enmType);

trunk/src/VBox/GuestHost/DisplayServerType.cpp

@@ -95 +95 @@
 }
 
+
+#define GET_SYMBOL(a_Mod, a_Name, a_Fn) \
+    if (RT_SUCCESS(rc)) \
+        rc = RTLdrGetSymbol(a_Mod, a_Name, (void **)&a_Fn); \
+    if (RT_FAILURE(rc)) \
+        LogRel2(("Symbol '%s' unable to load, rc=%Rrc\n", a_Name, rc));
+
 /**
  * Tries to detect the desktop display server type the process is running in.
@@ -123 +130 @@
         "libwayland-client.so.0" /* Needed for Ubuntu */
     };
-
-#define GET_SYMBOL(a_Mod, a_Name, a_Fn) \
-    if (RT_SUCCESS(rc)) \
-        rc = RTLdrGetSymbol(a_Mod, a_Name, (void **)&a_Fn); \
-    if (RT_FAILURE(rc)) \
-        LogRel2(("Symbol '%s' unable to load, rc=%Rrc\n", a_Name, rc));
 
     int rc = vbghDisplayServerTryLoadLib(aLibsWayland, RT_ELEMENTS(aLibsWayland), &hWaylandClient);
@@ -188 +189 @@
     }
 
-#undef GET_SYMBOL
-
     /* If both wayland and X11 display can be connected then we should have XWayland: */
     VBGHDISPLAYSERVERTYPE retSessionType = VBGHDISPLAYSERVERTYPE_NONE;
@@ -205 +204 @@
 
 /**
+ * Detect GTK library.
+ *
+ * @returns \c true if GTK library is available in the system.
+ */
+bool VBGHDisplayServerTypeIsGtkAvailable(void)
+{
+    int rc;
+
+    /* Array of libGtk.so versions to search for.
+     * Descending precedence. */
+    const char* aLibsGtk[] =
+    {
+        "libgtk-3.so",
+        "libgtk-3.so.0"
+    };
+
+    RTLDRMOD hGtk = NIL_RTLDRMOD;
+    void * (*pfnGtkInit)(const char *) = NULL;
+
+    rc = vbghDisplayServerTryLoadLib(aLibsGtk, RT_ELEMENTS(aLibsGtk), &hGtk);
+    if (RT_SUCCESS(rc))
+    {
+        GET_SYMBOL(hGtk, "gtk_init", pfnGtkInit);
+        RTLdrClose(hGtk);
+    }
+
+    return RT_SUCCESS(rc) && RT_VALID_PTR(pfnGtkInit);
+}
+
+#undef GET_SYMBOL
+
+/**
  * Returns true if @a enmType is indicating running X.
  *