add cairo

hicdre · Dec 10, 2014 · 906672c · 906672c
1 parent fdf1709
commit 906672c
Show file tree

Hide file tree

Showing 954 changed files with 727,982 additions and 140 deletions.
diff --git a/Demo/res/test.css b/Demo/res/test.css
@@ -10,8 +10,7 @@
 
 #ab {
     height : 60px;
-    margin-left : 10px;
-    margin-top : 20px;
+    margin : 10px 20px 0 0;
     background-color: #00FF00;
 }
 
@@ -28,24 +27,20 @@
 
 .span {
     background-color: #a64ea6;
-    border-left-color: #D3D;
-    border-left-width: 15px;
+    border-left: 15px #D3D;    
 }
 
+
 .block {
     width : 50px;
     height : 60px;
-    margin-left :10px;
-    margin-top : 10px;
-    margin-bottom : 10px;
-    border-left-color: #FF0000;
-    border-left-width: 2px;
-    border-top-color: #FF0000;
-    border-top-width: 2px;
-    border-left-top-radius: 5px;
+    margin : 10px;   
+    border: 2px #000000;    
+    /*border-radius: 5px;*/
     background-color: #00FF00;
 }
 
 .block:hover{    
     background-color: #1a914a;
+    cursor: hand;
 }
diff --git a/DuiFramework/DuiFramwork.vcxproj b/DuiFramework/DuiFramwork.vcxproj
@@ -47,7 +47,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(ProjectDir)..\Build\$(Configuration)\Lib\</OutDir>
-    <IntDir>$(ProjectDir)..\Build\$(Configuration)\Obj\</IntDir>
+    <IntDir>$(ProjectDir)..\Build\$(Configuration)\$(ProjectName)\Obj\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/DuiFramework/Pixman.vcxproj b/DuiFramework/Pixman.vcxproj
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="third_party\pixman\pixman\pixman-access-accessors.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-access.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-arm.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-bits-image.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-combine-float.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-combine32.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-conical-gradient.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-edge-accessors.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-edge.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-fast-path.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-filter.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-general.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-glyph.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-gradient-walker.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-image.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-implementation.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-linear-gradient.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-matrix.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-mips-dspr2.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-mips.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-mmx.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-noop.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-ppc.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-radial-gradient.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-region16.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-region32.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-solid-fill.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-sse2.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-timer.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-trap.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-utils.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman-x86.c" />
+    <ClCompile Include="third_party\pixman\pixman\pixman.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="third_party\pixman\pixman\config.h" />
+    <ClInclude Include="third_party\pixman\pixman\pixman-accessor.h" />
+    <ClInclude Include="third_party\pixman\pixman\pixman-combine32.h" />
+    <ClInclude Include="third_party\pixman\pixman\pixman-compiler.h" />
+    <ClInclude Include="third_party\pixman\pixman\pixman-edge-imp.h" />
+    <ClInclude Include="third_party\pixman\pixman\pixman-inlines.h" />
+    <ClInclude Include="third_party\pixman\pixman\pixman-private.h" />
+    <ClInclude Include="third_party\pixman\pixman\pixman.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{80CA82AA-44A1-4773-8844-3DFDCD356468}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Pixman</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)..\Build\$(Configuration)\Lib\</OutDir>
+    <IntDir>$(ProjectDir)..\Build\$(Configuration)\$(ProjectName)\Obj\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)..\Build\$(Configuration)\Lib\</OutDir>
+    <IntDir>$(ProjectDir)..\Build\$(Configuration)\$(ProjectName)\Obj\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir).\third_party\pixman\pixman;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ForcedIncludeFiles>config.h</ForcedIncludeFiles>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/DuiFramework/Pixman.vcxproj.filters b/DuiFramework/Pixman.vcxproj.filters
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="third_party\pixman\pixman\pixman.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-access.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-access-accessors.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-arm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-bits-image.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-combine32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-combine-float.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-conical-gradient.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-edge.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-edge-accessors.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-fast-path.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-filter.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-general.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-glyph.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-gradient-walker.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-image.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-implementation.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-linear-gradient.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-matrix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-mips.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-mips-dspr2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-mmx.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-noop.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-ppc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-radial-gradient.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-region16.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-region32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-solid-fill.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-sse2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-timer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-trap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-utils.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="third_party\pixman\pixman\pixman-x86.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{fde86db3-2c96-4751-9406-0db635cd3736}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{26c8b73b-cfe3-4628-8c4d-35c57198d96d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="third_party\pixman\pixman\pixman-combine32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="third_party\pixman\pixman\pixman-compiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="third_party\pixman\pixman\pixman-edge-imp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="third_party\pixman\pixman\pixman-inlines.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="third_party\pixman\pixman\pixman-private.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="third_party\pixman\pixman\pixman.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="third_party\pixman\pixman\pixman-accessor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="third_party\pixman\pixman\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/DuiFramework/core/constants.h b/DuiFramework/core/constants.h
@@ -69,4 +69,11 @@ namespace ui
 
 	};
 
+	enum CursorId {
+		Cursor_Inherit = 0,
+
+		Cursor_Arrow,
+		Cursor_Hand,
+	};
+
 }