Changeset 74439 in vbox for trunk/include/VBox

Timestamp:

Sep 24, 2018 12:30:47 PM (6 years ago)

Author:

vboxsync

Message:

DnD: Added typedefs for DNDACTION and DNDACTIONLIST to emphasize usage, did some renaming to clean things up.

Location:

trunk/include/VBox

Files:

• GuestHost/DragAndDropDefs.h (added)
• HostServices/DragAndDropSvc.h (modified) (1 diff)
• VBoxGuestLib.h (modified) (6 diffs)

trunk/include/VBox/HostServices/DragAndDropSvc.h

@@ -67 +67 @@
 #include <VBox/VMMDevCoreTypes.h>
 #include <VBox/VBoxGuestCoreTypes.h>
-
-/*
- * The mode of operations.
- */
-#define VBOX_DRAG_AND_DROP_MODE_OFF           0
-#define VBOX_DRAG_AND_DROP_MODE_HOST_TO_GUEST 1
-#define VBOX_DRAG_AND_DROP_MODE_GUEST_TO_HOST 2
-#define VBOX_DRAG_AND_DROP_MODE_BIDIRECTIONAL 3
-
-#define VBOX_DND_ACTION_IGNORE     UINT32_C(0)
-#define VBOX_DND_ACTION_COPY       RT_BIT_32(0)
-#define VBOX_DND_ACTION_MOVE       RT_BIT_32(1)
-#define VBOX_DND_ACTION_LINK       RT_BIT_32(2)
-
-/** A single DnD action. */
-typedef uint32_t VBOXDNDACTION;
-/** A list of (OR'ed) DnD actions. */
-typedef uint32_t VBOXDNDACTIONLIST;
-
-#define hasDnDCopyAction(a)   ((a) & VBOX_DND_ACTION_COPY)
-#define hasDnDMoveAction(a)   ((a) & VBOX_DND_ACTION_MOVE)
-#define hasDnDLinkAction(a)   ((a) & VBOX_DND_ACTION_LINK)
-
-#define isDnDIgnoreAction(a)  ((a) == VBOX_DND_ACTION_IGNORE)
-#define isDnDCopyAction(a)    ((a) == VBOX_DND_ACTION_COPY)
-#define isDnDMoveAction(a)    ((a) == VBOX_DND_ACTION_MOVE)
-#define isDnDLinkAction(a)    ((a) == VBOX_DND_ACTION_LINK)
-
-/** @def VBOX_DND_FORMATS_DEFAULT
- * Default drag'n drop formats.
- * Note: If you add new entries here, make sure you test those
- *       with all supported guest OSes!
- */
-#define VBOX_DND_FORMATS_DEFAULT                                                                \
-    "text/uri-list",                                                                            \
-    /* Text. */                                                                                 \
-    "text/html",                                                                                \
-    "text/plain;charset=utf-8",                                                                 \
-    "text/plain;charset=utf-16",                                                                \
-    "text/plain",                                                                               \
-    "text/richtext",                                                                            \
-    "UTF8_STRING",                                                                              \
-    "TEXT",                                                                                     \
-    "STRING",                                                                                   \
-    /* OpenOffice formats. */                                                                   \
-    /* See: https://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Common_Application_Features#OpenOffice.org_Clipboard_Data_Formats */ \
-    "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"", \
-    "application/x-openoffice;windows_formatname=\"Bitmap\""
 
 namespace DragAndDropSvc {

trunk/include/VBox/VBoxGuestLib.h

@@ -34 +34 @@
 #include <VBox/VMMDev.h>
 #include <VBox/VBoxGuestCoreTypes.h>
+# ifdef VBOX_WITH_DRAG_AND_DROP
+#  include <VBox/GuestHost/DragAndDropDefs.h>
+# endif
 
 /** @defgroup grp_vboxguest_lib     VirtualBox Guest Additions Library
@@ -920 +923 @@
             /** Size (in bytes) of pszFormats (\0 included). */
             uint32_t cbFormats;
-            /** Allowed DnD actions. */
-            uint32_t uAllActions;
+            /** List of allowed DnD actions. */
+            VBOXDNDACTIONLIST dndLstActionsAllowed;
         } HG_Enter;
         struct
@@ -929 +932 @@
             /** Absolute Y position of guest screen. */
             uint32_t uYpos;
-            /** Proposed DnD action. */
-            uint32_t uDefAction;
+            /** Default DnD action. */
+            VBOXDNDACTION dndActionDefault;
         } HG_Move;
         struct
@@ -942 +945 @@
             /** Absolute Y position of guest screen. */
             uint32_t uYpos;
-            /** Proposed DnD action. */
-            uint32_t uDefAction;
+            /** Default DnD action. */
+            VBOXDNDACTION dndActionDefault;
         } HG_Drop;
         struct
@@ -968 +971 @@
             uint32_t cbFormat;
             /** Requested DnD action. */
-            uint32_t uAction;
+            VBOXDNDACTION dndActionRequested;
         } GH_Drop;
 # endif
@@ -982 +985 @@
 VBGLR3DECL(void)    VbglR3DnDEventFree(PVBGLR3DNDEVENT pEvent);
 
-VBGLR3DECL(int)     VbglR3DnDHGSendAckOp(PVBGLR3GUESTDNDCMDCTX pCtx, uint32_t uAction);
+VBGLR3DECL(int)     VbglR3DnDHGSendAckOp(PVBGLR3GUESTDNDCMDCTX pCtx, VBOXDNDACTION dndAction);
 VBGLR3DECL(int)     VbglR3DnDHGSendReqData(PVBGLR3GUESTDNDCMDCTX pCtx, const char *pcszFormat);
 VBGLR3DECL(int)     VbglR3DnDHGSendProgress(PVBGLR3GUESTDNDCMDCTX pCtx, uint32_t uStatus, uint8_t uPercent, int rcErr);
 #  ifdef VBOX_WITH_DRAG_AND_DROP_GH
-VBGLR3DECL(int)     VbglR3DnDGHSendAckPending(PVBGLR3GUESTDNDCMDCTX pCtx, uint32_t uDefAction, uint32_t uAllActions, const char* pcszFormats, uint32_t cbFormats);
+VBGLR3DECL(int)     VbglR3DnDGHSendAckPending(PVBGLR3GUESTDNDCMDCTX pCtx, VBOXDNDACTION dndActionDefault, VBOXDNDACTIONLIST dndLstActionsAllowed, const char* pcszFormats, uint32_t cbFormats);
 VBGLR3DECL(int)     VbglR3DnDGHSendData(PVBGLR3GUESTDNDCMDCTX pCtx, const char *pszFormat, void *pvData, uint32_t cbData);
 VBGLR3DECL(int)     VbglR3DnDGHSendError(PVBGLR3GUESTDNDCMDCTX pCtx, int rcOp);