Changeset 106786 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 30, 2024 11:33:02 AM (3 months ago)

Author:

vboxsync

Message:

Additions: Linux/Wayland: Rename VBClClipboardThreadStart to vbcl_wayland_thread_start and put it into common place, bugref:10796.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• clipboard-common.cpp (modified) (1 diff)
• clipboard.h (modified) (1 diff)
• vboxwl.cpp (modified) (1 diff)
• wayland-helper-dcp.cpp (modified) (1 diff)
• wayland-helper-gtk.cpp (modified) (1 diff)
• wayland-helper.cpp (modified) (1 diff)
• wayland-helper.h (modified) (1 diff)
• wayland.cpp (modified) (3 diffs)

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

@@ -41 +41 @@
 #include "VBoxClient.h"
 #include "clipboard.h"
-
-RTDECL(int) VBClClipboardThreadStart(PRTTHREAD pThread, PFNRTTHREAD pfnThread, const char *pszName, void *pvUser)
-{
-    int rc;
-
-    rc = RTThreadCreate(pThread, pfnThread, pvUser, 0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, pszName);
-    if (RT_SUCCESS(rc))
-        rc = RTThreadUserWait(*pThread, RT_MS_30SEC /* msTimeout */);
-
-    if (RT_SUCCESS(rc))
-        VBClLogVerbose(1, "started %s thread\n", pszName);
-    else
-        LogRel(("unable to start %s thread, rc=%Rrc\n", pszName, rc));
-
-    return rc;
-}
 
 RTDECL(int) VBClClipboardReadHostEvent(PSHCLCONTEXT pCtx, const PFNHOSTCLIPREPORTFMTS pfnHGClipReport,

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

@@ -84 +84 @@
 
 /**
- * Create thread and wait until it started.
- *
- * @returns IPRT status code.
- * @param   pThread     Pointer to thread data.
- * @param   pfnThread   Pointer to thread main loop function.
- * @param   pszName     Thread name.
- * @param   pvUser      User data.
- */
-RTDECL(int) VBClClipboardThreadStart(PRTTHREAD pThread, PFNRTTHREAD pfnThread, const char *pszName, void *pvUser);
-
-/**
  * Read and process one event from the host clipboard service.
  *

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

@@ -573 +573 @@
     RTLOCALIPCSESSION hIpcSession;
 
-    rc = VBClClipboardThreadStart(&g_AppThread, vboxwl_gtk_worker, "gtk-app", NULL);
+    rc = vbcl_wayland_thread_start(&g_AppThread, vboxwl_gtk_worker, "gtk-app", NULL);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-dcp.cpp

@@ -1275 +1275 @@
     vbcl_wayland_session_init(&g_DcpCtx.Session.Base);
 
-    return VBClClipboardThreadStart(&g_DcpCtx.Thread, vbcl_wayland_hlp_dcp_event_loop, "wl-dcp", &g_DcpCtx);
+    return vbcl_wayland_thread_start(&g_DcpCtx.Thread, vbcl_wayland_hlp_dcp_event_loop, "wl-dcp", &g_DcpCtx);
 }
 

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-gtk.cpp

@@ -410 +410 @@
     RT_ZERO(g_GtkCtx);
 
-    return VBClClipboardThreadStart(&g_GtkCtx.Thread, vbcl_wayland_hlp_gtk_worker, "wl-gtk-ipc", &g_GtkCtx);
+    return vbcl_wayland_thread_start(&g_GtkCtx.Thread, vbcl_wayland_hlp_gtk_worker, "wl-gtk-ipc", &g_GtkCtx);
 }
 

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

@@ -315 +315 @@
     return RT_BOOL(ASMAtomicReadU8((volatile uint8_t *)&pSession->enmState) == VBCL_WL_SESSION_STATE_STARTED);
 }
+
+RTDECL(int) vbcl_wayland_thread_start(PRTTHREAD pThread, PFNRTTHREAD pfnThread, const char *pszName, void *pvUser)
+{
+    int rc;
+
+    rc = RTThreadCreate(pThread, pfnThread, pvUser, 0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, pszName);
+    if (RT_SUCCESS(rc))
+        rc = RTThreadUserWait(*pThread, RT_MS_30SEC /* msTimeout */);
+
+    if (RT_SUCCESS(rc))
+        VBClLogVerbose(1, "started %s thread\n", pszName);
+    else
+        LogRel(("unable to start %s thread, rc=%Rrc\n", pszName, rc));
+
+    return rc;
+}
+

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper.h

@@ -399 +399 @@
 RTDECL(bool) vbcl_wayland_session_is_started(vbcl_wl_session_t *pSession);
 
+/**
+ * Create thread and wait until it started.
+ *
+ * @returns IPRT status code.
+ * @param   pThread     Pointer to thread data.
+ * @param   pfnThread   Pointer to thread main loop function.
+ * @param   pszName     Thread name.
+ * @param   pvUser      User data.
+ */
+RTDECL(int) vbcl_wayland_thread_start(PRTTHREAD pThread, PFNRTTHREAD pfnThread, const char *pszName, void *pvUser);
+
 /** Wayland helper which uses GTK library. */
 extern const VBCLWAYLANDHELPER g_WaylandHelperGtk;

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

@@ -309 +309 @@
     if (RT_VALID_PTR(g_pWaylandHelperClipboard))
     {
-        rc = VBClClipboardThreadStart(&g_ClipboardThread, vbclWaylandClipboardWorker, "wl-clip", NULL);
+        rc = vbcl_wayland_thread_start(&g_ClipboardThread, vbclWaylandClipboardWorker, "wl-clip", NULL);
         VBClLogVerbose(1, "clipboard thread started, rc=%Rrc\n", rc);
     }
@@ -317 +317 @@
         && RT_VALID_PTR(g_pWaylandHelperDnd))
     {
-        rc = VBClClipboardThreadStart(&g_DndThread, vbclWaylandDndWorker, "wl-dnd", NULL);
+        rc = vbcl_wayland_thread_start(&g_DndThread, vbclWaylandDndWorker, "wl-dnd", NULL);
         VBClLogVerbose(1, "DnD thread started, rc=%Rrc\n", rc);
     }
@@ -324 +324 @@
     if (RT_SUCCESS(rc))
     {
-        rc = VBClClipboardThreadStart(&g_HostInputFocusThread, vbclWaylandHostInputFocusWorker, "wl-focus", NULL);
+        rc = vbcl_wayland_thread_start(&g_HostInputFocusThread, vbclWaylandHostInputFocusWorker, "wl-focus", NULL);
         VBClLogVerbose(1, "host input focus polling thread started, rc=%Rrc\n", rc);
     }