Changeset 93232 in vbox

Timestamp:

Jan 14, 2022 11:29:06 AM (3 years ago)

Author:

vboxsync

Message:

Shared Clipboard/X11: Added some inline getter/setter functions to easier debug the "Xt busy" flags.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (6 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -656 +656 @@
 }
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
+DECLINLINE(bool) clipGetXtBusy(PSHCLX11CTX pCtx)
+{
+    LogFlowFunc(("fXtBusy=%RTbool, fXtNeedsUpdate=%RTbool\n", pCtx->fXtBusy, pCtx->fXtNeedsUpdate));
+    return pCtx->fXtBusy;
+}
+
+DECLINLINE(bool) clipGetXtNeedsUpdate(PSHCLX11CTX pCtx)
+{
+    LogFlowFunc(("fXtBusy=%RTbool, fXtNeedsUpdate=%RTbool\n", pCtx->fXtBusy, pCtx->fXtNeedsUpdate));
+    return pCtx->fXtNeedsUpdate;
+}
+
+DECLINLINE(bool) clipSetXtBusy(PSHCLX11CTX pCtx, bool fBusy)
+{
+    pCtx->fXtBusy = fBusy;
+    LogFlowFunc(("fXtBusy=%RTbool, fXtNeedsUpdate=%RTbool\n", pCtx->fXtBusy, pCtx->fXtNeedsUpdate));
+    return pCtx->fXtBusy;
+}
+
+DECLINLINE(bool) clipSetXtNeedsUpdate(PSHCLX11CTX pCtx, bool fNeedsUpdate)
+{
+    pCtx->fXtNeedsUpdate = fNeedsUpdate;
+    LogFlowFunc(("fXtBusy=%RTbool, fXtNeedsUpdate=%RTbool\n", pCtx->fXtBusy, pCtx->fXtNeedsUpdate));
+    return pCtx->fXtNeedsUpdate;
+}
+#endif /* VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY */
+
 /**
  * Updates the context's information about targets currently supported by X11,
@@ -669 +697 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
-    pCtx->fXtBusy = false;
-    if (pCtx->fXtNeedsUpdate)
+    clipSetXtBusy(pCtx, false);
+    if (clipGetXtNeedsUpdate(pCtx))
     {
         /* We may already be out of date. */
-        pCtx->fXtNeedsUpdate = false;
+        clipSetXtNeedsUpdate(pCtx, false);
         clipQueryX11Formats(pCtx);
         return;
@@ -778 +806 @@
 
 # ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
-    LogFlowFunc(("fXtBusy=%RTbool\n", pCtx->fXtBusy));
-    if (pCtx->fXtBusy)
-    {
-        pCtx->fXtNeedsUpdate = true;
+    if (clipGetXtBusy(pCtx))
+    {
+        clipSetXtNeedsUpdate(pCtx, true);
         return;
     }
-
-    pCtx->fXtBusy = true;
+    clipSetXtBusy(pCtx, true);
 # endif
 
@@ -1921 +1947 @@
     PSHCLX11CTX pCtx = pReq->pCtx;
     AssertPtr(pReq->pCtx);
-
-    pCtx->fXtBusy = false;
-    if (pCtx->fXtNeedsUpdate)
+    clipSetXtBusy(pCtx, false);
+    if (clipGetXtNeedsUpdate(pCtx))
         clipQueryX11Formats(pCtx);
 #endif
@@ -2190 +2215 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
-    const bool fXtBusy = pCtx->fXtBusy;
-    pCtx->fXtBusy = true;
+    const bool fXtBusy = clipGetXtBusy(pCtx);
+    clipSetXtBusy(pCtx, true);
     if (fXtBusy)
     {
@@ -2240 +2265 @@
     {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_XT_BUSY
-        pCtx->fXtBusy = false;
+        clipSetXtBusy(pCtx, false);
 #endif
         rc = VERR_NOT_IMPLEMENTED;