Changeset 33061 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Main, vboxshell: implemented support for user activity capturing

Location:

trunk

Files:

• include/VBox/com/array.h (modified) (1 diff)
• src/VBox/Frontends/VBoxShell/vboxshell.py (modified) (4 diffs)
• src/VBox/Main/KeyboardImpl.cpp (modified) (4 diffs)
• src/VBox/Main/MouseImpl.cpp (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (9 diffs)
• src/VBox/Main/include/KeyboardImpl.h (modified) (3 diffs)
• src/VBox/Main/include/MouseImpl.h (modified) (3 diffs)

trunk/include/VBox/com/array.h

@@ -1224 +1224 @@
     resize(aSize);
     ::memcpy(raw(), aPtr, aSize);
+}
+
+
+template<>
+inline void com::SafeArray<LONG>::initFrom(const com::SafeArray<LONG> & aRef)
+{
+    size_t sSize = aRef.size();
+    resize(sSize);
+    ::memcpy(raw(), aRef.raw(), sSize * sizeof(LONG));
+}
+template<>
+inline void com::SafeArray<LONG>::initFrom(const LONG* aPtr, size_t aSize)
+{
+    resize(aSize);
+    ::memcpy(raw(), aPtr, aSize * sizeof(LONG));
 }
 

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

@@ -297 +297 @@
     exec cmds
 
+def printMouseEvent(ctx, mev):
+    print "Mouse: x=%d y=%d z=%d" %(mev.x, mev.y, mev.z)
+
+def printKbdEvent(ctx, kev):
+    print "Kbd: ", ctx['global'].getArray(kev, 'scancodes')
+
 def monitorSource(ctx, es, active, dur):
     def handleEventImpl(ev):
@@ -317 +323 @@
                  else:
                      print "pointer shape event: w=%d h=%d shape len=%d" %(psev.width, psev.height, len(shape))
+         elif type == ctx['global'].constants.VBoxEventType_OnGuestMouseEvent:
+             mev = ctx['global'].queryInterface(ev, 'IGuestMouseEvent')
+             if mev:
+                 printMouseEvent(ctx, mev)
+         elif type == ctx['global'].constants.VBoxEventType_OnGuestKeyboardEvent:
+             kev = ctx['global'].queryInterface(ev, 'IGuestKeyboardEvent')
+             if kev:
+                 printKbdEvent(ctx, kev)
 
     class EventListener:
@@ -1345 +1359 @@
     return 0
 
+def monitorGuestKbdCmd(ctx, args):
+    if (len(args) < 2):
+        print "usage: monitorGuestKbd name (duration)"
+        return 0
+    mach = argsToMach(ctx,args)
+    if mach == None:
+        return 0
+    dur = 5
+    if len(args) > 2:
+        dur = float(args[2])
+    active = False
+    cmdExistingVm(ctx, mach, 'guestlambda', [lambda ctx,mach,console,args:  monitorSource(ctx, console.keyboard.eventSource, active, dur)])
+    return 0
+
+def monitorGuestMouseCmd(ctx, args):
+    if (len(args) < 2):
+        print "usage: monitorGuestMouse name (duration)"
+        return 0
+    mach = argsToMach(ctx,args)
+    if mach == None:
+        return 0
+    dur = 5
+    if len(args) > 2:
+        dur = float(args[2])
+    active = False
+    cmdExistingVm(ctx, mach, 'guestlambda', [lambda ctx,mach,console,args:  monitorSource(ctx, console.mouse.eventSource, active, dur)])
+    return 0
 
 def monitorVBoxCmd(ctx, args):
@@ -2825 +2866 @@
             'guest':['Execute command for guest: guest Win32 \'console.mouse.putMouseEvent(20, 20, 0, 0, 0)\'', guestCmd, 0],
             'monitorGuest':['Monitor what happens with the guest for some time: monitorGuest Win32 10', monitorGuestCmd, 0],
+            'monitorGuestKbd':['Monitor guest keyboardfor some time: monitorGuestKbd Win32 10', monitorGuestKbdCmd, 0],
+            'monitorGuestMouse':['Monitor guest keyboardfor some time: monitorGuestMouse Win32 10', monitorGuestMouseCmd, 0],
             'monitorVBox':['Monitor what happens with Virtual Box for some time: monitorVBox 10', monitorVBoxCmd, 0],
             'portForward':['Setup permanent port forwarding for a VM, takes adapter number host port and guest port: portForward Win32 0 8080 80', portForwardCmd, 0],

trunk/src/VBox/Main/KeyboardImpl.cpp

@@ -111 +111 @@
     unconst(mParent) = aParent;
 
+    unconst(mEventSource).createObject();
+    HRESULT rc = mEventSource->init(static_cast<IKeyboard*>(this));
+    AssertComRCReturnRC(rc);
+
     /* Confirm a successful initialization */
     autoInitSpan.setSucceeded();
@@ -141 +145 @@
 
     unconst(mParent) = NULL;
+    unconst(mEventSource).setNull();
 }
 
@@ -238 +243 @@
     if (codesStored)
         *codesStored = (uint32_t)keys.size();
+#if 1
+    VBoxEventDesc evDesc;
+    evDesc.init(mEventSource, VBoxEventType_OnGuestKeyboardEvent,
+#ifdef RT_OS_WINDOWS
+                scancodes
+#else
+                scancodesSize, scancodes
+#endif
+                );
+    evDesc.fire(0);
+#endif
 
     return rc;
@@ -261 +277 @@
 
     return PutScancodes(ComSafeArrayAsInParam(cadSequence), NULL);
+}
+
+STDMETHODIMP Keyboard::COMGETTER(EventSource)(IEventSource ** aEventSource)
+{
+    CheckComArgOutPointerValid(aEventSource);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    // no need to lock - lifetime constant
+    mEventSource.queryInterfaceTo(aEventSource);
+
+    return S_OK;
 }
 

trunk/src/VBox/Main/MouseImpl.cpp

@@ -110 +110 @@
     unconst(mParent) = parent;
 
+#ifndef VBOXBFE_WITHOUT_COM
+    unconst(mEventSource).createObject();
+    HRESULT rc = mEventSource->init(static_cast<IMouse*>(this));
+    AssertComRCReturnRC(rc);
+    mMouseEvent.init(mEventSource, VBoxEventType_OnGuestMouseEvent,
+                     0, 0, 0, 0, 0);
+#endif
+
     mfHostCaps = 0;
 
@@ -141 +149 @@
     mParent = NULL;
 #else
+    mMouseEvent.uninit();
+    unconst(mEventSource).setNull();
     unconst(mParent) = NULL;
 #endif
@@ -277 +287 @@
 }
 
+#ifndef VBOXBFE_WITHOUT_COM
+STDMETHODIMP Mouse::COMGETTER(EventSource)(IEventSource ** aEventSource)
+{
+    CheckComArgOutPointerValid(aEventSource);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    // no need to lock - lifetime constant
+    mEventSource.queryInterfaceTo(aEventSource);
+
+    return S_OK;
+}
+#endif
 
 /**
@@ -309 +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;

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

@@ -3623 +3623 @@
     <attribute name="CPUExecutionCap" type="unsigned long">
        <desc>
-         Means to limit the number of CPU cycles a guest can use. The unit 
-         is percentage of host CPU cycles per second. The valid range 
+         Means to limit the number of CPU cycles a guest can use. The unit
+         is percentage of host CPU cycles per second. The valid range
          is 1 - 100. 100 (the default) implies no limit.
        </desc>
@@ -10247 +10247 @@
   <interface
      name="IKeyboard" extends="$unknown"
-     uuid="2d1a531b-4c6e-49cc-8af6-5c857b78b5d7"
+     uuid="f6916ec5-a881-4237-898f-7de58cf88672"
      wsmap="managed"
      >
@@ -10292 +10292 @@
       </desc>
     </method>
+
+    <attribute name="eventSource" type="IEventSource" readonly="yes">
+      <desc>
+        Event source for keyboard events.
+      </desc>
+    </attribute>
 
   </interface>
@@ -10321 +10327 @@
   <interface
      name="IMouse" extends="$unknown"
-     uuid="7c0f2eae-f92d-498c-b802-e1a3763774dc"
+     uuid="05044a52-7811-4f00-ae3a-0ab7ff707b10"
      wsmap="managed"
      >
@@ -10486 +10492 @@
       </param>
     </method>
+
+    <attribute name="eventSource" type="IEventSource" readonly="yes">
+      <desc>
+        Event source for mouse events.
+      </desc>
+    </attribute>
 
   </interface>
@@ -13934 +13946 @@
   <enum
      name="VBoxEventType"
-     uuid="d00980f3-bfcb-4e7d-a20e-08cabf3eb89f">
+     uuid="1728bb3b-4843-4f12-af67-f7a1f69f3a52">
 
     <desc>
@@ -14151 +14163 @@
       </desc>
     </const>
+    <const name="OnGuestKeyboardEvent" value="64">
+      <desc>
+        See <link to="IGuestKeyboardEvent">IGuestKeyboardEvent</link>.
+      </desc>
+    </const>
+    <const name="OnGuestMouseEvent" value="65">
+      <desc>
+        See <link to="IGuestMouseEvent">IGuestMouseEvent</link>.
+      </desc>
+    </const>
     <!-- Last event marker -->
-    <const name="Last" value="64">
+    <const name="Last" value="66">
       <desc>
         Must be last event, used for iterations and structures relying on numerical event values.
@@ -14868 +14890 @@
   </interface>
 
-   <interface
+  <interface
      name="ICPUChangedEvent" extends="IEvent"
      uuid="D0F0BECC-EE17-4D17-A8CC-383B0EB55E9D"
@@ -14902 +14924 @@
      </attribute>
   </interface>
+
+  <interface
+    name="IGuestKeyboardEvent" extends="IEvent"
+    uuid="88394258-7006-40d4-b339-472ee3801844"
+    wsmap="managed" autogen="VBoxEvent" id="OnGuestKeyboardEvent"
+    >
+   <desc>
+      Notification when guest keyboard event happens.
+   </desc>
+     <attribute name="scancodes"  type="long" safearray="yes" readonly="yes">
+       <desc>
+         Array of scancodes.
+       </desc>
+     </attribute>
+  </interface>
+
+  <interface
+    name="IGuestMouseEvent" extends="IReusableEvent"
+    uuid="2ab6f43c-a111-4520-be63-5d560e8eb463"
+    wsmap="managed" autogen="VBoxEvent" id="OnGuestMouseEvent"
+    >
+   <desc>
+      Notification when guest mouse event happens.
+   </desc>
+
+   <attribute name="x" type="long" readonly="yes">
+     <desc>
+       New X position.
+     </desc>
+   </attribute>
+
+   <attribute name="y" type="long" readonly="yes">
+     <desc>
+       New Y position.
+     </desc>
+   </attribute>
+
+   <attribute name="z" type="long" readonly="yes">
+     <desc>
+       New Z position.
+     </desc>
+   </attribute>
+
+   <attribute name="w" type="long" readonly="yes">
+     <desc>
+       New W position.
+     </desc>
+   </attribute>
+
+   <attribute name="buttons" type="long" readonly="yes">
+     <desc>
+       Button state bitmask.
+     </desc>
+   </attribute>
+
+   </interface>
+
 
    <interface

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

@@ -21 +21 @@
 #include "VirtualBoxBase.h"
 #include "ConsoleEvents.h"
+#include "EventImpl.h"
 
 #include <VBox/pdmdrv.h>
@@ -76 +77 @@
     STDMETHOD(PutCAD)();
 
+    STDMETHOD(COMGETTER(EventSource)) (IEventSource ** aEventSource);
+
     static const PDMDRVREG  DrvReg;
 
@@ -97 +100 @@
     /** Set after the first attempt to find the VMM Device. */
     bool                    mfVMMDevInited;
+
+    const ComObjPtr<EventSource> mEventSource;
 };
 

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

@@ -22 +22 @@
 #include "ConsoleEvents.h"
 #include "ConsoleImpl.h"
+#ifndef VBOXBFE_WITHOUT_COM
+#include "EventImpl.h"
+#endif
 #include <VBox/pdmdrv.h>
 
@@ -68 +71 @@
     STDMETHOD(PutMouseEventAbsolute)(LONG x, LONG y, LONG dz, LONG dw,
                                      LONG buttonState);
+#ifndef VBOXBFE_WITHOUT_COM
+    STDMETHOD(COMGETTER(EventSource)) (IEventSource ** aEventSource);
+#endif
 
     static const PDMDRVREG  DrvReg;
@@ -125 +131 @@
     uint32_t mLastAbsY;
     uint32_t mLastButtons;
+
+#ifndef VBOXBFE_WITHOUT_COM
+    const ComObjPtr<EventSource> mEventSource;
+    VBoxEventDesc                mMouseEvent;
+#endif
 };