Changeset 26935 in vbox for trunk/src

Timestamp:

Mar 2, 2010 10:32:28 AM (15 years ago)

Author:

vboxsync

Message:

pdmifs, Devices/Input, Main, FE/BFE: add support for absolute-only pointing devices

Location:

trunk/src/VBox

Files:

• Devices/Input/DrvMouseQueue.cpp (modified) (2 diffs)
• Devices/Input/UsbMouse.cpp (modified) (1 diff)
• Frontends/VBoxBFE/MouseImpl.cpp (modified) (2 diffs)
• Frontends/VBoxBFE/MouseImpl.h (modified) (1 diff)
• Main/MouseImpl.cpp (modified) (2 diffs)
• Main/include/MouseImpl.h (modified) (1 diff)

trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp

@@ -168 +168 @@
  * @param   fAbs        The new absolute mode state.
  */
-static DECLCALLBACK(void) drvMousePassThruAbsMode(PPDMIMOUSECONNECTOR pInterface, bool fAbs)
+static DECLCALLBACK(void) drvMousePassThruReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs)
 {
     PDRVMOUSEQUEUE pDrv = PPDMIMOUSECONNECTOR_2_DRVMOUSEQUEUE(pInterface);
-    pDrv->pDownConnector->pfnAbsModeChange(pDrv->pDownConnector, fAbs);
+    pDrv->pDownConnector->pfnReportModes(pDrv->pDownConnector, fRel, fAbs);
 }
 
@@ -289 +289 @@
     pDrvIns->IBase.pfnQueryInterface        = drvMouseQueueQueryInterface;
     /* IMouseConnector. */
-    pDrv->IConnector.pfnAbsModeChange       = drvMousePassThruAbsMode;
+    pDrv->IConnector.pfnReportModes         = drvMousePassThruReportModes;
     /* IMousePort. */
     pDrv->IPort.pfnPutEvent                 = drvMouseQueuePutEvent;

trunk/src/VBox/Devices/Input/UsbMouse.cpp

@@ -1108 +1108 @@
      * Set received event type to absolute or relative.
      */
-    pThis->Lun0.pDrv->pfnAbsModeChange(pThis->Lun0.pDrv, pThis->isAbsolute);
+    pThis->Lun0.pDrv->pfnReportModes(pThis->Lun0.pDrv, !pThis->isAbsolute,
+                                     pThis->isAbsolute);
 
     RTCritSectLeave(&pThis->CritSect);

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

@@ -583 +583 @@
 
 /**
- * @interface_method_impl{PDMIMOUSECONNECTOR,pfnAbsModeChange}
- */
-DECLCALLBACK(void) Mouse::mouseAbsModeChange(PPDMIMOUSECONNECTOR pInterface, bool fEnabled)
+ * @interface_method_impl{PDMIMOUSECONNECTOR,pfnReportModes}
+ */
+DECLCALLBACK(void) Mouse::mouseReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs)
 {
     PDRVMAINMOUSE pDrv = RT_FROM_MEMBER(pInterface, DRVMAINMOUSE, IConnector);
-    if (fEnabled)
+    if (fRel)
+        pDrv->pMouse->uDevCaps |= MOUSE_DEVCAP_RELATIVE;
+    else
+        pDrv->pMouse->uDevCaps &= ~MOUSE_DEVCAP_RELATIVE;
+    if (fAbs)
         pDrv->pMouse->uDevCaps |= MOUSE_DEVCAP_ABSOLUTE;
     else
@@ -656 +660 @@
     pDrvIns->IBase.pfnQueryInterface        = Mouse::drvQueryInterface;
 
-    pData->IConnector.pfnAbsModeChange      = Mouse::mouseAbsModeChange;
+    pData->IConnector.pfnReportModes        = Mouse::mouseReportModes;
 
     /*

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

@@ -129 +129 @@
 
     static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
-    static DECLCALLBACK(void)   mouseAbsModeChange (PPDMIMOUSECONNECTOR pInterface, bool fAbs);
+    static DECLCALLBACK(void)   mouseReportModes (PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs);
     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
     static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);

trunk/src/VBox/Main/MouseImpl.cpp

@@ -501 +501 @@
 
 /**
- * @interface_method_impl{PDMIMOUSECONNECTOR,pfnAbsModeChange}
- */
-DECLCALLBACK(void) Mouse::mouseAbsModeChange(PPDMIMOUSECONNECTOR pInterface, bool fEnabled)
+ * @interface_method_impl{PDMIMOUSECONNECTOR,pfnReportModes}
+ */
+DECLCALLBACK(void) Mouse::mouseReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs)
 {
     PDRVMAINMOUSE pDrv = RT_FROM_MEMBER(pInterface, DRVMAINMOUSE, IConnector);
-    if (fEnabled)
+    if (fRel)
+        pDrv->pMouse->uDevCaps |= MOUSE_DEVCAP_RELATIVE;
+    else
+        pDrv->pMouse->uDevCaps &= ~MOUSE_DEVCAP_RELATIVE;
+    if (fAbs)
         pDrv->pMouse->uDevCaps |= MOUSE_DEVCAP_ABSOLUTE;
     else
@@ -574 +578 @@
     pDrvIns->IBase.pfnQueryInterface        = Mouse::drvQueryInterface;
 
-    pData->IConnector.pfnAbsModeChange      = Mouse::mouseAbsModeChange;
+    pData->IConnector.pfnReportModes        = Mouse::mouseReportModes;
 
     /*

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

@@ -118 +118 @@
 
     static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
-    static DECLCALLBACK(void)   mouseAbsModeChange (PPDMIMOUSECONNECTOR pInterface, bool fAbs);
+    static DECLCALLBACK(void)   mouseReportModes (PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs);
     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
     static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);