Changeset 47848 in vbox for trunk/src/VBox/Main/idl

Timestamp:

Aug 19, 2013 4:34:02 PM (12 years ago)

Author:

vboxsync

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

88142

Message:

Main: API event for multitouch input.

Location:

trunk/src/VBox/Main/idl

Files:

• VirtualBox.xidl (modified) (3 diffs)
• comimpl.xsl (modified) (2 diffs)

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

@@ -19465 +19465 @@
   <enum
     name="VBoxEventType"
-    uuid="84af836d-0afc-4598-b9f4-37bf34d13cbd"
+    uuid="e40cbdc9-ef63-4407-9b7b-2d1201a39bd1"
     >
 
@@ -19834 +19834 @@
       </desc>
     </const>
+    <const name="OnGuestMultiTouch" value="93">
+      <desc>
+        See <link to="IGuestMouseEvent">IGuestMouseEvent</link>.
+      </desc>
+    </const>
     <!-- Last event marker -->
-    <const name="Last" value="93">
+    <const name="Last" value="94">
       <desc>
         Must be last event, used for iterations and structures relying on numerical event values.
@@ -20736 +20741 @@
     </attribute>
 
+  </interface>
+
+  <interface
+    name="IGuestMultiTouchEvent" extends="IEvent"
+    uuid="be8a0eb5-f4f4-4dd0-9d30-c89b873247ec"
+    wsmap="managed" autogen="VBoxEvent" id="OnGuestMultiTouch"
+    >
+    <desc>
+      Notification when guest touch screen event happens.
+    </desc>
+    <attribute name="contactCount" type="long" readonly="yes">
+      <desc>
+        Number of contacts in the event.
+      </desc>
+    </attribute>
+    <attribute name="xPositions" type="short" safearray="yes" readonly="yes">
+      <desc>
+        X positions.
+      </desc>
+    </attribute>
+    <attribute name="yPositions" type="short" safearray="yes" readonly="yes">
+      <desc>
+        Y positions.
+      </desc>
+    </attribute>
+    <attribute name="contactIds" type="unsigned short" safearray="yes" readonly="yes">
+      <desc>
+        Contact identifiers.
+      </desc>
+    </attribute>
+    <attribute name="contactFlags" type="unsigned short" safearray="yes" readonly="yes">
+      <desc>
+        Contact state.
+        Bit 0: in contact.
+        Bit 1: in range.
+      </desc>
+    </attribute>
+    <attribute name="scanTime" type="unsigned long" readonly="yes">
+      <desc>
+        Timestamp of the event in milliseconds. Only relative time between events is important.
+      </desc>
+    </attribute>
   </interface>
 

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

@@ -150 +150 @@
           <xsl:value-of select="'BYTE'" />
         </xsl:when>
+        <xsl:when test="$type='unsigned short'">
+          <xsl:value-of select="'USHORT'" />
+        </xsl:when>
+        <xsl:when test="$type='short'">
+          <xsl:value-of select="'SHORT'" />
+        </xsl:when>
         <xsl:when test="$type='unsigned long'">
           <xsl:value-of select="'ULONG'" />
@@ -294 +300 @@
          </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="concat('              SAFEARRAY *aPtr_', @name, ' = va_arg(args, SAFEARRAY *);&#10;')"/>
+         <xsl:value-of select="concat('              com::SafeArray&lt;', $elemtype,'&gt;   aArr_', @name, '(aPtr_', @name, ');&#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="concat('              PRUint32 aArrSize_', @name, ' = va_arg(args, PRUint32);&#10;')"/>
+         <xsl:value-of select="concat('              void*    aPtr_', @name, ' = va_arg(args, void*);&#10;')"/>
+         <xsl:value-of select="concat('              com::SafeArray&lt;', $elemtype,'&gt;   aArr_', @name, '(aArrSize_', @name, ', (', $elemtype,'*)aPtr_', @name, ');&#10;')"/>
          <xsl:value-of select="       '#endif&#10;'"/>
-         <xsl:value-of select="concat('              ',$obj, '->set_', @name, '(ComSafeArrayAsInParam(aArr));&#10;')"/>
+         <xsl:value-of select="concat('              ',$obj, '->set_', @name, '(ComSafeArrayAsInParam(aArr_', @name, '));&#10;')"/>
       </xsl:when>
       <xsl:otherwise>