Changeset 21226 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Jul 5, 2009 5:37:04 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49546

Message:

VMMDev.h: cleanup.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• DisplayImpl.h (modified) (3 diffs)
• MouseImpl.cpp (modified) (4 diffs)
• VMMDevInterface.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.h

@@ -42 +42 @@
     void handleDisplayUpdate (int x, int y, int cx, int cy);
 
-    int VideoAccelEnable (bool fEnable, struct _VBVAMEMORY *pVbvaMemory);
+    int VideoAccelEnable (bool fEnable, struct VBVAMEMORY *pVbvaMemory);
     void VideoAccelFlush (void);
     bool VideoAccelAllowed (void);
@@ -88 +88 @@
     ULONG mSupportedAccelOps;
 
-    struct _VBVAMEMORY *mpVbvaMemory;
+    struct VBVAMEMORY *mpVbvaMemory;
     bool        mfVideoAccelEnabled;
 
-    struct _VBVAMEMORY *mpPendingVbvaMemory;
+    struct VBVAMEMORY *mpPendingVbvaMemory;
     bool        mfPendingVideoAccelEnable;
     bool        mfMachineRunning;
@@ -103 +103 @@
     void handleResizeCompletedEMT (void);
     volatile uint32_t mu32ResizeStatus;
-    
+
     enum {
         ResizeStatus_Void,

trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.cpp

@@ -72 +72 @@
 int Mouse::setHostCursor(bool enable)
 {
-    uHostCaps = enable ? 0 : VMMDEV_MOUSEHOSTCANNOTHWPOINTER;
+    uHostCaps = enable ? 0 : VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER;
     gVMMDev->SetMouseCapabilities(uHostCaps);
     return S_OK;
@@ -96 +96 @@
      * device isn't aware of that yet, tell it.
      */
-    if (mouseCaps & VMMDEV_MOUSEHOSTWANTSABS)
+    if (mouseCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
     {
         gVMMDev->SetMouseCapabilities(uHostCaps);
@@ -136 +136 @@
      * device isn't aware of that yet, tell it.
      */
-    if (!(mouseCaps & VMMDEV_MOUSEHOSTWANTSABS))
-    {
-        gVMMDev->SetMouseCapabilities(uHostCaps | VMMDEV_MOUSEHOSTWANTSABS);
+    if (!(mouseCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE))
+    {
+        gVMMDev->SetMouseCapabilities(uHostCaps | VMMDEV_MOUSE_HOST_CAN_ABSOLUTE);
     }
 
@@ -156 +156 @@
 
     // check if the guest actually wants absolute mouse positions
-    if (mouseCaps & VMMDEV_MOUSEGUESTWANTSABS)
+    if (mouseCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
     {
         uint32_t fButtons = 0;

trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp

@@ -173 +173 @@
     if (gMouse)
     {
-        gMouse->setAbsoluteCoordinates(!!(newCapabilities & VMMDEV_MOUSEGUESTWANTSABS));
-        gMouse->setNeedsHostCursor(!!(newCapabilities & VMMDEV_MOUSEGUESTNEEDSHOSTCUR));
+        gMouse->setAbsoluteCoordinates(!!(newCapabilities & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE));
+        gMouse->setNeedsHostCursor(!!(newCapabilities & VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR));
     }
     if (gConsole)