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

Timestamp:

May 4, 2023 10:43:08 AM (2 years ago)

Author:

vboxsync

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

157119

Message:

Guest Additions/VBoxClient: Moved the X11-specific code for seamless mode into an own submodule and using the actual service as a (runtime) wrapper (for also the Wayland-specific code later) [build fix]. bugref:10427

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• seamless-x11.cpp (modified) (1 diff)
• seamless.cpp (modified) (1 diff)
• seamless.h (modified) (1 diff)
• testcase/tstSeamlessX11-auto.cpp (modified) (3 diffs)

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

@@ -617 +617 @@
     {
         pcszStage = "Connecting to the X server";
-        rc = mX11Monitor.init(VBClSeamnlessSendRegionUpdate);
+        rc = mX11Monitor.init(VBClSeamlessSendRegionUpdate);
         if (RT_FAILURE(rc))
             break;

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

@@ -63 +63 @@
  * @param   cRects              Number of regions in \a pRect.
  */
-void VBClSeamnlessSendRegionUpdate(RTRECT *pRects, size_t cRects)
+void VBClSeamlessSendRegionUpdate(RTRECT *pRects, size_t cRects)
 {
     if (   cRects

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

@@ -43 +43 @@
 /** @name Generic seamless functions
  * @{ */
-void VBClSeamnlessSendRegionUpdate(RTRECT *pRects, size_t cRects);
+void VBClSeamlessSendRegionUpdate(RTRECT *pRects, size_t cRects);
 /** @} */
 

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

@@ -85 +85 @@
 
     exit(1);
+}
+
+void VBClLogVerbose(unsigned iLevel, const char *pszFormat, ...)
+{
+    RT_NOREF(iLevel);
+
+    va_list va;
+    va_start(va, pszFormat);
+    RTPrintf("%s", pszFormat);
+    va_end(va);
 }
 
@@ -366 +376 @@
 static bool g_fNotified = false;
 
-/** Dummy host call-back. */
-static void sendRegionUpdate(RTRECT *pRects, size_t cRects)
+/** Dummy host callback. */
+void VBClSeamlessSendRegionUpdate(RTRECT *pRects, size_t cRects)
 {
     RT_NOREF2(pRects, cRects);
     g_fNotified = true;
+}
+
+int VbglR3SeamlessSetCap(bool bState)
+{
+    RTPrintf("%s\n", bState ? "Seamless capability set"
+                            : "Seamless capability unset");
+    return VINF_SUCCESS;
+}
+
+int VbglR3CtlFilterMask(uint32_t u32OrMask, uint32_t u32NotMask)
+{
+    RTPrintf("IRQ filter mask changed.  Or mask: 0x%x.  Not mask: 0x%x\n",
+             u32OrMask, u32NotMask);
+    return VINF_SUCCESS;
+}
+
+int VbglR3SeamlessWaitEvent(VMMDevSeamlessMode *pMode)
+{
+    RT_NOREF(pMode);
+    return VINF_SUCCESS;
 }
 
@@ -679 +709 @@
     unsigned cErrs = 0;
 
-    subject.init(sendRegionUpdate);
+    subject.init(VBClSeamlessSendRegionUpdate);
     smlsSetWindowAttributes(pFixture->paAttribsBefore,
                             pFixture->pahWindowsBefore,