Tc567-4

add setting.charset
make sure to use latest charset setting when reading setting file

Author: ponapalt

aya5.rc

@@ -28,7 +28,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,67,3,0
+ FILEVERSION 5,67,4,0
  PRODUCTVERSION 5,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -47,7 +47,7 @@ BEGIN
             VALUE "Comments", "YAYA\0"
             VALUE "CompanyName", "YAYA Development Team\0"
             VALUE "FileDescription", "yaya\0"
-            VALUE "FileVersion", "5, 67, 3, 0\0"
+            VALUE "FileVersion", "5, 67, 4, 0\0"
             VALUE "InternalName", "Yet Another AYA5\0"
             VALUE "LegalCopyright", " \0"
             VALUE "LegalTrademarks", " \0"

basis.cpp

@@ -76,6 +76,7 @@ CBasis::CBasis(CAyaVM &vmr) : vm(vmr)
 	msglang_for_compat = MSGLANG_JAPANESE;
 
 	dic_charset       = CHARSET_SJIS;
+	setting_charset   = CHARSET_SJIS;
 	output_charset    = CHARSET_UTF8;
 	file_charset      = CHARSET_SJIS;
 	save_charset      = CHARSET_UTF8;
@@ -375,7 +376,9 @@ void	CBasis::LoadBaseConfigureFile(std::vector<CDic1> &dics)
 
 	// ファイルを開く
 	yaya::string_t	filename = load_path + modulename + config_file_name_trailer + L".txt";
-	LoadBaseConfigureFile_Base(filename,dics,dic_charset);
+
+	// 読み込み当初は文字コードが定義されていないので、CHARSET_UNDEFにする
+	LoadBaseConfigureFile_Base(filename,dics,CHARSET_UNDEF);
 
 	if ( yayamsg::IsEmpty() ) { //エラーメッセージテーブルが読めていない
 		SetParameter(L"messagetxt",msglang_for_compat == MSGLANG_JAPANESE ? L"messagetxt/japanese.txt" : L"messagetxt/english.txt");
@@ -398,11 +401,21 @@ void	CBasis::LoadBaseConfigureFile_Base(yaya::string_t filename,std::vector<CDic
 	yaya::string_t	cmd, param;
 	size_t line=0;
 
+	char cset_real;
+
 	while ( true ) {
 		line += 1;
 
 		// 1行読み込み
-		if (yaya::ws_fgets(readline, fp, cset, 0, line) == yaya::WS_EOF) {
+		cset_real = cset;
+
+		if ( cset == CHARSET_UNDEF ) {
+			//後の設定で変更されている可能性があるので、毎回上書きすること
+			//always overwrite cset_real because setting_charset may be modified in SetParameter function
+			cset_real = setting_charset;
+		}
+
+		if (yaya::ws_fgets(readline, fp, cset_real, 0, line) == yaya::WS_EOF) {
 			// ファイルを閉じる
 			fclose(fp);
 
@@ -446,7 +459,7 @@ bool CBasis::SetParameter(const yaya::string_t &cmd, const yaya::string_t &param
 
 		yaya::string_t filename = load_path + param1;
 
-		char cset = dic_charset;
+		char cset = setting_charset;
 		if ( param2.size() ) {
 			char cx = Ccct::CharsetTextToID(param2.c_str());
 			if ( cx != CHARSET_DEFAULT ) {
@@ -463,7 +476,7 @@ bool CBasis::SetParameter(const yaya::string_t &cmd, const yaya::string_t &param
 
 		yaya::string_t filename = load_path + param1;
 
-		char cset = dic_charset;
+		char cset = setting_charset;
 		if ( param2.size() ) {
 			char cx = Ccct::CharsetTextToID(param2.c_str());
 			if ( cx != CHARSET_DEFAULT ) {
@@ -609,6 +622,7 @@ bool CBasis::SetParameter(const yaya::string_t &cmd, const yaya::string_t &param
 	// charset
 	else if ( cmd == L"charset" ) {
 		dic_charset       = Ccct::CharsetTextToID(param.c_str());
+		setting_charset   = dic_charset;
 		output_charset    = dic_charset;
 		file_charset      = dic_charset;
 		save_charset      = dic_charset;
@@ -621,6 +635,10 @@ bool CBasis::SetParameter(const yaya::string_t &cmd, const yaya::string_t &param
 		dic_charset       = Ccct::CharsetTextToID(param.c_str());
 		return true;
 	}
+	else if ( cmd == L"charset.setting" ) {
+		setting_charset   = Ccct::CharsetTextToID(param.c_str());
+		return true;
+	}
 	else if ( cmd == L"charset.output" ) {
 		output_charset    = Ccct::CharsetTextToID(param.c_str());
 		return true;
@@ -744,6 +762,9 @@ CValue CBasis::GetParameter(const yaya::string_t &cmd)
 	else if ( cmd == L"charset.dic" ) {
 		return Ccct::CharsetIDToTextW(dic_charset);
 	}
+	else if ( cmd == L"charset.setting" ) {
+		return Ccct::CharsetIDToTextW(setting_charset);
+	}
 	else if ( cmd == L"charset.output" ) {
 		return Ccct::CharsetIDToTextW(output_charset);
 	}

basis.h

@@ -62,11 +62,13 @@ class	CBasis
 	char	msglang_for_compat;
 
 	char	dic_charset;				// 文字コードセット（Shift_JIS/UTF-8/OSデフォルト）
+	char    setting_charset;
 	char	output_charset;
 	char	file_charset;
 	char	save_charset;
 	char    save_old_charset;
 	char	extension_charset;
+
 	bool	encode_savefile;
 	bool	auto_save;
 

manifest.cpp

@@ -8,7 +8,7 @@
 #include "manifest.h"
 
 const yaya::char_t *aya_name    = L"YAYA";
-const yaya::char_t *aya_version = L"Tc567-3";
+const yaya::char_t *aya_version = L"Tc567-4";
 const yaya::char_t *aya_author  = L"umeici/The Maintenance Shop";
 
 

manifest.h

@@ -29,8 +29,9 @@ extern const yaya::char_t *aya_author;
 #define	CHARSET_GB2312			4
 #define	CHARSET_EUCKR			5
 #define	CHARSET_JIS				6
-#define	CHARSET_BINARY	126						/* 変換しない（一部でのみ利用） */
-#define	CHARSET_DEFAULT	127						/* OSデフォルトの言語を使用する */
+#define CHARSET_UNDEF			125				/* 未定義 */
+#define	CHARSET_BINARY			126				/* 変換しない（一部でのみ利用） */
+#define	CHARSET_DEFAULT			127				/* OSデフォルトの言語を使用する */
 
 // 基底プレフィックス文字列
 #define	PREFIX_BASE_LEN	2