Changeset 96909 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 27, 2022 11:24:45 PM (2 years ago)

Author:

vboxsync

Message:

Main/MouseImpl: Simplified i_getDeviceCaps and code immediately associated with it.

Location:

trunk/src/VBox/Main

Files:

• include/MouseImpl.h (modified) (1 diff)
• src-client/MouseImpl.cpp (modified) (10 diffs)

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

@@ -127 +127 @@
     HRESULT i_putEventMultiTouch(LONG aCount, const LONG64 *paContacts, BOOL isTouchScreen, ULONG aScanTime);
 
-    void i_getDeviceCaps(bool *pfAbs, bool *pfRel, bool *pfTS, bool *pfTP);
+    uint32_t i_getDeviceCaps(void);
     void i_sendMouseCapsNotifications(void);
     bool i_guestNeedsHostCursor(void);
     bool i_vmmdevCanAbs(void);
     bool i_deviceCanAbs(void);
+    bool i_supportsAbs(uint32_t fCaps) const;
     bool i_supportsAbs(void);
     bool i_supportsRel(void);

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -1006 +1006 @@
 {
     if (aCount >= 256)
-    {
-         return E_INVALIDARG;
-    }
+        return E_INVALIDARG;
 
     HRESULT hrc = S_OK;
@@ -1095 +1093 @@
                     }
                 }
-            } else {
+            }
+            else
+            {
                 LONG i;
                 for (i = 0; i < aCount; i++)
@@ -1146 +1146 @@
 
 
-/** Check what sort of reporting can be done using the devices currently
- * enabled.  Does not consider the VMM device.
- *
- * @param   pfAbs   supports absolute mouse coordinates.
- * @param   pfRel   supports relative mouse coordinates.
- * @param   pfTS    supports touchscreen.
- * @param   pfTP    supports touchpad.
- */
-void Mouse::i_getDeviceCaps(bool *pfAbs, bool *pfRel, bool *pfTS, bool *pfTP)
-{
-    bool fAbsDev = false;
-    bool fRelDev = false;
-    bool fTSDev  = false;
-    bool fTPDev  = false;
-
+/**
+ * Gets the combined capabilities of all currently enabled devices.
+ *
+ * @returns Combination of MOUSE_DEVCAP_XXX
+ */
+uint32_t Mouse::i_getDeviceCaps(void)
+{
+    uint32_t fCaps = 0;
     AutoReadLock aLock(this COMMA_LOCKVAL_SRC_POS);
-
     for (unsigned i = 0; i < MOUSE_MAX_DEVICES; ++i)
         if (mpDrv[i])
-        {
-           if (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_ABSOLUTE)
-               fAbsDev = true;
-           if (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_RELATIVE)
-               fRelDev = true;
-           if (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_MT_ABSOLUTE)
-               fTSDev  = true;
-           if (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_MT_RELATIVE)
-               fTPDev  = true;
-        }
-    if (pfAbs)
-        *pfAbs = fAbsDev;
-    if (pfRel)
-        *pfRel = fRelDev;
-    if (pfTS)
-        *pfTS = fTSDev;
-    if (pfTP)
-        *pfTP = fTPDev;
+            fCaps |= mpDrv[i]->u32DevCaps;
+    return fCaps;
 }
 
@@ -1189 +1165 @@
 bool Mouse::i_vmmdevCanAbs(void)
 {
-    bool fRelDev;
-
-    i_getDeviceCaps(NULL, &fRelDev, NULL, NULL);
-    return    (mfVMMDevGuestCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
-           && fRelDev;
-}
-
-
-/** Does the VMM device currently support absolute reporting? */
+    /* This requires the VMMDev cap and a relative device, which supposedly
+       consumes these. As seen in @bugref{10285} this isn't quite as clear cut. */
+    return (mfVMMDevGuestCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
+        && (i_getDeviceCaps() & MOUSE_DEVCAP_RELATIVE);
+}
+
+
+/** Does any device currently support absolute reporting w/o help from VMMDev? */
 bool Mouse::i_deviceCanAbs(void)
 {
-    bool fAbsDev;
-
-    i_getDeviceCaps(&fAbsDev, NULL, NULL, NULL);
-    return fAbsDev;
+    return RT_BOOL(i_getDeviceCaps() & MOUSE_DEVCAP_ABSOLUTE);
 }
 
@@ -1210 +1182 @@
 bool Mouse::i_supportsRel(void)
 {
-    bool fRelDev;
-
-    i_getDeviceCaps(NULL, &fRelDev, NULL, NULL);
-    return fRelDev;
+    return RT_BOOL(i_getDeviceCaps() & MOUSE_DEVCAP_RELATIVE);
+}
+
+
+/** Can we currently send absolute events to the guest (including via VMMDev)? */
+bool Mouse::i_supportsAbs(uint32_t fCaps) const
+{
+    return (fCaps & MOUSE_DEVCAP_ABSOLUTE)
+        || /* inlined i_vmmdevCanAbs() to avoid unnecessary i_getDeviceCaps call: */
+           (   (mfVMMDevGuestCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
+            && (fCaps & MOUSE_DEVCAP_RELATIVE));
 }
 
@@ -1220 +1199 @@
 bool Mouse::i_supportsAbs(void)
 {
-    bool fAbsDev;
-
-    i_getDeviceCaps(&fAbsDev, NULL, NULL, NULL);
-    return fAbsDev || i_vmmdevCanAbs();
+    return Mouse::i_supportsAbs(i_getDeviceCaps());
 }
 
@@ -1230 +1206 @@
 bool Mouse::i_supportsTS(void)
 {
-    bool fTSDev;
-
-    i_getDeviceCaps(NULL, NULL, &fTSDev, NULL);
-    return fTSDev;
+    return RT_BOOL(i_getDeviceCaps() & MOUSE_DEVCAP_MT_ABSOLUTE);
 }
 
@@ -1240 +1213 @@
 bool Mouse::i_supportsTP(void)
 {
-    bool fTPDev;
-
-    i_getDeviceCaps(NULL, NULL, NULL, &fTPDev);
-    return fTPDev;
+    return RT_BOOL(i_getDeviceCaps() & MOUSE_DEVCAP_MT_RELATIVE);
 }
 
@@ -1253 +1223 @@
 {
     bool fRelDev, fTSDev, fTPDev, fCanAbs, fNeedsHostCursor;
-
     {
         AutoReadLock aLock(this COMMA_LOCKVAL_SRC_POS);
 
-        i_getDeviceCaps(NULL, &fRelDev, &fTSDev, &fTPDev);
-        fCanAbs = i_supportsAbs();
+        uint32_t const fCaps = i_getDeviceCaps();
+        fRelDev = RT_BOOL(fCaps & MOUSE_DEVCAP_RELATIVE);
+        fTSDev  = RT_BOOL(fCaps & MOUSE_DEVCAP_MT_ABSOLUTE);
+        fTPDev  = RT_BOOL(fCaps & MOUSE_DEVCAP_MT_RELATIVE);
+        fCanAbs = i_supportsAbs(fCaps);
         fNeedsHostCursor = i_guestNeedsHostCursor();
     }
@@ -1267 +1239 @@
 /**
  * @interface_method_impl{PDMIMOUSECONNECTOR,pfnReportModes}
- * A virtual device is notifying us about its current state and capabilities
  */
 DECLCALLBACK(void) Mouse::i_mouseReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRelative,