AquaSKK

Fork

[aquaskk-changes 423] CVS update: AquaSKK

t-suw****@users***** t-suw****@users*****
2007年 10月 20日 (土) 12:21:49 JST

• 前の記事 [aquaskk-changes 422] CVS update: AquaSKK/proj/AquaSKK.xcodeproj
• 次の記事 [aquaskk-changes 424] CVS update: AquaSKK/AquaSKK.xcodeproj
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Index: AquaSKK/AsciiConversionMode.cpp
diff -u AquaSKK/AsciiConversionMode.cpp:1.7.2.5 AquaSKK/AsciiConversionMode.cpp:1.7.2.6
--- AquaSKK/AsciiConversionMode.cpp:1.7.2.5	Thu Aug 16 19:58:18 2007
+++ AquaSKK/AsciiConversionMode.cpp	Sat Oct 20 12:21:49 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: AsciiConversionMode.cpp,v 1.7.2.5 2007/08/16 10:58:18 t-suwa Exp $
+  $Id: AsciiConversionMode.cpp,v 1.7.2.6 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -166,7 +166,7 @@
 	}
     }
 
-    if(SKKConfig::KakuteiKey() == skkchar) {
+    if(SKKConfig::KakuteiKey() == skkchar || SKKConfig::KanaModeKey() == skkchar) {
 	return true; // 確定のみ
     }
 
@@ -190,13 +190,6 @@
 	}
     }
 
-    if(SKKConfig::SetHenkanPointKey() == skkchar) {
-	if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
-	    parent->fix(getStringToFix());
-	    return parent->handleInput(skkchar);
-	}
-    }
-
     if(SKKConfig::AbbrevModeKey() == skkchar) {
 	if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
 	    parent->fix(getStringToFix());
Index: AquaSKK/ChangeLog
diff -u AquaSKK/ChangeLog:1.33.2.10 AquaSKK/ChangeLog:1.33.2.11
--- AquaSKK/ChangeLog:1.33.2.10	Mon Sep 24 20:10:04 2007
+++ AquaSKK/ChangeLog	Sat Oct 20 12:21:49 2007
@@ -1,3 +1,40 @@
+2007-10-20  Tomotaka SUWA  <t.suw****@mac*****>
+
+	* HanAscInputMode.cpp, ZenAscInputMode.cpp: ひらかなモードへの遷移
+	を、SKKConfig::KakuteiKey() から SKKConfig::KanaModeKey() に変更。
+
+	* ZenKataInputMode.cpp, HanKataInputMode.cpp:
+	SKKConfig::KanaModeKey() でも変換をキャンセルするように変更。
+
+	* ParentInputMode.cpp: ASCII モードの時には
+	SKKConfig::KanaModeKey() だけ処理するようにするように変更。
+
+	* KanjiConversionMode.cpp, AsciiConversionMode.cpp:
+	SKKConfig::KanaModeKey() でも確定するように変更。
+
+2007-10-14  Tomotaka SUWA  <t.suw****@mac*****>
+
+	* AquaSKK 3.5.1 リリース。
+
+	* skkserv.cpp (skkserv::session): 検索の応答では常に改行を付加する
+	ように修正。
+
+	* ProxyDictionary.cpp (ProxyDictionary::search): skkserv プロトコル
+	の解釈を間違っていたため、2007-10-13 の修正を元に戻した。
+
+2007-10-13  Tomotaka SUWA  <t.suw****@mac*****>
+
+	* ProxyDictionary.cpp (ProxyDictionary::search): 候補が見つからなかっ
+	た時にハングアップする不具合を修正。
+
+	* ServerMessageReceiver.mm (valueForKey): CFSwapInt16HostToBig ã‚’
+	CFSwapInt32HostToBig に修正。この影響で、Intel Mac では U.S. 以外の
+	キー配列を扱うことができなかった。
+
+2007-10-06  Tomotaka SUWA  <t.suw****@mac*****>
+
+	* AquaSKK 3.5 リリース。
+
 2007-09-22  Tomotaka SUWA  <t.suw****@mac*****>
 
 	* KotoeriDictionary.cpp: 検索結果を取り出しタイプを
Index: AquaSKK/HanAscInputMode.cpp
diff -u AquaSKK/HanAscInputMode.cpp:1.4 AquaSKK/HanAscInputMode.cpp:1.4.2.1
--- AquaSKK/HanAscInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/HanAscInputMode.cpp	Sat Oct 20 12:21:49 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: HanAscInputMode.cpp,v 1.4 2006/05/16 16:13:10 t-suwa Exp $
+  $Id: HanAscInputMode.cpp,v 1.4.2.1 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2006-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 }
 
 bool HanAscInputMode::handleInput(SKKChar skkchar) {
-    if(SKKConfig::KakuteiKey() == skkchar) {
+    if(SKKConfig::KanaModeKey() == skkchar) {
 	// •½‰¼–¼“ü—̓‚[ƒh‚ցB
 	parent->goHiraganaInputMode();
 	return false;
Index: AquaSKK/HanKataInputMode.cpp
diff -u AquaSKK/HanKataInputMode.cpp:1.4 AquaSKK/HanKataInputMode.cpp:1.4.2.1
--- AquaSKK/HanKataInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/HanKataInputMode.cpp	Sat Oct 20 12:21:49 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: HanKataInputMode.cpp,v 1.4 2006/05/16 16:13:10 t-suwa Exp $
+  $Id: HanKataInputMode.cpp,v 1.4.2.1 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2006-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
 	terminate();
 	parent->goHiraganaInputMode();
     }
-    else if(SKKConfig::KakuteiKey() == skkchar) {
+    else if(SKKConfig::KakuteiKey() == skkchar || SKKConfig::KanaModeKey() == skkchar) {
 	terminate();
     }
     else if(SKKConfig::Jisx0208LatinModeKey() == skkchar) {
Index: AquaSKK/HiraganaInputMode.cpp
diff -u AquaSKK/HiraganaInputMode.cpp:1.4 AquaSKK/HiraganaInputMode.cpp:1.4.2.1
--- AquaSKK/HiraganaInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/HiraganaInputMode.cpp	Sat Oct 20 12:21:49 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: HiraganaInputMode.cpp,v 1.4 2006/05/16 16:13:10 t-suwa Exp $
+  $Id: HiraganaInputMode.cpp,v 1.4.2.1 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002-2004 phonohawk
-  Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2006-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@
 	terminate();
 	parent->goHanKataInputMode();
     }
-    else if(SKKConfig::KakuteiKey() == skkchar) {
+    else if(SKKConfig::KakuteiKey() == skkchar || SKKConfig::KanaModeKey() == skkchar) {
 	terminate();
     }
     else if(SKKConfig::Jisx0208LatinModeKey() == skkchar) {
Index: AquaSKK/Info-AquaSKKInputMethod.plist
diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.10.2.5 AquaSKK/Info-AquaSKKInputMethod.plist:1.10.2.6
--- AquaSKK/Info-AquaSKKInputMethod.plist:1.10.2.5	Sat Feb  3 17:52:48 2007
+++ AquaSKK/Info-AquaSKKInputMethod.plist	Sat Oct 20 12:21:49 2007
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>askk</string>
 	<key>CFBundleVersion</key>
-	<string>2006-12-29</string>
+	<string>2007-10-20</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>tsInputMethodIconFileKey</key>
Index: AquaSKK/Info-AquaSKKServer.plist
diff -u AquaSKK/Info-AquaSKKServer.plist:1.10.2.6 AquaSKK/Info-AquaSKKServer.plist:1.10.2.7
--- AquaSKK/Info-AquaSKKServer.plist:1.10.2.6	Sat Feb  3 17:52:48 2007
+++ AquaSKK/Info-AquaSKKServer.plist	Sat Oct 20 12:21:49 2007
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>askk</string>
 	<key>CFBundleVersion</key>
-	<string>2007-02-03</string>
+	<string>2007-10-20</string>
 	<key>NSMainNibFile</key>
 	<string>Principal</string>
 	<key>NSPrincipalClass</key>
Index: AquaSKK/KanjiConversionMode.cpp
diff -u AquaSKK/KanjiConversionMode.cpp:1.8.2.7 AquaSKK/KanjiConversionMode.cpp:1.8.2.8
--- AquaSKK/KanjiConversionMode.cpp:1.8.2.7	Mon Sep 24 20:10:04 2007
+++ AquaSKK/KanjiConversionMode.cpp	Sat Oct 20 12:21:49 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: KanjiConversionMode.cpp,v 1.8.2.7 2007/09/24 11:10:04 t-suwa Exp $
+  $Id: KanjiConversionMode.cpp,v 1.8.2.8 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -236,7 +236,7 @@
 	}
     }
 
-    if(SKKConfig::KakuteiKey() == skkchar) {
+    if(SKKConfig::KakuteiKey() == skkchar || SKKConfig::KanaModeKey() == skkchar) {
 	return true; // 確定のみ
     }
 
Index: AquaSKK/ParentInputMode.cpp
diff -u AquaSKK/ParentInputMode.cpp:1.6 AquaSKK/ParentInputMode.cpp:1.6.2.1
--- AquaSKK/ParentInputMode.cpp:1.6	Wed May 17 01:13:10 2006
+++ AquaSKK/ParentInputMode.cpp	Sat Oct 20 12:21:49 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: ParentInputMode.cpp,v 1.6 2006/05/16 16:13:10 t-suwa Exp $
+  $Id: ParentInputMode.cpp,v 1.6.2.1 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2006-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -85,8 +85,8 @@
     }
     assert(input_mode != NULL);
 
-    // ASCII ƒ‚[ƒh‚ÌŽž‚É‚Í Ctrl-J ‚¾‚¯ˆ—‚·‚é‚悤‚É‚·‚é
-    if(isHanAscInputMode() && !is_kanji_mode && !is_ascii_conv_mode && skkchar != SKKConfig::KakuteiKey()) {
+    // ASCII ƒ‚[ƒh‚ÌŽž‚É‚Í SKKConfig::KanaModeKey() ‚¾‚¯ˆ—‚·‚é‚悤‚É‚·‚é
+    if(isHanAscInputMode() && !is_kanji_mode && !is_ascii_conv_mode && skkchar != SKKConfig::KanaModeKey()) {
 	// Input Method ‚ª–³Ž‹‚µ‚½ƒCƒxƒ“ƒg‚Í TSM ‚ª“KØ‚ɏˆ—‚µ‚Ä‚­
 	// ‚ê‚邽‚߁AU.S. ‚Ƃ̌݊·«‚ª‚‚Ü‚é
 	return false;
Index: AquaSKK/ProxyDictionary.cpp
diff -u AquaSKK/ProxyDictionary.cpp:1.2.2.4 AquaSKK/ProxyDictionary.cpp:1.2.2.5
--- AquaSKK/ProxyDictionary.cpp:1.2.2.4	Sat Feb  3 17:52:48 2007
+++ AquaSKK/ProxyDictionary.cpp	Sat Oct 20 12:21:49 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: ProxyDictionary.cpp,v 1.2.2.4 2007/02/03 08:52:48 t-suwa Exp $
+  $Id: ProxyDictionary.cpp,v 1.2.2.5 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -97,11 +97,11 @@
     active_ = true;
 
     // クエリ送信
-    session_ << "1" << str << " ";
+    session_ << '1' << str << ' ';
     session_.flush();
 
     // 結果受信
-    getline(session_, response);
+    std::getline(session_, response);
 
     active_ = false;
 
Index: AquaSKK/ServerMessageReceiver.mm
diff -u AquaSKK/ServerMessageReceiver.mm:1.7.2.6 AquaSKK/ServerMessageReceiver.mm:1.7.2.7
--- AquaSKK/ServerMessageReceiver.mm:1.7.2.6	Fri Aug 17 21:47:26 2007
+++ AquaSKK/ServerMessageReceiver.mm	Sat Oct 20 12:21:49 2007
@@ -1,5 +1,5 @@
 /* -*- objc -*-
-  $Id: ServerMessageReceiver.mm,v 1.7.2.6 2007/08/17 12:47:26 t-suwa Exp $
+  $Id: ServerMessageReceiver.mm,v 1.7.2.7 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -288,7 +288,7 @@
 }
 
 CppCFData ServerMessageReceiver::valueForKey(NSString* key) {
-    int result = CFSwapInt16HostToBig([[NSUserDefaults standardUserDefaults] integerForKey:key]);
+    int result = CFSwapInt32HostToBig([[NSUserDefaults standardUserDefaults] integerForKey:key]);
 
     return CppCFData(&result, sizeof(result));
 }
Index: AquaSKK/ZenAscInputMode.cpp
diff -u AquaSKK/ZenAscInputMode.cpp:1.4 AquaSKK/ZenAscInputMode.cpp:1.4.2.1
--- AquaSKK/ZenAscInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/ZenAscInputMode.cpp	Sat Oct 20 12:21:49 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: ZenAscInputMode.cpp,v 1.4 2006/05/16 16:13:10 t-suwa Exp $
+  $Id: ZenAscInputMode.cpp,v 1.4.2.1 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2006-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 }
 
 bool ZenAscInputMode::handleInput(SKKChar skkchar) {
-    if(SKKConfig::KakuteiKey() == skkchar) {
+    if(SKKConfig::KanaModeKey() == skkchar) {
 	// •½‰¼–¼“ü—̓‚[ƒh‚ցB
 	parent->goHiraganaInputMode();
 	return false;
Index: AquaSKK/ZenKataInputMode.cpp
diff -u AquaSKK/ZenKataInputMode.cpp:1.4 AquaSKK/ZenKataInputMode.cpp:1.4.2.1
--- AquaSKK/ZenKataInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/ZenKataInputMode.cpp	Sat Oct 20 12:21:49 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: ZenKataInputMode.cpp,v 1.4 2006/05/16 16:13:10 t-suwa Exp $
+  $Id: ZenKataInputMode.cpp,v 1.4.2.1 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2006-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
 	terminate();
 	parent->goHanKataInputMode();
     }
-    else if(SKKConfig::KakuteiKey() == skkchar) {
+    else if(SKKConfig::KakuteiKey() == skkchar || SKKConfig::KanaModeKey() == skkchar) {
 	terminate();
     }
     else if(SKKConfig::Jisx0208LatinModeKey() == skkchar) {
Index: AquaSKK/skkserv.cpp
diff -u AquaSKK/skkserv.cpp:1.3.2.8 AquaSKK/skkserv.cpp:1.3.2.9
--- AquaSKK/skkserv.cpp:1.3.2.8	Mon Sep 24 20:10:04 2007
+++ AquaSKK/skkserv.cpp	Sat Oct 20 12:21:49 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: skkserv.cpp,v 1.3.2.8 2007/09/24 11:10:04 t-suwa Exp $
+  $Id: skkserv.cpp,v 1.3.2.9 2007/10/20 03:21:49 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -118,7 +118,7 @@
 		jconv::convert_utf8_to_eucj(result, candidates);
 		sock << '1' << candidates << std::endl;
 	    } else {
-		sock << '4' << word << ' ';
+		sock << '4' << word << std::endl;
 	    }
 	    sock.flush();
 	}

• 前の記事 [aquaskk-changes 422] CVS update: AquaSKK/proj/AquaSKK.xcodeproj
• 次の記事 [aquaskk-changes 424] CVS update: AquaSKK/AquaSKK.xcodeproj
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]