Changeset 33075 in vbox for trunk/src

Timestamp:

Oct 12, 2010 3:20:06 PM (14 years ago)

Author:

vboxsync

Message:

Main: also support absolute mouse events

Location:

trunk/src/VBox

Files:

• Frontends/VBoxShell/vboxshell.py (modified) (1 diff)
• Main/MouseImpl.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -298 +298 @@
 
 def printMouseEvent(ctx, mev):
-    print "Mouse: x=%d y=%d z=%d" %(mev.x, mev.y, mev.z)
+    print "Mouse : absolute=%d x=%d y=%d z=%d buttons=%x" %(mev.absolute, mev.x, mev.y, mev.z, mev.buttons)
 
 def printKbdEvent(ctx, kev):

trunk/src/VBox/Main/MouseImpl.cpp

@@ -333 +333 @@
                             vrc);
         mLastButtons = fButtons;
-#ifndef VBOXBFE_WITHOUT_COM
-#if 1
-        mMouseEvent.reinit(VBoxEventType_OnGuestMouseEvent, dx, dy, dz, dw, fButtons);
-        mMouseEvent.fire(0);
-#endif
-#endif
     }
     return S_OK;
@@ -376 +370 @@
                             vrc);
         mLastButtons = fButtons;
+
     }
     return S_OK;
@@ -485 +480 @@
     rc = reportRelEventToMouseDev(dx, dy, dz, dw, fButtons);
 
+#ifndef VBOXBFE_WITHOUT_COM
+    mMouseEvent.reinit(VBoxEventType_OnGuestMouseEvent, false, dx, dy, dz, dw, fButtons);
+    mMouseEvent.fire(0);
+#endif
+
     return rc;
 }
@@ -578 +578 @@
     rc = reportAbsEvent(mouseXAbs, mouseYAbs, dz, dw, fButtons,
                         mouseCaps & VMMDEV_MOUSE_GUEST_USES_EVENT);
+
+#ifndef VBOXBFE_WITHOUT_COM
+    mMouseEvent.reinit(VBoxEventType_OnGuestMouseEvent, true, mouseXAbs, mouseYAbs, dz, dw, fButtons);
+    mMouseEvent.fire(0);
+#endif
 
     return rc;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -14979 +14979 @@
   <interface
     name="IGuestMouseEvent" extends="IReusableEvent"
-    uuid="2ab6f43c-a111-4520-be63-5d560e8eb463"
+    uuid="1f85d35c-c524-40ff-8e98-307000df0992"
     wsmap="managed" autogen="VBoxEvent" id="OnGuestMouseEvent"
     >
@@ -14986 +14986 @@
    </desc>
 
+   <attribute name="absolute" type="boolean" readonly="yes">
+     <desc>
+       If this event is relative or absolute.
+     </desc>
+   </attribute>
+
    <attribute name="x" type="long" readonly="yes">
      <desc>
-       New X position.
+       New X position, or X delta.
      </desc>
    </attribute>
@@ -14994 +15000 @@
    <attribute name="y" type="long" readonly="yes">
      <desc>
-       New Y position.
+       New Y position, or Y delta.
      </desc>
    </attribute>
@@ -15000 +15006 @@
    <attribute name="z" type="long" readonly="yes">
      <desc>
-       New Z position.
+       Z delta.
      </desc>
    </attribute>
@@ -15006 +15012 @@
    <attribute name="w" type="long" readonly="yes">
      <desc>
-       New W position.
+       W delta.
      </desc>
    </attribute>