vbox的更動 43406 路徑 trunk/src/VBox/Additions/haiku

時間撮記:

2012-9-22 下午02:11:49 (12 年 以前)

作者:

vboxsync

訊息:

Additions/haiku: cleanup.

位置:

trunk/src/VBox/Additions/haiku/VBoxTray

檔案:

• VBoxClipboard.cpp (修改) (11 筆差異)
• VBoxClipboard.h (修改) (1 筆差異)
• VBoxDisplay.cpp (修改) (6 筆差異)
• VBoxDisplay.h (修改) (2 筆差異)

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxClipboard.cpp

@@ -67 +67 @@
 #include <VBox/log.h>
 
-#undef Log
-#define Log(x) printf x
-#undef LogRel
-#define LogRel(x) printf x
-#undef LogRelFlowFunc
-#define LogRelFlowFunc(x) printf x
+/** @todo r=ramshankar: this hack should go eventually. */
+#ifdef DEBUG_ramshankar
+# undef Log
+# define Log(x) printf x
+# undef LogRel
+# define LogRel(x) printf x
+# undef LogRelFlowFunc
+# define LogRelFlowFunc(x) printf x
+#endif
 
 
@@ -92 +95 @@
 {
     status_t err;
-    printf("VBoxClipboardService::%s()\n", __FUNCTION__);
+    LogFlowFunc(("Connect\n"));
 
     int rc = VbglR3ClipboardConnect(&fClientId);
     if (RT_SUCCESS(rc))
     {
-        err = fServiceThreadID = spawn_thread(_ServiceThreadNub,
-                                              "VBoxClipboardService", B_NORMAL_PRIORITY, this);
-
+        err = fServiceThreadID = spawn_thread(_ServiceThreadNub, "VBoxClipboardService", B_NORMAL_PRIORITY, this);
         if (err >= B_OK)
         {
             resume_thread(fServiceThreadID);
-
             err = be_clipboard->StartWatching(BMessenger(this));
-            printf("be_clipboard->StartWatching: %ld\n", err);
+            LogFlow(("be_clipboard->StartWatching: %ld\n", err));
             if (err == B_OK)
                 return B_OK;
@@ -156 +156 @@
             if (!formats)
                 break;
+
             if (!be_clipboard->Lock())
                 break;
@@ -177 +178 @@
                     {
                         BString str(text);
-                        // @todo use vboxClipboardUtf16WinToLin()
+                        /** @todo user vboxClipboardUtf16WinToLin() */
                         // convert Windows CRLF to LF
                         str.ReplaceAll("\r\n", "\n");
@@ -194 +195 @@
                 if (pv)
                 {
-                    void *pBmp;
-                    size_t cbBmp;
+                    void  *pBmp  = NULL;
+                    size_t cbBmp = 0;
                     rc = vboxClipboardDibToBmp(pv, cb, &pBmp, &cbBmp);
                     if (RT_SUCCESS(rc))
@@ -204 +205 @@
                         {
                             BMessage bitmapArchive;
-                            if (bitmap->IsValid() &&
-                                bitmap->Archive(&bitmapArchive) == B_OK &&
-                                clip->AddMessage("image/bitmap", &bitmapArchive) == B_OK)
+
+                            /** @todo r=ramshankar: split this into functions with error checking as
+                             *        neccessary. */
+                            if (   bitmap->IsValid()
+                                && bitmap->Archive(&bitmapArchive) == B_OK
+                                && clip->AddMessage("image/bitmap", &bitmapArchive) == B_OK)
                             {
                                 commit = true;
@@ -218 +222 @@
             }
 
-            /* make sure we don't bounce this data back to the host,
-             * it's impolite.
-             * It can also be used as a hint to applications probably. */
+            /*
+             * Make sure we don't bounce this data back to the host, it's impolite. It can also
+             * be used as a hint to applications probably.
+             */
             clip->AddBool("FromVirtualBoxHost", true);
-
             if (commit)
                 be_clipboard->Commit();
@@ -265 +269 @@
                         uint32_t cb = (RTUtf16Len(pwsz) + 1) * sizeof(RTUTF16);
 
-                        rc = VbglR3ClipboardWriteData(fClientId,
-                                                      VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT, pwsz, cb);
+                        rc = VbglR3ClipboardWriteData(fClientId, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT, pwsz, cb);
                         //printf("VbglR3ClipboardWriteData: %d\n", rc);
-
                         RTUtf16Free(pwsz);
                     }
@@ -296 +298 @@
                                 if (RT_SUCCESS(rc))
                                 {
-                                    rc = VbglR3ClipboardWriteData(fClientId,
-                                                                  VBOX_SHARED_CLIPBOARD_FMT_BITMAP, (void *)pDib, cbDibSize);
+                                    rc = VbglR3ClipboardWriteData(fClientId, VBOX_SHARED_CLIPBOARD_FMT_BITMAP, (void *)pDib,
+                                                                  cbDibSize);
                                 }
                             }
@@ -334 +336 @@
             if (clip->FindData("text/plain", B_MIME_TYPE, &data, &dataLen) == B_OK)
                 formats |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
-            if (clip->HasMessage("image/bitmap") || clip->HasMessage("image/x-be-bitmap"))
+
+            if (   clip->HasMessage("image/bitmap")
+                || clip->HasMessage("image/x-be-bitmap"))
+            {
                 formats |= VBOX_SHARED_CLIPBOARD_FMT_BITMAP;
+            }
 
             be_clipboard->Unlock();
@@ -376 +382 @@
                 case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS:
                 {
-                    /* The host has announced available clipboard formats.
-                     * Forward the information to the handler. */
+                    /*
+                     * The host has announced available clipboard formats. Forward
+                     * the information to the handler.
+                     */
                     LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS u32Formats=%x\n", u32Formats));
                     BMessage msg(VBOX_GUEST_CLIPBOARD_HOST_MSG_FORMATS);

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxClipboard.h

@@ -56 +56 @@
         virtual ~VBoxClipboardService();
 
-        virtual status_t        Connect();
-        virtual status_t        Disconnect();
+        virtual status_t    Connect();
+        virtual status_t    Disconnect();
 
-        virtual void            MessageReceived(BMessage *message);
+        virtual void        MessageReceived(BMessage *message);
 
     private:
+        static status_t    _ServiceThreadNub(void *_this);
+        status_t           _ServiceThread();
 
-        static status_t _ServiceThreadNub(void *_this);
-        status_t        _ServiceThread();
+        void*              _VBoxReadHostClipboard(uint32_t format, uint32_t *pcb);
 
-        void* _VBoxReadHostClipboard(uint32_t format, uint32_t *pcb);
-
-        uint32_t        fClientId;
-        thread_id       fServiceThreadID;
-        bool            fExiting;
-
+        uint32_t            fClientId;
+        thread_id           fServiceThreadID;
+        bool                fExiting;
 };
 
+#endif /* __VBOXSERVICESHAREDCLIPLBOARD__H */
 
-#endif /* __VBOXSERVICESHAREDCLIPLBOARD__H */

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxDisplay.cpp

@@ -63 +63 @@
 #include <VBox/log.h>
 
-#undef Log
-#define Log(x) printf x
-#undef LogRel
-#define LogRel(x) printf x
-#undef LogRelFlowFunc
-#define LogRelFlowFunc(x) printf x
+#ifdef DEBUG_ramshankar
+# undef Log
+# define Log(x) printf x
+# undef LogRel
+# define LogRel(x) printf x
+# undef LogRelFlowFunc
+# define LogRelFlowFunc(x) printf x
+#endif
 
 VBoxDisplayService::VBoxDisplayService()
@@ -88 +90 @@
 {
     status_t err;
-    err = fServiceThreadID = spawn_thread(_ServiceThreadNub,
-                                          "VBoxDisplayService", B_NORMAL_PRIORITY, this);
-
+    err = fServiceThreadID = spawn_thread(_ServiceThreadNub, "VBoxDisplayService", B_NORMAL_PRIORITY, this);
     if (err >= B_OK)
         resume_thread(fServiceThreadID);
     else
         LogRel(("VBoxDisplayService: Error starting service thread: %s\n", strerror(err)));
-
 }
 
@@ -117 +116 @@
 status_t VBoxDisplayService::_ServiceThread()
 {
-    printf("VBoxDisplayService::%s()\n", __FUNCTION__);
+    LogFlow(("VBoxDisplayService::_ServiceThread"));
 
     VbglR3CtlFilterMask(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
     VbglR3SetGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0);
-
     for (;;)
     {
         uint32_t events;
-
         int rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 5000, &events);
         if (rc == -6) // timed out?
@@ -134 +131 @@
             uint32_t cx, cy, cBits, iDisplay;
             int rc2 = VbglR3GetDisplayChangeRequest(&cx, &cy, &cBits, &iDisplay, true);
-            printf("rc2=%d screen %d size changed (%d, %d, %d)\n", rc2, iDisplay, cx, cy, cBits);
+            LogFlow(("rc2=%d screen %d size changed (%d, %d, %d)\n", rc2, iDisplay, cx, cy, cBits));
 
             if (RT_SUCCESS(rc2))
@@ -141 +138 @@
                 fScreen.GetMode(&mode);
                 if (cBits == 0)
-                {
                     cBits = get_depth_for_color_space(mode.space);
-                }
+
                 mode.timing.h_display = cx;
                 mode.timing.v_display = cy;
-                mode.space = get_color_space_for_depth(cBits);
-                mode.virtual_width = cx;
-                mode.virtual_height = cy;
+                mode.space            = get_color_space_for_depth(cBits);
+                mode.virtual_width    = cx;
+                mode.virtual_height   = cy;
 
                 /*= {
@@ -162 +158 @@
             fExiting = true;
 
-        LogRelFlow(("processed host event rc = %d\n", rc));
-
+        LogFlow(("processed host event rc = %d\n", rc));
         if (fExiting)
             break;

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxDisplay.h

@@ -58 +58 @@
 
         void                Start();
-
-        virtual    void     MessageReceived(BMessage *message);
+        virtual void        MessageReceived(BMessage *message);
 
     private:
-
         static status_t     _ServiceThreadNub(void *_this);
         status_t            _ServiceThread();
@@ -72 +70 @@
 };
 
-#endif /* __VBOXSERVICESHAREDCLIPLBOARD__H */
+#endif /* __VBOXDISPLAY__H */