Changeset 13846 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2008 10:44:32 AM (16 years ago)

Author:

vboxsync

Message:

HostServices/SharedClipboard: prevent a possible X protocol error in debug builds unless the user explicitly enables the code

File:

• trunk/src/VBox/HostServices/SharedClipboard/x11.cpp (modified) (6 diffs)

trunk/src/VBox/HostServices/SharedClipboard/x11.cpp

@@ -20 +20 @@
  * additional information or have any questions.
  */
-
-#define USE_UTF16
-#define USE_UTF8
-#define USE_CTEXT
 
 #include <vector>
@@ -62 +58 @@
 /** Do we want to test compount text by disabling other text formats? */
 static bool g_testCText = false;
+/** Are we currently debugging the clipboard code? */
+static bool g_debugClipboard = false;
 
 /** The different clipboard formats which we support. */
@@ -565 +563 @@
                 break;
             }
-#ifdef DEBUG
-        char *szAtomName = XGetAtomName(XtDisplay(g_ctx.widget), atomTargets[i]);
-        if (szAtomName != 0)
-        {
-            Log3 (("vboxClipboardTargetsProc: the host offers target %s\n", szAtomName));
-            XFree(szAtomName);
-        }
-#endif
-    }
-    g_ctx.atomHostTextFormat = atomBestTarget;
-    if ((eBestTarget != g_ctx.hostTextFormat) || (g_ctx.notifyGuest == true))
-    {
-        uint32_t u32Formats = 0;
-#ifdef DEBUG
-        if (atomBestTarget != None)
-        {
-            char *szAtomName = XGetAtomName(XtDisplay(g_ctx.widget), atomBestTarget);
-            Log2 (("vboxClipboardTargetsProc: switching to host text target %s.  Available targets are:\n",
-                   szAtomName));
-            XFree(szAtomName);
-        }
-        else
-        {
-            Log2(("vboxClipboardTargetsProc: no supported host text target found.  Available targets are:\n"));
-        }
-        for (unsigned i = 0; i < cAtoms; ++i)
+        if (g_debugClipboard)
         {
             char *szAtomName = XGetAtomName(XtDisplay(g_ctx.widget), atomTargets[i]);
             if (szAtomName != 0)
             {
-                Log2 (("vboxClipboardTargetsProc:     %s\n", szAtomName));
+                Log2 (("vboxClipboardTargetsProc: the host offers target %s\n", szAtomName));
                 XFree(szAtomName);
             }
         }
-#endif
+    }
+    g_ctx.atomHostTextFormat = atomBestTarget;
+    if ((eBestTarget != g_ctx.hostTextFormat) || (g_ctx.notifyGuest == true))
+    {
+        uint32_t u32Formats = 0;
+        if (g_debugClipboard)
+        {
+            if (atomBestTarget != None)
+            {
+                char *szAtomName = XGetAtomName(XtDisplay(g_ctx.widget), atomBestTarget);
+                Log2 (("vboxClipboardTargetsProc: switching to host text target %s.  Available targets are:\n",
+                       szAtomName));
+                XFree(szAtomName);
+            }
+            else
+            {
+                Log2(("vboxClipboardTargetsProc: no supported host text target found.  Available targets are:\n"));
+            }
+            for (unsigned i = 0; i < cAtoms; ++i)
+            {
+                char *szAtomName = XGetAtomName(XtDisplay(g_ctx.widget), atomTargets[i]);
+                if (szAtomName != 0)
+                {
+                    Log2 (("vboxClipboardTargetsProc:     %s\n", szAtomName));
+                    XFree(szAtomName);
+                }
+            }
+        }
         g_ctx.hostTextFormat = eBestTarget;
         if (eBestTarget != INVALID)
@@ -769 +769 @@
         LogRel(("Host clipboard: testing compound text\n"));
     }
+    else if (RTEnvGet("VBOX_CBDEBUG"))
+    {
+        g_debugClipboard = true;
+        LogRel(("Host clipboard: enabling additional debugging output\n"));
+    }
 
     g_fHaveX11 = true;
@@ -932 +937 @@
     atomTargets[cTargets + 1] = g_ctx.atomMultiple;
     atomTargets[cTargets + 2] = g_ctx.atomTimestamp;
-#ifdef DEBUG
-    for (unsigned i = 0; i < cTargets + 3; i++)
-    {
-        char *szAtomName = XGetAtomName(XtDisplay(g_ctx.widget), atomTargets[i]);
-        if (szAtomName != 0)
-        {
-            Log2 (("vboxClipboardConvertTargets: returning target %s\n", szAtomName));
-            XFree(szAtomName);
+    if (g_debugClipboard)
+    {
+        for (unsigned i = 0; i < cTargets + 3; i++)
+        {
+            char *szAtomName = XGetAtomName(XtDisplay(g_ctx.widget), atomTargets[i]);
+            if (szAtomName != 0)
+            {
+                Log2 (("vboxClipboardConvertTargets: returning target %s\n", szAtomName));
+                XFree(szAtomName);
+            }
+            else
+            {
+                Log(("vboxClipboardConvertTargets: invalid atom %d in the list!\n", atomTargets[i]));
+            }
         }
-        else
-        {
-            Log(("vboxClipboardConvertTargets: invalid atom %d in the list!\n", atomTargets[i]));
-        }
-    }
-#endif
+    }
     *atomTypeReturn = XA_ATOM;
     *pValReturn = reinterpret_cast<XtPointer>(atomTargets);
@@ -1269 +1275 @@
         return false;
     }
-#ifdef DEBUG
-    char *szAtomName = XGetAtomName(XtDisplay(g_ctx.widget), *atomTarget);
-    if (szAtomName != 0)
-    {
-        Log2 (("vboxClipboardConvertProc: request for format %s\n", szAtomName));
-        XFree(szAtomName);
-    }
-    else
-    {
-        Log(("vboxClipboardConvertProc: request for invalid target atom %d!\n", *atomTarget));
-    }
-#endif
+    if (g_debugClipboard)
+    {
+        char *szAtomName = XGetAtomName(XtDisplay(g_ctx.widget), *atomTarget);
+        if (szAtomName != 0)
+        {
+            Log2 (("vboxClipboardConvertProc: request for format %s\n", szAtomName));
+            XFree(szAtomName);
+        }
+        else
+        {
+            Log(("vboxClipboardConvertProc: request for invalid target atom %d!\n", *atomTarget));
+        }
+    }
     if (*atomTarget == g_ctx.atomTargets)
     {