Changeset 36808 in vbox

Timestamp:

Apr 21, 2011 10:42:33 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/seamless: no more std::autoptr or std::vector, use the new STL-vector-in-C instead - forgotten

File:

• trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp (modified) (6 diffs)

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

@@ -15 +15 @@
  */
 
-#include <iostream>
 #include <stdlib.h> /* exit() */
 
 #include <iprt/initterm.h>
 #include <iprt/semaphore.h>
+#include <iprt/stream.h>
 #include <VBox/VBoxGuestLib.h>
 
@@ -28 +28 @@
 int VbglR3SeamlessSendRects(uint32_t cRects, PRTRECT pRects)
 {
-    std::cout << "Received rectangle update (" << cRects << " rectangles):" << std::endl;
+    RTPrintf("Received rectangle update (%u rectangles):\n", cRects);
     for (unsigned i = 0; i < cRects; ++i)
     {
-        std::cout << "  xLeft: " << pRects[i].xLeft << "  yTop: " << pRects[i].yTop
-                  << "  xRight: " << pRects[i].xRight << "  yBottom: " << pRects[i].yBottom
-                  << std::endl;
+        RTPrintf("  xLeft: %d  yTop: %d  xRight: %d  yBottom: %d\n",
+                 pRects[i].xLeft, pRects[i].yTop, pRects[i].xRight,
+                 pRects[i].yBottom);
     }
     return true;
@@ -40 +40 @@
 int VbglR3SeamlessSetCap(bool bState)
 {
-    std::cout << (bState ? "Seamless capability set" : "Seamless capability unset")
-              << std::endl;
+    RTPrintf("%s\n", bState ? "Seamless capability set"
+                            : "Seamless capability unset");
     return true;
 }
@@ -47 +47 @@
 int VbglR3CtlFilterMask(uint32_t u32OrMask, uint32_t u32NotMask)
 {
-    std::cout << "IRQ filter mask changed.  Or mask: 0x" << std::hex << u32OrMask
-              << ".  Not mask: 0x" << u32NotMask << std::dec
-              << std::endl;
+    RTPrintf("IRQ filter mask changed.  Or mask: 0x%x.  Not mask: 0x%x\n",
+             u32OrMask, u32NotMask);
     return true;
 }
@@ -89 +88 @@
     {
         /* This can be triggered if a guest application destroys a window before we notice. */
-        std::cout << "ignoring BadAtom error and returning" << std::endl;
+        RTPrintf("ignoring BadAtom error and returning\n");
         return 0;
     }
     XGetErrorText(pDisplay, pError->error_code, errorText, sizeof(errorText));
-    std::cout << "An X Window protocol error occurred: " << errorText << std::endl
-              << "  Request code: " << int(pError->request_code) << std::endl
-              << "  Minor code: " << int(pError->minor_code) << std::endl
-              << "  Serial number of the failed request: " << int(pError->serial)
-              << std::endl;
-    std::cout << std::endl << "exiting." << std::endl;
+    RTPrintf("An X Window protocol error occurred: %s\n"
+             "  Request code: %d\n"
+             "  Minor code: %d\n"
+             "  Serial number of the failed request: %d\n\n"
+             "exiting.\n",
+             errorText, (int)pError->request_code, (int)pError->minor_code,
+             (int)pError->serial);
     exit(1);
 }
@@ -105 +105 @@
 {
     int rc = VINF_SUCCESS;
-    std::string sTmp;
+    char ach[2];
 
     RTR3Init();
-    std::cout << "VirtualBox guest additions X11 seamless mode testcase" << std::endl;
+    RTPrintf("VirtualBox guest additions X11 seamless mode testcase\n");
     if (0 == XInitThreads())
     {
-        std::cout << "Failed to initialise X11 threading, exiting." << std::endl;
+        RTPrintf("Failed to initialise X11 threading, exiting.\n");
         exit(1);
     }
     /* Set an X11 error handler, so that we don't die when we get unavoidable errors. */
     XSetErrorHandler(vboxClientXLibErrorHandler);
-    std::cout << std::endl << "Press <Enter> to exit..." << std::endl;
+    RTPrintf("\nPress <Enter> to exit...\n");
     RTSemEventCreate(&eventSem);
     /** Our instance of the seamless class. */
     VBoxGuestSeamless seamless;
-    try
+    LogRel(("Starting seamless Guest Additions...\n"));
+    rc = seamless.init();
+    if (rc != VINF_SUCCESS)
     {
-        LogRel(("Starting seamless Guest Additions...\n"));
-        rc = seamless.init();
-        if (rc != VINF_SUCCESS)
-        {
-            std::cout << "Failed to initialise seamless Additions, rc = " << rc << std::endl;
-        }
+        RTPrintf("Failed to initialise seamless Additions, rc = %d\n", rc);
     }
-    catch (std::exception e)
-    {
-        std::cout << "Failed to initialise seamless Additions - caught exception: " << e.what()
-                  << std::endl;
-        rc = VERR_UNRESOLVED_ERROR;
-    }
-    catch (...)
-    {
-        std::cout << "Failed to initialise seamless Additions - caught unknown exception.\n"
-                  << std::endl;
-        rc = VERR_UNRESOLVED_ERROR;
-    }
-    std::getline(std::cin, sTmp);
-    try
-    {
-        seamless.uninit();
-    }
-    catch (std::exception e)
-    {
-        std::cout << "Error shutting down seamless Additions - caught exception: " << e.what()
-                  << std::endl;
-        rc = VERR_UNRESOLVED_ERROR;
-    }
-    catch (...)
-    {
-        std::cout << "Error shutting down seamless Additions - caught unknown exception.\n"
-                  << std::endl;
-        rc = VERR_UNRESOLVED_ERROR;
-    }
+    RTStrmGetLine(g_pStdIn, ach, sizeof(ach));
+    seamless.uninit();
     return rc;
 }