Changeset 32829 in vbox

Timestamp:

Sep 29, 2010 7:35:26 PM (15 years ago)

Author:

vboxsync

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

66287

Message:

Main/Mouse: Hungarian fixes

Location:

trunk/src/VBox/Main

Files:

• MouseImpl.cpp (modified) (10 diffs)
• include/MouseImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/MouseImpl.cpp

@@ -76 +76 @@
 {
     RT_ZERO(mpDrv);
-    fVMMDevCanAbs = false;
-    fVMMDevNeedsHostCursor = false;
+    mfVMMDevCanAbs = false;
+    mfVMMDevNeedsHostCursor = false;
     mLastAbsX = 0x8000;
     mLastAbsY = 0x8000;
@@ -110 +110 @@
     unconst(mParent) = parent;
 
-    uHostCaps = 0;
+    mfHostCaps = 0;
 
     /* Confirm a successful initialization */
@@ -199 +199 @@
     bool fAbs = false;
 
-    if (fVMMDevCanAbs)
+    if (mfVMMDevCanAbs)
         fAbs = TRUE;
 
@@ -251 +251 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    *pfNeedsHostCursor = fVMMDevNeedsHostCursor;
+    *pfNeedsHostCursor = mfVMMDevNeedsHostCursor;
     return S_OK;
 }
@@ -393 +393 @@
     LONG cJiggle = 0;
 
-    if (fVMMDevCanAbs)
+    if (mfVMMDevCanAbs)
     {
         /*
@@ -442 +442 @@
         /* Make sure that the guest knows that we are sending real movement
          * events to the PS/2 device and not just dummy wake-up ones. */
-        if (uHostCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
+        if (mfHostCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
         {
-            uHostCaps &= ~VMMDEV_MOUSE_HOST_CAN_ABSOLUTE;
+            mfHostCaps &= ~VMMDEV_MOUSE_HOST_CAN_ABSOLUTE;
             fUpdateCaps = TRUE;
         }
@@ -452 +452 @@
     /** @note we drop the lock before calling out of the object! */
     if (fUpdateCaps)
-        setVMMDevMouseCaps(uHostCaps);
+        setVMMDevMouseCaps(mfHostCaps);
     rc = reportRelEventToMouseDev(dx, dy, dz, dw, fButtons);
 
@@ -537 +537 @@
 
         /** @todo rename that capability to VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE */
-        if (fVMMDevCanAbs && !(uHostCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE))
+        if (mfVMMDevCanAbs && !(mfHostCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE))
         {
-            uHostCaps |= VMMDEV_MOUSE_HOST_CAN_ABSOLUTE;
+            mfHostCaps |= VMMDEV_MOUSE_HOST_CAN_ABSOLUTE;
             fUpdateCaps = TRUE;
         }
@@ -545 +545 @@
     /** @note we drop the lock again before calling out! */
     if (fUpdateCaps)
-        setVMMDevMouseCaps(uHostCaps);
+        setVMMDevMouseCaps(mfHostCaps);
 
     /** @todo rename that capability to VMMDEV_MOUSE_GUEST_USES_EVENT */
@@ -579 +579 @@
                    fRelDev = true;
             }
-        if (fAbsDev && !(uHostCaps & VMMDEV_MOUSE_HOST_HAS_ABS_DEV))
-            uHostCaps |= VMMDEV_MOUSE_HOST_HAS_ABS_DEV;
-        if (!fAbsDev && (uHostCaps & VMMDEV_MOUSE_HOST_HAS_ABS_DEV))
-            uHostCaps &= ~VMMDEV_MOUSE_HOST_HAS_ABS_DEV;
+        if (fAbsDev && !(mfHostCaps & VMMDEV_MOUSE_HOST_HAS_ABS_DEV))
+            mfHostCaps |= VMMDEV_MOUSE_HOST_HAS_ABS_DEV;
+        if (!fAbsDev && (mfHostCaps & VMMDEV_MOUSE_HOST_HAS_ABS_DEV))
+            mfHostCaps &= ~VMMDEV_MOUSE_HOST_HAS_ABS_DEV;
     }
     /** @note we drop the lock again before calling out! */
     if (SUCCEEDED(getVMMDevMouseCaps(&u32MouseCaps)))
-        fVMMDevCanAbs =    (u32MouseCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
+        mfVMMDevCanAbs =    (u32MouseCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
                         && fRelDev;
     else
-        fVMMDevCanAbs = false;
+        mfVMMDevCanAbs = false;
     /** @todo this call takes the Console lock in order to update the cached
      * callback data atomically.  However I can't see any sign that the cached
      * data is ever used again. */
-    mParent->onMouseCapabilityChange(fAbsDev || fVMMDevCanAbs, fRelDev,
-                                     fVMMDevNeedsHostCursor);
+    mParent->onMouseCapabilityChange(fAbsDev || mfVMMDevCanAbs, fRelDev,
+                                     mfVMMDevNeedsHostCursor);
     /** @todo if this gets called during device initialisation we get an
      * error due to VMMDev not being initialised yet. */
-    setVMMDevMouseCaps(uHostCaps);
+    setVMMDevMouseCaps(mfHostCaps);
 }
 

trunk/src/VBox/Main/include/MouseImpl.h

@@ -28 +28 @@
 /** Mouse driver instance data. */
 typedef struct DRVMAINMOUSE DRVMAINMOUSE, *PDRVMAINMOUSE;
-
-/** Simple mouse event class. */
-class MouseEvent
-{
-public:
-    MouseEvent() : dx(0), dy(0), dz(0), dw(0), state(-1) {}
-    MouseEvent(int32_t _dx, int32_t _dy, int32_t _dz, int32_t _dw, int32_t _state) :
-        dx(_dx), dy(_dy), dz(_dz), dw(_dw), state(_state) {}
-    bool isValid()
-    {
-        return state != -1;
-    }
-    /* Note: dw is the horizontal scroll wheel */
-    int32_t dx, dy, dz, dw;
-    int32_t state;
-};
-// template instantiation
-typedef ConsoleEventBuffer<MouseEvent> MouseEventBuffer;
 
 class ATL_NO_VTABLE Mouse :
@@ -104 +86 @@
     void onVMMDevNeedsHostChange(bool needsHost)
     {
-        fVMMDevNeedsHostCursor = needsHost;
+        mfVMMDevNeedsHostCursor = needsHost;
         sendMouseCapsNotifications();
     }
@@ -137 +119 @@
     struct DRVMAINMOUSE    *mpDrv[MOUSE_MAX_DEVICES];
 
-    LONG uHostCaps;
-    bool fVMMDevCanAbs;
-    bool fVMMDevNeedsHostCursor;
+    LONG mfHostCaps;
+    bool mfVMMDevCanAbs;
+    bool mfVMMDevNeedsHostCursor;
     uint32_t mLastAbsX;
     uint32_t mLastAbsY;