Changeset 54495 in vbox

Timestamp:

Feb 25, 2015 1:47:58 PM (10 years ago)

Author:

vboxsync

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

98604

Message:

Main/Display and Mouse: input mapping fix for when VMMDev is not in use.

Location:

trunk

Files:

• include/VBox/VBoxVideo.h (modified) (1 diff)
• src/VBox/Main/include/DisplayImpl.h (modified) (2 diffs)
• src/VBox/Main/src-client/MouseImpl.cpp (modified) (1 diff)
• src/VBox/Main/testcase/tstMouseImpl.cpp (modified) (1 diff)

trunk/include/VBox/VBoxVideo.h

@@ -1165 +1165 @@
  *  expressed.  This information remains valid until the next VBVA resize event
  *  for any screen, at which time it is reset to the bounding rectangle of all
- *  virtual screens. 
+ *  virtual screens and must be re-set. 
  *  @see VBVA_REPORT_INPUT_MAPPING. */
 typedef struct VBVAREPORTINPUTMAPPING

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

@@ -126 +126 @@
     virtual HRESULT i_reportHostCursorCapabilities(uint32_t fCapabilitiesAdded, uint32_t fCapabilitiesRemoved) = 0;
     virtual HRESULT i_reportHostCursorPosition(int32_t x, int32_t y) = 0;
+    virtual bool i_isInputMappingSet(void) = 0;
 };
 
@@ -205 +206 @@
     virtual HRESULT i_reportHostCursorCapabilities(uint32_t fCapabilitiesAdded, uint32_t fCapabilitiesRemoved);
     virtual HRESULT i_reportHostCursorPosition(int32_t x, int32_t y);
+    virtual bool i_isInputMappingSet(void)
+    {
+        return cxInputMapping != 0 && cyInputMapping != 0;
+    }
 
     static const PDMDRVREG  DrvReg;

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

@@ -790 +790 @@
     if (pfValid)
         *pfValid = true;
-    if (!(mfVMMDevGuestCaps & VMMDEV_MOUSE_NEW_PROTOCOL))
+    if (!(mfVMMDevGuestCaps & VMMDEV_MOUSE_NEW_PROTOCOL) && !pDisplay->i_isInputMappingSet())
     {
         ULONG displayWidth, displayHeight;

trunk/src/VBox/Main/testcase/tstMouseImpl.cpp

@@ -47 +47 @@
     { return S_OK; }
     virtual HRESULT i_reportHostCursorPosition(int32_t x, int32_t y) { return S_OK; }
+    virtual bool i_isInputMappingSet() { return true; }
 };