Changeset 22143 in vbox for trunk

Timestamp:

Aug 10, 2009 7:12:18 PM (16 years ago)

Author:

vboxsync

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

50914

Message:

video 2d accel: Main & ui settings

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/include/VBoxGlobal.h (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxVMSettingsDisplay.cpp (modified) (5 diffs)
• Frontends/VirtualBox/ui/VBoxVMSettingsDisplay.ui (modified) (1 diff)
• Main/MachineImpl.cpp (modified) (5 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/MachineImpl.h (modified) (2 diffs)
• Main/include/VirtualBoxXMLUtil.h (modified) (1 diff)
• Main/xml/SettingsConverter.xsl (modified) (2 diffs)
• Main/xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -752 +752 @@
     static QString documentsPath();
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    static bool isAcceleration2DVideoAvailable() {/*TODO: */ return true;}
+#endif
+
 signals:
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -1558 +1558 @@
 
         rows += 2;
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+        QString acc2dVideo = aMachine.GetAccelerate2DVideoEnabled()
+            ? tr ("Enabled", "details report (2D Video Acceleration)")
+            : tr ("Disabled", "details report (2D Video Acceleration)");
+
+        item += QString (sSectionItemTpl2)
+                       .arg (tr ("2D Video Acceleration", "details report"), acc2dVideo);
+        rows++;
+#endif
 
         /* VRDP tab */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsDisplay.cpp

@@ -95 +95 @@
 #endif /* QT_MAC_USE_COCOA */
 
+#ifndef VBOX_WITH_VIDEOHWACCEL
+    mCb2DVideo->setEnabled (false);
+#endif
+
     /* Applying language settings */
     retranslateUi();
@@ -112 +116 @@
     mCb3D->setChecked (mMachine.GetAccelerate3DEnabled());
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    bool is2DVideoAccelerationSupported = VBoxGlobal::isAcceleration2DVideoAvailable();
+    mCb2DVideo->setEnabled (is2DVideoAccelerationSupported);
+    mCb2DVideo->setChecked (mMachine.GetAccelerate2DVideoEnabled());
+#else
+    mCb2DVideo->setEnabled (false);
+#endif
+
     /* VRDP Settings */
     CVRDPServer vrdp = mMachine.GetVRDPServer();
@@ -137 +149 @@
     mMachine.SetAccelerate3DEnabled (mCb3D->isChecked());
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    /* 2D Video Acceleration */
+    mMachine.SetAccelerate2DVideoEnabled (mCb2DVideo->isChecked());
+#endif
+
     /* VRDP Settings */
     CVRDPServer vrdp = mMachine.GetVRDPServer();
@@ -153 +170 @@
     connect (mCb3D, SIGNAL (stateChanged (int)),
              mValidator, SLOT (revalidate()));
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    connect (mCb2DVideo, SIGNAL (stateChanged (int)),
+             mValidator, SLOT (revalidate()));
+#endif
     connect (mCbVRDP, SIGNAL (toggled (bool)),
              mValidator, SLOT (revalidate()));
@@ -187 +208 @@
     setTabOrder (mSlMemory, mLeMemory);
     setTabOrder (mLeMemory, mCb3D);
-
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    setTabOrder (mCb3D, mCb2DVideo);
+    setTabOrder (mCb2DVideo, mCbVRDP);
+#else
     setTabOrder (mCb3D, mCbVRDP);
+#endif
     setTabOrder (mCbVRDP, mLeVRDPPort);
     setTabOrder (mLeVRDPPort, mCbVRDPMethod);

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDisplay.ui

@@ -177 +177 @@
            </widget>
           </item>
+          <item row="3" column="1" colspan="2">
+           <widget class="QCheckBox" name="mCb2DVideo">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="whatsThis">
+             <string>When checked, the virtual machine will get access to the Video Acceleration capabilities available on the host.</string>
+            </property>
+            <property name="text">
+             <string>Enable &amp;2D Video Acceleration</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>

trunk/src/VBox/Main/MachineImpl.cpp

@@ -193 +193 @@
     mVRAMSize = 8;
     mAccelerate3DEnabled = false;
+    mAccelerate2DVideoEnabled = false;
     mMonitorCount = 1;
     mHWVirtExEnabled = true;
@@ -226 +227 @@
         mVRAMSize != that.mVRAMSize ||
         mAccelerate3DEnabled != that.mAccelerate3DEnabled ||
+        mAccelerate2DVideoEnabled != that.mAccelerate2DVideoEnabled ||
         mMonitorCount != that.mMonitorCount ||
         mHWVirtExEnabled != that.mHWVirtExEnabled ||
@@ -1186 +1188 @@
 }
 
+
+STDMETHODIMP Machine::COMGETTER(Accelerate2DVideoEnabled)(BOOL *enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    *enabled = mHWData->mAccelerate2DVideoEnabled;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(Accelerate2DVideoEnabled)(BOOL enable)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    CheckComRCReturnRC(rc);
+
+    /** @todo check validity! */
+
+    mHWData.backup();
+    mHWData->mAccelerate2DVideoEnabled = enable;
+
+    return S_OK;
+}
 
 STDMETHODIMP Machine::COMGETTER(MonitorCount) (ULONG *monitorCount)
@@ -5274 +5309 @@
         mHWData->mMonitorCount  = displayNode.value <ULONG> ("monitorCount");
         mHWData->mAccelerate3DEnabled = displayNode.value <bool> ("accelerate3D");
+        mHWData->mAccelerate2DVideoEnabled = displayNode.value <bool> ("accelerate2DVideo");
     }
 
@@ -6726 +6762 @@
         displayNode.setValue <ULONG> ("monitorCount", mHWData->mMonitorCount);
         displayNode.setValue <bool> ("accelerate3D", !!mHWData->mAccelerate3DEnabled);
+        displayNode.setValue <bool> ("accelerate2DVideo", !!mHWData->mAccelerate2DVideoEnabled);
     }
 

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

@@ -4010 +4010 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="540dcfda-3df2-49c6-88fa-033a28c2ff85"
+     uuid="5293aa45-5ab5-4f70-852e-bb43f5a46491"
      wsmap="managed"
      >
@@ -4223 +4223 @@
         of the 3D graphics support available on the host. Currently limited
         to OpenGL only. </desc>
+    </attribute>
+    
+    <attribute name="accelerate2DVideoEnabled" type="boolean" default="false">
+      <desc>
+        This setting determines whether VirtualBox allows guests to make use
+        of the 2D Video graphics support available on the host. </desc>
     </attribute>
 

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

@@ -271 +271 @@
         BOOL           mHWVirtExVPIDEnabled;
         BOOL           mAccelerate3DEnabled;
+        BOOL           mAccelerate2DVideoEnabled;
         BOOL           mPAEEnabled;
         ULONG          mCPUCount;
@@ -504 +505 @@
     STDMETHOD(COMGETTER(Accelerate3DEnabled))(BOOL *enabled);
     STDMETHOD(COMSETTER(Accelerate3DEnabled))(BOOL enabled);
+    STDMETHOD(COMGETTER(Accelerate2DVideoEnabled))(BOOL *enabled);
+    STDMETHOD(COMSETTER(Accelerate2DVideoEnabled))(BOOL enabled);
     STDMETHOD(COMGETTER(BIOSSettings))(IBIOSSettings **biosSettings);
     STDMETHOD(COMGETTER(HWVirtExEnabled))(BOOL *enabled);

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

@@ -29 +29 @@
 
 /** VirtualBox XML settings version number substring ("x.y")  */
-#define VBOX_XML_VERSION        "1.7"
+#define VBOX_XML_VERSION        "1.8"
 
 /** VirtualBox XML settings version platform substring */

trunk/src/VBox/Main/xml/SettingsConverter.xsl

@@ -141 +141 @@
     <xsl:attribute name="version"><xsl:value-of select="concat('1.7','-',$curVerPlat)"/></xsl:attribute>
     <xsl:apply-templates select="node()" mode="v1.7"/>
+  </xsl:copy>
+</xsl:template>
+
+<!-- 1.7 => 1.8 -->
+<xsl:template match="/vb:VirtualBox[substring-before(@version,'-')='1.7']">
+  <xsl:copy>
+    <xsl:attribute name="version"><xsl:value-of select="concat('1.8','-',$curVerPlat)"/></xsl:attribute>
+    <xsl:apply-templates select="node()" mode="v1.8"/>
   </xsl:copy>
 </xsl:template>
@@ -976 +984 @@
 <!--
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *  1.7 => 1.8
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+-->
+<!--
+ *  all non-root elements that are not explicitly matched are copied as is
+-->
+<xsl:template match="@*|node()[../..]" mode="v1.8">
+  <xsl:copy>
+    <xsl:apply-templates select="@*|node()[../..]" mode="v1.8"/>
+  </xsl:copy>
+</xsl:template>
+
+<!--
+ *  Global settings
+-->
+
+<!--
+ *  Machine settings
+-->
+
+<!--xsl:template match="vb:VirtualBox[substring-before(@version,'-')='1.7']/
+                     vb:Machine//vb:Hardware/vb:Display"
+              mode="v1.8">
+  <xsl:copy>
+    <xsl:apply-templates select="node()" mode="v1.8"/>
+    <xsl:for-each select="@*">
+      <xsl:choose>
+        <xsl:when test="name()='Accelerate2DVideo'">
+          <xsl:attribute name="accelerate2DVideo"><xsl:value-of select="."/></xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="." mode="v1.8"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+  </xsl:copy>
+</xsl:template-->
+
+<!--
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 -->
 

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -500 +500 @@
   </xsd:attribute>
   <xsd:attribute name="accelerate3D" type="xsd:boolean" default="false"/>
+  <xsd:attribute name="accelerate2DVideo" type="xsd:boolean" default="false"/>
 </xsd:complexType>