Commit: 2ee9ac8be4cbbadf36da69559816912964dc7f4b - TTXColorTheme (git)

Tera Termの色設定をセットで切り替えます。

Commit MetaInfo

• Revisão: 2ee9ac8be4cbbadf36da69559816912964dc7f4b (tree)
• Hora: 2022-04-17 23:36:55
• Autor: IWAMOTO Kouichi <sue@iwmt...>
• Commiter: IWAMOTO Kouichi

Mensagem de Log

Tera Term 5 のソースに対応した

Tera Term 5 のソースでビルドする場合は VS2019 を使う必要がある。

Mudança Sumário

• modified: .gitignore
• modified: TTXColorTheme.c
• modified: TTXColorTheme.vcproj
• add: TTXColorTheme.vcxproj
• add: TTXColorTheme.vcxproj.filters

Diff

--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 *.suo
 *.aps
 *.vcproj.*.user
-
+*.vcxproj.user

--- a/TTXColorTheme.c
+++ b/TTXColorTheme.c
@@ -31,7 +31,16 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "compat_w95.h"
+#if TT_VERSION_MAJOR == 5
+  #include "compat_win.h"
+  #include "inifile_com.h"
+  #pragma comment(lib, "common_static.lib")
+  typedef const wchar_t *TTXIniFile;
+#else
+  #include "compat_w95.h"
+  #define GetPrivateProfileStringAFileW GetPrivateProfileString
+  typedef char *TTXIniFile;
+#endif
 
 #define ORDER 5900
 #define SECTION "Color Theme"
@@ -182,12 +191,12 @@ static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) {
 	return;
 }
 
-void ReadANSIColorSetting(TAnsiColorSetting *color, int num, char *fn) {
+void ReadANSIColorSetting(TAnsiColorSetting *color, int num, TTXIniFile fn) {
 	char Key[32], Buff[512];
 	int c, r, g, b;
 
 	_snprintf_s(Key, sizeof(Key), _TRUNCATE, "ANSIColor_%d", num + 1);
-	GetPrivateProfileString(SECTION, Key, "0", Buff, sizeof(Buff), fn);
+	GetPrivateProfileStringAFileW(SECTION, Key, "0", Buff, sizeof(Buff), fn);
 
 	GetNthNum(Buff, 1, &c);
 	color->change = c;
@@ -205,12 +214,12 @@ void ReadANSIColorSetting(TAnsiColorSetting *color, int num, char *fn) {
 	return;
 }
 
-void ReadColorSetting(TColorSetting *color, char *ent, int num, char *fn) {
+void ReadColorSetting(TColorSetting *color, char *ent, int num, TTXIniFile fn) {
 	char Key[32], Buff[512];
 	int c, r, g, b;
 
 	_snprintf_s(Key, sizeof(Key), _TRUNCATE, "%s_%d", ent, num + 1);
-	GetPrivateProfileString(SECTION, Key, "0", Buff, sizeof(Buff), fn);
+	GetPrivateProfileStringAFileW(SECTION, Key, "0", Buff, sizeof(Buff), fn);
 
 	GetNthNum(Buff, 1, &c);
 	color->change = c;
@@ -243,7 +252,7 @@ void GetDefaultColor(TColorSetting *tc, COLORREF *color, int field, PTTSet ts) {
 	return;
 }
 
-static void PASCAL ColorThemeReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL ColorThemeReadIniFile(TTXIniFile fn, PTTSet ts) {
 	int i;
 	char Key[20];
 
@@ -263,7 +272,7 @@ static void PASCAL ColorThemeReadIniFile(PCHAR fn, PTTSet ts) {
 
 	for (i=0; i<MAX_MENU_ITEMS; i++) {
 		_snprintf_s(Key, sizeof(Key), _TRUNCATE, "Theme_%d", i+1);
-		GetPrivateProfileString(SECTION, Key, "", pvar->ThemeList[i].name,
+		GetPrivateProfileStringAFileW(SECTION, Key, "", pvar->ThemeList[i].name,
 		    sizeof(pvar->ThemeList[i].name), fn);
 		if (pvar->ThemeList[i].name[0] == '\0')
 			break;
@@ -425,7 +434,9 @@ BOOL WINAPI DllMain(HANDLE hInstance, ULONG ul_reason, LPVOID lpReserved)
       break;
     case DLL_PROCESS_ATTACH:
       /* do process initialization */
+#if TT_VERSION_MAJOR != 5
       DoCover_IsDebuggerPresent();
+#endif
       hInst = hInstance;
       pvar = &InstVar;
       break;

--- a/TTXColorTheme.vcproj
+++ b/TTXColorTheme.vcproj
@@ -62,6 +62,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
+			        AdditionalLibraryDirectories="&quot;$(SolutionDir)..\teraterm\$(Configuration)&quot;"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -137,6 +138,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
+			        AdditionalLibraryDirectories="&quot;$(SolutionDir)..\teraterm\$(Configuration)&quot;"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

--- /dev/null
+++ b/TTXColorTheme.vcxproj
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{35CA825D-EDF8-4E3B-B621-F576F10C72BE}</ProjectGuid>
+    <RootNamespace>TTXColorTheme</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>16.0.30804.86</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXColorTheme.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="LICENSE" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

--- /dev/null
+++ b/TTXColorTheme.vcxproj.filters
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="ReadMe">
+      <UniqueIdentifier>{5a8b7529-cf5f-43a0-9613-39bc05580a57}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TTXColorTheme.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="LICENSE">
+      <Filter>ReadMe</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt">
+      <Filter>ReadMe</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file