Changeset 30564 in vbox for trunk/src

Timestamp:

Jul 1, 2010 4:54:16 PM (15 years ago)

Author:

vboxsync

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

63277

Message:

Main: safearray event attributes work

Location:

trunk/src/VBox

Files:

• Frontends/VBoxShell/vboxshell.py (modified) (2 diffs)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/idl/comimpl.xsl (modified) (3 diffs)

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

@@ -432 +432 @@
 
 def monitorSource(ctx, es, active, dur):
-    def handleEventImpl(ev):         
-         print "got event: %s" %(str(ev.type))
+    def handleEventImpl(ev):
+         type = ev.type
+         print "got event: %s %s" %(str(ev.type), asEnumElem(ctx, 'VBoxEventType', type))
          if ev.type == ctx['global'].constants.VBoxEventType_OnMachineStateChange:
              scev = ctx['global'].queryInterface(ev, 'IMachineStateChangeEvent')
              if scev:
                  print "state event: mach=%s state=%s" %(scev.machineId, scev.state)
+         elif  type == ctx['global'].constants.VBoxEventType_OnMousePointerShapeChange:
+             psev = ctx['global'].queryInterface(ev, 'IMousePointerShapeChangeEvent')
+             if psev:
+                 shape = ctx['global'].getArray(psev, 'shape')
+                 print "pointer shape event: w=%d h=%d shape len=%d" %(psev.width, psev.height, len(shape))
 
     class EventListener:
@@ -450 +456 @@
             traceback.print_exc()
             pass
- 
+
     if active:
         listener = ctx['global'].createListener(EventListener)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5028 +5028 @@
         }
 #if 1
-        evDesc.init(mEventSource, VBoxEventType_OnShowWindow);
+        evDesc.init(mEventSource, VBoxEventType_OnShowWindow, UINT64_C(0));
         ComPtr<IEvent> aEvent;
         evDesc.getEvent(aEvent.asOutParam());
         ComPtr<IShowWindowEvent> aShowEvent = aEvent;
-        if (aShowEvent)
-            aShowEvent->COMSETTER(WinId)(0);
-        
+
         BOOL fDelivered = evDesc.fire(10000); /* Wait up to 10 secs for delivery */
         Assert(fDelivered);

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

@@ -15313 +15313 @@
     </attribute>
   </interface>
-  
+
   <interface
      name="IStorageControllerChangeEvent" extends="IEvent"
@@ -15342 +15342 @@
     </attribute>
   </interface>
-  
+
    <interface
      name="ICPUChangeEvent" extends="IEvent"
@@ -15537 +15537 @@
     </attribute>
   </interface>
-  
+
   <interface
       name="IExtraDataChangeEvent" extends="IEvent"

trunk/src/VBox/Main/idl/comimpl.xsl

@@ -177 +177 @@
   <xsl:choose>
     <xsl:when test="$safearray='yes'">
-      <!-- @todo: setter missing -->
+      <xsl:variable name="elemtype">
+        <xsl:call-template name="typeIdl2Back">
+          <xsl:with-param name="type" select="@type" />
+          <xsl:with-param name="safearray" select="''" />
+          <xsl:with-param name="dir" select="'in'" />
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:value-of select="concat('         SafeArray&lt;', $elemtype, '&gt; aArr(ComSafeArrayInArg(',$param,'));&#10;')"/>
+      <xsl:value-of select="concat('         ',$member, '.initFrom(aArr);&#10;')"/>
     </xsl:when>
     <xsl:otherwise>
@@ -192 +200 @@
   <xsl:choose>
     <xsl:when test="$safearray='yes'">
-      <xsl:value-of select="concat('         ', $member, '.cloneTo(ComSafeArrayOutArg (', $param, '));&#10;')"/>
+      <xsl:value-of select="concat('         ', $member, '.detachTo(ComSafeArrayOutArg (', $param, '));&#10;')"/>
     </xsl:when>
     <xsl:otherwise>
@@ -252 +260 @@
     </xsl:variable>
 
-    <!-- no safearrays params yet -->
-    <xsl:if test="not(@safearray)">
-      <xsl:value-of select="concat('              ',$aTypeName, ' = va_arg(args, ',$aType,');&#10;')"/>
-      <xsl:value-of select="concat('              ',$obj, '->set_', @name, '(',$aName, ');&#10;')"/>
-    </xsl:if>
+    <xsl:choose>
+      <xsl:when test="@safearray='yes'">
+         <xsl:variable name="elemtype">
+           <xsl:call-template name="typeIdl2Back">
+             <xsl:with-param name="type" select="@type" />
+             <xsl:with-param name="safearray" select="''" />
+             <xsl:with-param name="dir" select="'in'" />
+           </xsl:call-template>
+         </xsl:variable>
+         <xsl:value-of select="       '#ifdef RT_OS_WINDOWS&#10;'"/>
+         <xsl:value-of select="       '              SAFEARRAY **    aPtr = va_arg(args, SAFEARRAY **);&#10;'"/>
+         <xsl:value-of select="concat('              com::SafeArray&lt;', $elemtype,'&gt;   aArr(aPtr);&#10;')"/>
+         <xsl:value-of select="       '#else&#10;'"/>
+         <xsl:value-of select="       '              PRUint32 aArrSize = va_arg(args, PRUint32);&#10;'"/>
+         <xsl:value-of select="       '              void*    aPtr = va_arg(args, void*);&#10;'"/>
+         <xsl:value-of select="concat('              com::SafeArray&lt;', $elemtype,'&gt;   aArr(aArrSize, (', $elemtype,'*)aPtr);&#10;')"/>
+         <xsl:value-of select="       '#endif&#10;'"/>
+         <xsl:value-of select="concat('              ',$obj, '->set_', @name, '(ComSafeArrayAsInParam(aArr));&#10;')"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="concat('              ',$aTypeName, ' = va_arg(args, ',$aType,');&#10;')"/>
+        <xsl:value-of select="concat('              ',$obj, '->set_', @name, '(',$aName, ');&#10;')"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:for-each>
 </xsl:template>