Changeset 97558 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 15, 2022 10:04:54 PM (2 years ago)

Author:

vboxsync

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

154589

Message:

Backed out r153813, r153818: Main: src-client: MouseImpl: Provide guest's absolute pointing mouse device with buttons state when mouse intergration is ON, bugref:10285.

File:

• trunk/src/VBox/Main/src-client/MouseImpl.cpp (modified) (2 diffs)

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

@@ -661 +661 @@
 {
     HRESULT hrc;
+    /** If we are using the VMMDev to report absolute position but without
+     * VMMDev IRQ support then we need to send a small "jiggle" to the emulated
+     * relative mouse device to alert the guest to changes. */
+    LONG cJiggle = 0;
+
     if (i_vmmdevCanAbs())
     {
-        /*
-         * If we are using the VMMDev to report absolute position but without
-         * VMMDev IRQ support then we need to send a small "jiggle" to the
-         * emulated relative mouse device to alert the guest to changes.
-         */
-        LONG cJiggle = 0;
-
         /*
          * Send the absolute mouse position to the VMM device.
@@ -678 +676 @@
             cJiggle = !fUsesVMMDevEvent;
         }
-
-        /*
-         * Since VMMDev does not deal with mouse buttons state, also
-         * send relative or absolute pointing event to emulated mouse
-         * device once it supports it.
-         *
-         * Relative pointing events are sent to: PS/2 Mouse, USB Mouse,
-         * combination of both (PS/2 and USB Mouse).
-         *
-         * Absolute ones to: USB Tablet, USB Multi-Touch Tablet,
-         * USB MT TouchScreen and TouchPad.
-         *
-         * IMPORTANT: Do not send relative event to devices which can
-         * do both relative and absolute pointing since it may result
-         * in unexpected behaviour.
-         *
-         * r=bird: Not entirely convinced this is a correct fix.
-         *
-         * See @bugref{10285} for background and more theories.
-         */
-        if (!i_deviceCanAbs())
-            hrc = i_reportRelEventToMouseDev(cJiggle, 0, dz, dw, fButtons);
-        else
-            hrc = i_reportAbsEventToMouseDev(x, y, dz, dw, fButtons);
+        hrc = i_reportRelEventToMouseDev(cJiggle, 0, dz, dw, fButtons);
     }
     else