Changeset 80847 in vbox for trunk/src/VBox/Additions/haiku/VBoxTray/VBoxClipboard.cpp

Timestamp:

Sep 17, 2019 9:38:16 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: More renaming to make code base more uniform.

File:

• trunk/src/VBox/Additions/haiku/VBoxTray/VBoxClipboard.cpp (modified) (20 diffs)

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

@@ -78 +78 @@
 
 
-VBoxClipboardService::VBoxClipboardService()
-     : BHandler("VBoxClipboardService"),
+VBoxShClService::VBoxShClService()
+     : BHandler("VBoxShClService"),
        fClientId(-1),
        fServiceThreadID(-1),
@@ -87 +87 @@
 
 
-VBoxClipboardService::~VBoxClipboardService()
-{
-}
-
-
-status_t VBoxClipboardService::Connect()
+VBoxShClService::~VBoxShClService()
+{
+}
+
+
+status_t VBoxShClService::Connect()
 {
     status_t err;
@@ -100 +100 @@
     if (RT_SUCCESS(rc))
     {
-        err = fServiceThreadID = spawn_thread(_ServiceThreadNub, "VBoxClipboardService", B_NORMAL_PRIORITY, this);
+        err = fServiceThreadID = spawn_thread(_ServiceThreadNub, "VBoxShClService", B_NORMAL_PRIORITY, this);
         if (err >= B_OK)
         {
@@ -109 +109 @@
                 return B_OK;
             else
-                LogRel(("VBoxClipboardService: Error watching the system clipboard: %ld\n", err));
+                LogRel(("VBoxShClService: Error watching the system clipboard: %ld\n", err));
         }
         else
-            LogRel(("VBoxClipboardService: Error starting service thread: %ld\n", err));
+            LogRel(("VBoxShClService: Error starting service thread: %ld\n", err));
 
         //rc = RTErrConvertFromErrno(err);
@@ -118 +118 @@
     }
     else
-        LogRel(("VBoxClipboardService: Error starting service thread: %d\n", rc));
+        LogRel(("VBoxShClService: Error starting service thread: %d\n", rc));
     return B_ERROR;
 }
 
 
-status_t VBoxClipboardService::Disconnect()
+status_t VBoxShClService::Disconnect()
 {
     status_t status;
@@ -138 +138 @@
 
 
-void VBoxClipboardService::MessageReceived(BMessage *message)
+void VBoxShClService::MessageReceived(BMessage *message)
 {
     uint32_t formats = 0;
@@ -168 +168 @@
             }
 
-            if (formats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
-            {
-                pv = _VBoxReadHostClipboard(VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT, &cb);
+            if (formats & VBOX_SHCL_FMT_UNICODETEXT)
+            {
+                pv = _VBoxReadHostClipboard(VBOX_SHCL_FMT_UNICODETEXT, &cb);
                 if (pv)
                 {
@@ -190 +190 @@
             }
 
-            if (formats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
-            {
-                pv = _VBoxReadHostClipboard(VBOX_SHARED_CLIPBOARD_FMT_BITMAP, &cb);
+            if (formats & VBOX_SHCL_FMT_BITMAP)
+            {
+                pv = _VBoxReadHostClipboard(VBOX_SHCL_FMT_BITMAP, &cb);
                 if (pv)
                 {
@@ -253 +253 @@
             clip->PrintToStream();
 
-            if (formats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+            if (formats & VBOX_SHCL_FMT_UNICODETEXT)
             {
                 const char *text;
@@ -269 +269 @@
                         uint32_t cb = (RTUtf16Len(pwsz) + 1) * sizeof(RTUTF16);
 
-                        rc = VbglR3ClipboardWriteData(fClientId, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT, pwsz, cb);
+                        rc = VbglR3ClipboardWriteData(fClientId, VBOX_SHCL_FMT_UNICODETEXT, pwsz, cb);
                         //printf("VbglR3ClipboardWriteData: %d\n", rc);
                         RTUtf16Free(pwsz);
@@ -275 +275 @@
                 }
             }
-            else if (formats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
+            else if (formats & VBOX_SHCL_FMT_BITMAP)
             {
                 BMessage archivedBitmap;
@@ -298 +298 @@
                                 if (RT_SUCCESS(rc))
                                 {
-                                    rc = VbglR3ClipboardWriteData(fClientId, VBOX_SHARED_CLIPBOARD_FMT_BITMAP, (void *)pDib,
+                                    rc = VbglR3ClipboardWriteData(fClientId, VBOX_SHCL_FMT_BITMAP, (void *)pDib,
                                                                   cbDibSize);
                                 }
@@ -335 +335 @@
 
             if (clip->FindData("text/plain", B_MIME_TYPE, &data, &dataLen) == B_OK)
-                formats |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+                formats |= VBOX_SHCL_FMT_UNICODETEXT;
 
             if (   clip->HasMessage("image/bitmap")
                 || clip->HasMessage("image/x-be-bitmap"))
             {
-                formats |= VBOX_SHARED_CLIPBOARD_FMT_BITMAP;
+                formats |= VBOX_SHCL_FMT_BITMAP;
             }
 
@@ -359 +359 @@
 
 
-status_t VBoxClipboardService::_ServiceThreadNub(void *_this)
-{
-    VBoxClipboardService *service = (VBoxClipboardService *)_this;
+status_t VBoxShClService::_ServiceThreadNub(void *_this)
+{
+    VBoxShClService *service = (VBoxShClService *)_this;
     return service->_ServiceThread();
 }
 
 
-status_t VBoxClipboardService::_ServiceThread()
-{
-    printf("VBoxClipboardService::%s()\n", __FUNCTION__);
+status_t VBoxShClService::_ServiceThread()
+{
+    printf("VBoxShClService::%s()\n", __FUNCTION__);
 
     /* The thread waits for incoming messages from the host. */
@@ -380 +380 @@
             switch (u32Msg)
             {
-                case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
+                case VBOX_SHCL_HOST_MSG_FORMATS_REPORT:
                 {
                     /*
@@ -386 +386 @@
                      * the information to the handler.
                      */
-                    LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS u32Formats=%x\n", u32Formats));
+                    LogRelFlowFunc(("VBOX_SHCL_HOST_MSG_REPORT_FORMATS u32Formats=%x\n", u32Formats));
                     BMessage msg(VBOX_GUEST_CLIPBOARD_HOST_MSG_FORMATS);
                     msg.AddInt32("Formats", (uint32)u32Formats);
@@ -393 +393 @@
                 }
 
-                case VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA:
+                case VBOX_SHCL_HOST_MSG_READ_DATA:
                 {
                     /* The host needs data in the specified format. */
-                    LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA u32Formats=%x\n", u32Formats));
+                    LogRelFlowFunc(("VBOX_SHCL_HOST_MSG_READ_DATA u32Formats=%x\n", u32Formats));
                     BMessage msg(VBOX_GUEST_CLIPBOARD_HOST_MSG_READ_DATA);
                     msg.AddInt32("Formats", (uint32)u32Formats);
@@ -403 +403 @@
                 }
 
-                case VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT:
+                case VBOX_SHCL_HOST_MSG_QUIT:
                 {
                     /* The host is terminating. */
-                    LogRelFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT\n"));
+                    LogRelFlowFunc(("VBOX_SHCL_HOST_MSG_QUIT\n"));
                     fExiting = true;
                     return VERR_INTERRUPTED;
@@ -412 +412 @@
 
                 default:
-                    Log(("VBoxClipboardService::%s: Unsupported message from host! Message = %u\n", __FUNCTION__, u32Msg));
+                    Log(("VBoxShClService::%s: Unsupported message from host! Message = %u\n", __FUNCTION__, u32Msg));
             }
         }
@@ -427 +427 @@
 
 
-void* VBoxClipboardService::_VBoxReadHostClipboard(uint32_t format, uint32_t *pcb)
+void* VBoxShClService::_VBoxReadHostClipboard(uint32_t format, uint32_t *pcb)
 {
     uint32_t cb = 1024;