AquaSKK

Fork

[aquaskk-changes 417] CVS update: AquaSKK

t-suw****@users***** t-suw****@users*****
2007年 10月 20日 (土) 10:38:08 JST

• 前の記事 [aquaskk-changes 416] CVS update: AquaSKK/src/test
• 次の記事 [aquaskk-changes 418] CVS update: AquaSKK/src/component
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Index: AquaSKK/AsciiConversionMode.cpp
diff -u AquaSKK/AsciiConversionMode.cpp:1.11 AquaSKK/AsciiConversionMode.cpp:1.12
--- AquaSKK/AsciiConversionMode.cpp:1.11	Thu Jun 14 21:00:16 2007
+++ AquaSKK/AsciiConversionMode.cpp	Sat Oct 20 10:38:08 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: AsciiConversionMode.cpp,v 1.11 2007/06/14 12:00:16 t-suwa Exp $
+  $Id: AsciiConversionMode.cpp,v 1.12 2007/10/20 01:38:08 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; // 確定のみ
     }
 
Index: AquaSKK/ChangeLog
diff -u AquaSKK/ChangeLog:1.50 AquaSKK/ChangeLog:1.51
--- AquaSKK/ChangeLog:1.50	Sun Oct 14 11:29:58 2007
+++ AquaSKK/ChangeLog	Sat Oct 20 10:38:08 2007
@@ -1,3 +1,17 @@
+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 リリース。
Index: AquaSKK/HanAscInputMode.cpp
diff -u AquaSKK/HanAscInputMode.cpp:1.4 AquaSKK/HanAscInputMode.cpp:1.5
--- AquaSKK/HanAscInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/HanAscInputMode.cpp	Sat Oct 20 10:38:08 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.5 2007/10/20 01:38:08 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.5
--- AquaSKK/HanKataInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/HanKataInputMode.cpp	Sat Oct 20 10:38:08 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.5 2007/10/20 01:38:08 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.5
--- AquaSKK/HiraganaInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/HiraganaInputMode.cpp	Sat Oct 20 10:38:08 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.5 2007/10/20 01:38:08 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/KanjiConversionMode.cpp
diff -u AquaSKK/KanjiConversionMode.cpp:1.14 AquaSKK/KanjiConversionMode.cpp:1.15
--- AquaSKK/KanjiConversionMode.cpp:1.14	Wed Sep 19 22:57:17 2007
+++ AquaSKK/KanjiConversionMode.cpp	Sat Oct 20 10:38:08 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: KanjiConversionMode.cpp,v 1.14 2007/09/19 13:57:17 t-suwa Exp $
+  $Id: KanjiConversionMode.cpp,v 1.15 2007/10/20 01:38:08 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.7
--- AquaSKK/ParentInputMode.cpp:1.6	Wed May 17 01:13:10 2006
+++ AquaSKK/ParentInputMode.cpp	Sat Oct 20 10:38:08 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.7 2007/10/20 01:38:08 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/ZenAscInputMode.cpp
diff -u AquaSKK/ZenAscInputMode.cpp:1.4 AquaSKK/ZenAscInputMode.cpp:1.5
--- AquaSKK/ZenAscInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/ZenAscInputMode.cpp	Sat Oct 20 10:38:08 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.5 2007/10/20 01:38:08 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.5
--- AquaSKK/ZenKataInputMode.cpp:1.4	Wed May 17 01:13:10 2006
+++ AquaSKK/ZenKataInputMode.cpp	Sat Oct 20 10:38:08 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.5 2007/10/20 01:38:08 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) {

• 前の記事 [aquaskk-changes 416] CVS update: AquaSKK/src/test
• 次の記事 [aquaskk-changes 418] CVS update: AquaSKK/src/component
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]