Changeset 19535 in vbox for trunk

Timestamp:

May 8, 2009 4:16:44 PM (16 years ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard/x11: removed some debugging code

File:

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

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

@@ -55 +55 @@
 #include <VBox/HostServices/VBoxClipboardSvc.h>
 
-/** Do we want to test Utf8 by disabling other text formats? */
-static bool g_testUtf8 = false;
-/** 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. */
 enum CLIPFORMAT
@@ -79 +72 @@
     const char *pcszAtom;
     /** The format corresponding to the name */
-    CLIPFORMAT enmFormat;
+    CLIPFORMAT  enmFormat;
     /** The corresponding VBox clipboard format */
-    uint32_t   u32VBoxFormat;
+    uint32_t    u32VBoxFormat;
 } g_aFormats[] =
 {
@@ -548 +541 @@
     unsigned cAtoms = *pcLen;
     CLIPFORMAT enmBestTarget = INVALID;
-    CLIPFORMAT enmRequiredTarget = INVALID;
     Atom atomBestTarget = None;
 
@@ -561 +553 @@
         return;
     }
-
-    /* Debugging stuff */
-    if (g_testUtf8)
-        enmRequiredTarget = UTF8;
-    else if (g_testCText)
-        enmRequiredTarget = CTEXT;
 
     for (unsigned i = 0; i < cAtoms; ++i)
@@ -576 +562 @@
             if (atomTargets[i] == formatAtom)
             {
-                if (   enmBestTarget < g_aFormats[j].enmFormat
-                    /* debugging stuff */
-                    && (   enmRequiredTarget == INVALID
-                        || enmRequiredTarget == g_aFormats[j].enmFormat))
+                if (   enmBestTarget < g_aFormats[j].enmFormat)
                 {
                     enmBestTarget = g_aFormats[j].enmFormat;
@@ -587 +570 @@
             }
         }
-        if (g_debugClipboard)
-        {
-            char *szAtomName = XGetAtomName(XtDisplay(pCtx->widget),
-                                            atomTargets[i]);
-            if (szAtomName != 0)
-            {
-                Log2 (("%s: the host offers target %s\n", __PRETTY_FUNCTION__,
-                       szAtomName));
-                XFree(szAtomName);
-            }
-        }
     }
     pCtx->atomX11TextFormat = atomBestTarget;
@@ -603 +575 @@
     {
         uint32_t u32Formats = 0;
-        if (g_debugClipboard)
-        {
-            if (atomBestTarget != None)
-            {
-                char *szAtomName = XGetAtomName(XtDisplay(pCtx->widget),
-                                                atomBestTarget);
-                Log2 (("%s: switching to host text target %s.  Available targets are:\n",
-                       __PRETTY_FUNCTION__, szAtomName));
-                XFree(szAtomName);
-            }
-            else
-                Log2(("%s: no supported host text target found.  Available targets are:\n",
-                      __PRETTY_FUNCTION__));
-            for (unsigned i = 0; i < cAtoms; ++i)
-            {
-                char *szAtomName = XGetAtomName(XtDisplay(pCtx->widget),
-                                                atomTargets[i]);
-                if (szAtomName != 0)
-                {
-                    Log2 (("%s:     %s\n", __PRETTY_FUNCTION__, szAtomName));
-                    XFree(szAtomName);
-                }
-            }
-        }
         pCtx->X11TextFormat = enmBestTarget;
         if (enmBestTarget != INVALID)
@@ -825 +773 @@
         g_fHaveX11 = false;
         return pCtx;
-    }
-
-    if (RTEnvGet("VBOX_CBTEST_UTF8"))
-    {
-        g_testUtf8 = true;
-        LogRel(("Host clipboard: testing Utf8\n"));
-    }
-    else if (RTEnvGet("VBOX_CBTEST_CTEXT"))
-    {
-        g_testCText = true;
-        LogRel(("Host clipboard: testing compound text\n"));
-    }
-    else if (RTEnvGet("VBOX_CBDEBUG"))
-    {
-        g_debugClipboard = true;
-        LogRel(("Host clipboard: enabling additional debugging output\n"));
     }
 
@@ -982 +914 @@
     atomTargets[cTargets + 1] = clipGetAtom(pCtx->widget, "MULTIPLE");
     atomTargets[cTargets + 2] = clipGetAtom(pCtx->widget, "TIMESTAMP");
-    if (g_debugClipboard)
-    {
-        for (unsigned i = 0; i < cTargets + 3; i++)
-        {
-            char *szAtomName = XGetAtomName(XtDisplay(pCtx->widget), atomTargets[i]);
-            if (szAtomName != 0)
-            {
-                Log2 (("%s: returning target %s\n", __PRETTY_FUNCTION__,
-                       szAtomName));
-                XFree(szAtomName);
-            }
-            else
-            {
-                Log(("%s: invalid atom %d in the list!\n", __PRETTY_FUNCTION__,
-                     atomTargets[i]));
-            }
-        }
-    }
     *atomTypeReturn = XA_ATOM;
     *pValReturn = reinterpret_cast<XtPointer>(atomTargets);
@@ -1311 +1225 @@
         LogFlowFunc(("rc = false\n"));
         return false;
-    }
-    if (g_debugClipboard)
-    {
-        char *szAtomName = XGetAtomName(XtDisplay(pCtx->widget), *atomTarget);
-        if (szAtomName != 0)
-        {
-            Log2 (("%s: request for format %s\n", __PRETTY_FUNCTION__, szAtomName));
-            XFree(szAtomName);
-        }
-        else
-        {
-            LogFunc (("request for invalid target atom %d!\n", *atomTarget));
-        }
     }
     if (*atomTarget == clipGetAtom(pCtx->widget, "TARGETS"))