Changeset 40310 in vbox

Timestamp:

Mar 1, 2012 11:56:06 AM (13 years ago)

Author:

vboxsync

Message:

Devices/VMMDev and Additions: use a single definition for the value range of the Additions pointer position reporting.

Location:

trunk

Files:

• include/VBox/VMMDev.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (2 diffs)
• src/VBox/Additions/x11/vboxmouse/vboxmouse.c (modified) (3 diffs)
• src/VBox/Main/src-client/MouseImpl.cpp (modified) (6 diffs)

trunk/include/VBox/VMMDev.h

@@ -317 +317 @@
        | VMMDEV_MOUSE_HOST_RECHECKS_NEEDS_HOST_CURSOR \
        | VMMDEV_MOUSE_HOST_HAS_ABS_DEV)
+/** @} */
+
+/** @name Absolute mouse reporting range
+ * @{ */
+/** @todo Should these be here?  They are needed by both host and guest. */
+/** The minumum value our pointing device can return. */
+#define VMMDEV_MOUSE_RANGE_MIN 0
+/** The maximum value our pointing device can return. */
+#define VMMDEV_MOUSE_RANGE_MAX 0xFFFF
+/** The full range our pointing device can return. */
+#define VMMDEV_MOUSE_RANGE (VMMDEV_MOUSE_RANGE_MAX - VMMDEV_MOUSE_RANGE_MIN)
 /** @} */
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -390 +390 @@
 
 
-enum
-{
-    /** The minumum value our device can return */
-    RANGE_MIN = 0,
-    /** The maximum value our device can return */
-    RANGE_MAX = 0xFFFF
-};
-
-
 #ifdef VBOXGUEST_WITH_INPUT_DRIVER
 /** Calls the kernel IOCtl to report mouse status to the host on behalf of
@@ -476 +467 @@
     ASMBitSet(g_pInputDevice->evbit, EV_SYN);
 # endif
-    input_set_abs_params(g_pInputDevice, ABS_X, RANGE_MIN, RANGE_MAX, 0, 0);
-    input_set_abs_params(g_pInputDevice, ABS_Y, RANGE_MIN, RANGE_MAX, 0, 0);
+    input_set_abs_params(g_pInputDevice, ABS_X, VMMDEV_MOUSE_RANGE_MIN,
+                         VMMDEV_MOUSE_RANGE_MAX, 0, 0);
+    input_set_abs_params(g_pInputDevice, ABS_Y, VMMDEV_MOUSE_RANGE_MIN,
+                         VMMDEV_MOUSE_RANGE_MAX, 0, 0);
     ASMBitSet(g_pInputDevice->keybit, BTN_MOUSE);
     /** @todo this string should be in a header file somewhere. */

trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse.c

@@ -63 +63 @@
 #include "product-generated.h"
 
-enum
-{
-    /** The minumum value our device can return */
-    RANGE_MIN = 0,
-    /** The maximum value our device can return */
-    RANGE_MAX = 0xFFFF
-};
-
 static void
 VBoxReadInput(InputInfoPtr pInfo)
@@ -144 +136 @@
                                axis_labels[0],
 # endif
-                               RANGE_MIN /* min X */, RANGE_MAX /* max X */,
+                               VMMDEV_MOUSE_RANGE_MIN /* min X */, VMMDEV_MOUSE_RANGE_MAX /* max X */,
                                10000, 0, 10000
 # if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
@@ -155 +147 @@
                                axis_labels[1],
 # endif
-                               RANGE_MIN /* min Y */, RANGE_MAX /* max Y */,
+                               VMMDEV_MOUSE_RANGE_MIN /* min Y */, VMMDEV_MOUSE_RANGE_MAX /* max Y */,
                                10000, 0, 10000
 # if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12

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

@@ -41 +41 @@
 /** @} */
 
-/** @name Absolute mouse reporting range
- * @{ */
-enum
-{
-    /** Lower end */
-    MOUSE_RANGE_LOWER = 0,
-    /** Higher end */
-    MOUSE_RANGE_UPPER = 0xFFFF,
-    /** Full range */
-    MOUSE_RANGE = MOUSE_RANGE_UPPER - MOUSE_RANGE_LOWER
-};
-/** @} */
 
 /**
@@ -327 +315 @@
                                         int32_t dz, int32_t dw, uint32_t fButtons)
 {
-    if (mouseXAbs < MOUSE_RANGE_LOWER || mouseXAbs > MOUSE_RANGE_UPPER)
+    if (   mouseXAbs < VMMDEV_MOUSE_RANGE_MIN
+        || mouseXAbs > VMMDEV_MOUSE_RANGE_MAX)
         return S_OK;
-    if (mouseYAbs < MOUSE_RANGE_LOWER || mouseYAbs > MOUSE_RANGE_UPPER)
+    if (   mouseYAbs < VMMDEV_MOUSE_RANGE_MIN
+        || mouseYAbs > VMMDEV_MOUSE_RANGE_MAX)
         return S_OK;
     if (   mouseXAbs != mcLastAbsX || mouseYAbs != mcLastAbsY
@@ -477 +467 @@
 /**
  * Convert an (X, Y) value pair in screen co-ordinates (starting from 1) to a
- * value from MOUSE_RANGE_LOWER to MOUSE_RANGE_UPPER.  Sets the optional
- * validity value to false if the pair is not on an active screen and to true
- * otherwise.
+ * value from VMMDEV_MOUSE_RANGE_MIN to VMMDEV_MOUSE_RANGE_MAX.  Sets the
+ * optional validity value to false if the pair is not on an active screen and
+ * to true otherwise.
  * @note      since guests with recent versions of X.Org use a different method
  *            to everyone else to map the valuator value to a screen pixel (they
@@ -501 +491 @@
      * to compensate for differences in guest methods for mapping back to
      * pixels */
-    enum { ADJUST_RANGE = - 3 * MOUSE_RANGE / 4 };
+    enum { ADJUST_RANGE = - 3 * VMMDEV_MOUSE_RANGE / 4 };
 
     if (pfValid)
@@ -509 +499 @@
         ULONG displayWidth, displayHeight;
         /* Takes the display lock */
-        HRESULT rc = pDisplay->GetScreenResolution(0, &displayWidth, &displayHeight,
-                                                   NULL);
+        HRESULT rc = pDisplay->GetScreenResolution(0, &displayWidth,
+                                                   &displayHeight, NULL);
         if (FAILED(rc))
             return rc;
 
-        *pcX = displayWidth ? (x * MOUSE_RANGE + ADJUST_RANGE) / (LONG) displayWidth: 0;
-        *pcY = displayHeight ? (y * MOUSE_RANGE + ADJUST_RANGE) / (LONG) displayHeight: 0;
+        *pcX = displayWidth ?    (x * VMMDEV_MOUSE_RANGE + ADJUST_RANGE)
+                               / (LONG) displayWidth: 0;
+        *pcY = displayHeight ?   (y * VMMDEV_MOUSE_RANGE + ADJUST_RANGE)
+                               / (LONG) displayHeight: 0;
     }
     else
@@ -522 +514 @@
         /* Takes the display lock */
         pDisplay->getFramebufferDimensions(&x1, &y1, &x2, &y2);
-        *pcX = x1 < x2 ? ((x - x1) * MOUSE_RANGE + ADJUST_RANGE) / (x2 - x1) : 0;
-        *pcY = y1 < y2 ? ((y - y1) * MOUSE_RANGE + ADJUST_RANGE) / (y2 - y1) : 0;
-        if (   *pcX < MOUSE_RANGE_LOWER || *pcX > MOUSE_RANGE_UPPER
-            || *pcY < MOUSE_RANGE_LOWER || *pcY > MOUSE_RANGE_UPPER)
+        *pcX = x1 < x2 ?   ((x - x1) * VMMDEV_MOUSE_RANGE + ADJUST_RANGE)
+                         / (x2 - x1) : 0;
+        *pcY = y1 < y2 ?   ((y - y1) * VMMDEV_MOUSE_RANGE + ADJUST_RANGE)
+                         / (y2 - y1) : 0;
+        if (   *pcX < VMMDEV_MOUSE_RANGE_MIN || *pcX > VMMDEV_MOUSE_RANGE_MAX
+            || *pcY < VMMDEV_MOUSE_RANGE_MIN || *pcY > VMMDEV_MOUSE_RANGE_MAX)
             if (pfValid)
                 *pfValid = false;