Merging the UTF8 patch, consisting of O'ksi'd s original 1.1.6 patch and additions by Ian. PLEASE BE AWARE that the patch in its current incarnation is a regression in many aspects and further work is required before we can announce Unicode support.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 289 insertions, 1 deletions

diff --git a/vc2005/fltk.lib.vcproj b/vc2005/fltk.lib.vcproj
index ffb6e5f15..6ead1d1b6 100644
--- a/vc2005/fltk.lib.vcproj
+++ b/vc2005/fltk.lib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8,00"

+	Version="8.00"

 	Name="fltk"

 	ProjectGUID="{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}"

 	RootNamespace="fltk"

@@ -614,6 +614,10 @@
 			</File>

 		</Filter>

 		<File

+			RelativePath="..\src\xutf8\case.c"

+			>

+		</File>

+		<File

 			RelativePath="..\src\filename_absolute.cxx"

 			>

 			<FileConfiguration

@@ -3301,6 +3305,14 @@
 			</FileConfiguration>

 		</File>

 		<File

+			RelativePath="..\src\fl_utf.c"

+			>

+		</File>

+		<File

+			RelativePath="..\src\fl_utf8.cxx"

+			>

+		</File>

+		<File

 			RelativePath="..\src\Fl_Valuator.cxx"

 			>

 			<FileConfiguration

@@ -3701,6 +3713,14 @@
 			</FileConfiguration>

 		</File>

 		<File

+			RelativePath="..\src\xutf8\is_right2left.c"

+			>

+		</File>

+		<File

+			RelativePath="..\src\xutf8\is_spacing.c"

+			>

+		</File>

+		<File

 			RelativePath="..\src\numericsort.c"

 			>

 			<FileConfiguration

diff --git a/vc2005/fltk.sln b/vc2005/fltk.sln
index 78c779567..8588413ac 100644
--- a/vc2005/fltk.sln
+++ b/vc2005/fltk.sln
@@ -86,6 +86,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curve", "curve.vcproj", "{2
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo", "demo.vcproj", "{09427220-8C9C-498A-8D50-1638D3FB87E5}"

 	ProjectSection(ProjectDependencies) = postProject

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9} = {ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}

+		{50651D04-C8F7-4C2B-B412-0848573BDF88} = {50651D04-C8F7-4C2B-B412-0848573BDF88}

 		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A} = {1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}

 		{8D8D210D-F628-48BB-9127-D8003DF22018} = {8D8D210D-F628-48BB-9127-D8003DF22018}

 		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF} = {7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}

@@ -436,6 +438,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "input_choice", "input_choic
 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utf8", "utf8.vcproj", "{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}"

+	ProjectSection(ProjectDependencies) = postProject

+		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}

+	EndProjectSection

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -687,7 +694,9 @@ Global
 		{3E822491-B134-43B0-A40E-9348FFAB527F}.Release|Win32.ActiveCfg = Release|Win32

 		{3E822491-B134-43B0-A40E-9348FFAB527F}.Release|Win32.Build.0 = Release|Win32

 		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Debug|Win32.ActiveCfg = Debug|Win32

+		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Debug|Win32.Build.0 = Debug|Win32

 		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Release|Win32.ActiveCfg = Release|Win32

+		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Release|Win32.Build.0 = Release|Win32

 		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Debug|Win32.ActiveCfg = Debug|Win32

 		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Debug|Win32.Build.0 = Debug|Win32

 		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Release|Win32.ActiveCfg = Release|Win32

@@ -720,6 +729,10 @@ Global
 		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Debug|Win32.Build.0 = Debug|Win32

 		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Release|Win32.ActiveCfg = Release|Win32

 		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Release|Win32.Build.0 = Release|Win32

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Debug|Win32.Build.0 = Debug|Win32

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Release|Win32.ActiveCfg = Release|Win32

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/vc2005/fltkdll.vcproj b/vc2005/fltkdll.vcproj
index c1ee588ea..242e89334 100644
--- a/vc2005/fltkdll.vcproj
+++ b/vc2005/fltkdll.vcproj
@@ -208,6 +208,10 @@
 	</References>

 	<Files>

 		<File

+			RelativePath="..\src\xutf8\case.c"

+			>

+		</File>

+		<File

 			RelativePath="..\src\filename_absolute.cxx"

 			>

 			<FileConfiguration

@@ -2911,6 +2915,14 @@
 			</FileConfiguration>

 		</File>

 		<File

+			RelativePath="..\src\fl_utf.c"

+			>

+		</File>

+		<File

+			RelativePath="..\src\fl_utf8.cxx"

+			>

+		</File>

+		<File

 			RelativePath="..\src\Fl_Valuator.cxx"

 			>

 			<FileConfiguration

@@ -3525,6 +3537,14 @@
 			</FileConfiguration>

 		</File>

 		<File

+			RelativePath="..\src\xutf8\is_right2left.c"

+			>

+		</File>

+		<File

+			RelativePath="..\src\xutf8\is_spacing.c"

+			>

+		</File>

+		<File

 			RelativePath="..\src\numericsort.c"

 			>

 			<FileConfiguration

diff --git a/vc2005/utf8.vcproj b/vc2005/utf8.vcproj
new file mode 100644
index 000000000..8cd2ed1a6
--- /dev/null
+++ b/vc2005/utf8.vcproj
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="utf8"

+	ProjectGUID="{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}"

+	RootNamespace="utf8"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\utf8_"

+			IntermediateDirectory=".\utf8_"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\utf8_/utf8.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\utf8_/utf8.pch"

+				AssemblerListingLocation=".\utf8_/"

+				ObjectFile=".\utf8_/"

+				ProgramDataBaseFileName=".\utf8_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltkd.lib comctl32.lib imm32.lib"

+				OutputFile="../test/utf8d.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\utf8_/utf8d.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/utf8.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/utf8.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib imm32.lib"

+				OutputFile="../test/utf8.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/utf8.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<File

+			RelativePath="..\test\utf8.cxx"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>