Changeset 106789 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 30, 2024 12:29:50 PM (3 months ago)

Author:

vboxsync

Message:

Additions: Linux/Wayland: Rename IPC command names to be more generic, bugref:10796.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• wayland-helper-ipc.cpp (modified) (7 diffs)
• wayland-helper-ipc.h (modified) (9 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.cpp

@@ -115 +115 @@
             switch (pPacket->idCmd)
             {
-                case vbcl::ipc::CLIP_FORMATS:
-                case vbcl::ipc::CLIP_FORMAT:
+                case vbcl::ipc::VBOX_FORMATS:
+                case vbcl::ipc::VBOX_FORMAT:
                     cbPayload = sizeof(vbcl::ipc::data::formats_packet_t);
                     break;
 
-                case vbcl::ipc::CLIP_DATA:
+                case vbcl::ipc::VBOX_DATA:
                 {
                     vbcl::ipc::data::data_packet_t *pDataEx = (vbcl::ipc::data::data_packet_t *)pPacket;
@@ -255 +255 @@
     Packet.Hdr.u64Crc = 0;
     Packet.Hdr.uSessionId = uSessionId;
-    Packet.Hdr.idCmd = CLIP_FORMATS;
+    Packet.Hdr.idCmd = VBOX_FORMATS;
     Packet.Hdr.cbData = sizeof(Packet);
 
@@ -283 +283 @@
     if (RT_SUCCESS(rc))
     {
-        if (   pPacket->Hdr.idCmd == CLIP_FORMATS
+        if (   pPacket->Hdr.idCmd == VBOX_FORMATS
             && vbcl::ipc::packet_verify(&pPacket->Hdr, pPacket->Hdr.cbData))
         {
@@ -312 +312 @@
     Packet.Hdr.u64Crc = 0;
     Packet.Hdr.uSessionId = uSessionId;
-    Packet.Hdr.idCmd = CLIP_FORMAT;
+    Packet.Hdr.idCmd = VBOX_FORMAT;
     Packet.Hdr.cbData = sizeof(Packet);
 
@@ -340 +340 @@
     if (RT_SUCCESS(rc))
     {
-        if (   pPacket->Hdr.idCmd == CLIP_FORMAT
+        if (   pPacket->Hdr.idCmd == VBOX_FORMAT
             && vbcl::ipc::packet_verify(&pPacket->Hdr, pPacket->Hdr.cbData))
         {
@@ -377 +377 @@
             pPacket->Hdr.u64Crc = 0;
             pPacket->Hdr.uSessionId = uSessionId;
-            pPacket->Hdr.idCmd = CLIP_DATA;
+            pPacket->Hdr.idCmd = VBOX_DATA;
             pPacket->Hdr.cbData = sizeof(vbcl::ipc::data::data_packet_t) + cbData;
             pPacket->cbData = cbData;
@@ -407 +407 @@
     if (RT_SUCCESS(rc))
     {
-        if (   pPacket->Hdr.idCmd == CLIP_DATA
+        if (   pPacket->Hdr.idCmd == VBOX_DATA
             && vbcl::ipc::packet_verify(&pPacket->Hdr, pPacket->Hdr.cbData))
         {

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.h

@@ -81 +81 @@
             /** Send or receive list of clipboard formats which
              *  host or guest announces. */
-            CLIP_FORMATS,
+            VBOX_FORMATS,
             /** Send or receive a clipboard format which host
              *  or guest requests. */
-            CLIP_FORMAT,
+            VBOX_FORMAT,
             /** Send or receive clipboard data in given format. */
-            CLIP_DATA,
+            VBOX_DATA,
             /** Termination of commands list. */
             CMD_MAX
@@ -160 +160 @@
         namespace data
         {
-            /** Payload for IPC commands CLIP_FORMATS and CLIP_FORMAT. */
+            /** Payload for IPC commands VBOX_FORMATS and VBOX_FORMAT. */
             typedef struct
             {
@@ -169 +169 @@
             } formats_packet_t;
 
-            /** Payload for IPC command CLIP_DATA. */
+            /** Payload for IPC command VBOX_DATA. */
             typedef struct
             {
@@ -195 +195 @@
             const flow_t HGCopyFlow[4] =
             {
-                { CLIP_FORMATS, FLOW_DIRECTION_CLIENT },
-                { CLIP_FORMAT,  FLOW_DIRECTION_SERVER },
-                { CLIP_DATA,    FLOW_DIRECTION_CLIENT },
+                { VBOX_FORMATS, FLOW_DIRECTION_CLIENT },
+                { VBOX_FORMAT,  FLOW_DIRECTION_SERVER },
+                { VBOX_DATA,    FLOW_DIRECTION_CLIENT },
                 { CMD_MAX,      false }
             };
@@ -204 +204 @@
             const flow_t GHCopyFlow[3] =
             {
-                { CLIP_FORMAT,  FLOW_DIRECTION_CLIENT },
-                { CLIP_DATA,    FLOW_DIRECTION_SERVER },
+                { VBOX_FORMAT,  FLOW_DIRECTION_CLIENT },
+                { VBOX_DATA,    FLOW_DIRECTION_SERVER },
                 { CMD_MAX,      false }
             };
@@ -213 +213 @@
             const flow_t GHAnnounceAndCopyFlow[4] =
             {
-                { CLIP_FORMATS, FLOW_DIRECTION_SERVER },
-                { CLIP_FORMAT,  FLOW_DIRECTION_CLIENT },
-                { CLIP_DATA,    FLOW_DIRECTION_SERVER },
+                { VBOX_FORMATS, FLOW_DIRECTION_SERVER },
+                { VBOX_FORMAT,  FLOW_DIRECTION_CLIENT },
+                { VBOX_DATA,    FLOW_DIRECTION_SERVER },
                 { CMD_MAX,      false }
             };
@@ -369 +369 @@
                         switch(enmCmd)
                         {
-                            case CLIP_FORMATS:
+                            case VBOX_FORMATS:
                             {
                                 if (fShouldSend)
@@ -378 +378 @@
                             }
 
-                            case CLIP_FORMAT:
+                            case VBOX_FORMAT:
                             {
                                 if (fShouldSend)
@@ -387 +387 @@
                             }
 
-                            case CLIP_DATA:
+                            case VBOX_DATA:
                             {
                                 if (fShouldSend)