• R/O
  • SSH
  • HTTPS

aquaskk: コミット


コミットメタ情報

リビジョン162 (tree)
日時2013-03-02 11:16:33
作者t-suwa

ログメッセージ

r311@green: t_suwa | 2013-02-22 22:27:11 +0900
- GenericStateMachine::IsChildOf を追加

r312@green: t_suwa | 2013-02-22 22:29:18 +0900
- Eclipse のインクリメンタルサーチ時に、SwitchToAscii で l が挿入される不具合を修正

r313@green: t_suwa | 2013-03-02 11:12:42 +0900
- 入力メニューのアイコンがグレースケールになってしまう不具合を修正

r314@green: t_suwa | 2013-03-02 11:15:11 +0900
- Eclipse でインクリメンタルサーチ時に、l や q で上書きされる不具合を修正

変更サマリ

差分

--- aquaskk/trunk/platform/mac/proj/AquaSKK-Info.plist (revision 161)
+++ aquaskk/trunk/platform/mac/proj/AquaSKK-Info.plist (revision 162)
@@ -38,6 +38,10 @@
3838 <integer>1</integer>
3939 <key>tsInputModeMenuIconFileKey</key>
4040 <string>AquaSKK-InputMethod.tif</string>
41+ <key>tsInputModeAlternateMenuIconFileKey</key>
42+ <string>AquaSKK-InputMethod.tif</string>
43+ <key>tsInputModePaletteIconFileKey</key>
44+ <string>AquaSKK-InputMethod.tif</string>
4145 <key>tsInputModePrimaryInScriptKey</key>
4246 <true/>
4347 <key>tsInputModeScriptKey</key>
@@ -57,6 +61,10 @@
5761 <integer>0</integer>
5862 <key>tsInputModeMenuIconFileKey</key>
5963 <string>Mini-Jisx0208Latin.tiff</string>
64+ <key>tsInputModeAlternateMenuIconFileKey</key>
65+ <string>Mini-Jisx0208Latin.tiff</string>
66+ <key>tsInputModePaletteIconFileKey</key>
67+ <string>Mini-Jisx0208Latin.tiff</string>
6068 <key>tsInputModePrimaryInScriptKey</key>
6169 <false/>
6270 <key>tsInputModeScriptKey</key>
@@ -76,6 +84,10 @@
7684 <integer>0</integer>
7785 <key>tsInputModeMenuIconFileKey</key>
7886 <string>Mini-Jisx0201Kana.tiff</string>
87+ <key>tsInputModeAlternateMenuIconFileKey</key>
88+ <string>Mini-Jisx0201Kana.tiff</string>
89+ <key>tsInputModePaletteIconFileKey</key>
90+ <string>Mini-Jisx0201Kana.tiff</string>
7991 <key>tsInputModePrimaryInScriptKey</key>
8092 <false/>
8193 <key>tsInputModeScriptKey</key>
@@ -95,6 +107,10 @@
95107 <integer>1</integer>
96108 <key>tsInputModeMenuIconFileKey</key>
97109 <string>Mini-Hirakana.tiff</string>
110+ <key>tsInputModeAlternateMenuIconFileKey</key>
111+ <string>Mini-Hirakana.tiff</string>
112+ <key>tsInputModePaletteIconFileKey</key>
113+ <string>Mini-Hirakana.tiff</string>
98114 <key>tsInputModePrimaryInScriptKey</key>
99115 <true/>
100116 <key>tsInputModeScriptKey</key>
@@ -114,6 +130,10 @@
114130 <integer>2</integer>
115131 <key>tsInputModeMenuIconFileKey</key>
116132 <string>Mini-Katakana.tiff</string>
133+ <key>tsInputModeAlternateMenuIconFileKey</key>
134+ <string>Mini-Katakana.tiff</string>
135+ <key>tsInputModePaletteIconFileKey</key>
136+ <string>Mini-Katakana.tiff</string>
117137 <key>tsInputModePrimaryInScriptKey</key>
118138 <false/>
119139 <key>tsInputModeScriptKey</key>
@@ -133,6 +153,10 @@
133153 <integer>3</integer>
134154 <key>tsInputModeMenuIconFileKey</key>
135155 <string>Mini-Ascii.tiff</string>
156+ <key>tsInputModeAlternateMenuIconFileKey</key>
157+ <string>Mini-Ascii.tiff</string>
158+ <key>tsInputModePaletteIconFileKey</key>
159+ <string>Mini-Ascii.tiff</string>
136160 <key>tsInputModePrimaryInScriptKey</key>
137161 <true/>
138162 <key>tsInputModeScriptKey</key>
--- aquaskk/trunk/src/engine/state/GenericStateMachine.h (revision 161)
+++ aquaskk/trunk/src/engine/state/GenericStateMachine.h (revision 162)
@@ -536,6 +536,16 @@
536536 const StateContainer& Container() const {
537537 return container_;
538538 }
539+
540+ bool IsChildOf(const Handler state) {
541+ for(Handler current = active_; current != top_; current = getSuperState(current)) {
542+ if(current == state) {
543+ return true;
544+ }
545+ }
546+
547+ return false;
548+ }
539549 };
540550
541551 // ======================================================================
--- aquaskk/trunk/src/engine/session/SKKInputSession.h (revision 161)
+++ aquaskk/trunk/src/engine/session/SKKInputSession.h (revision 162)
@@ -25,6 +25,7 @@
2525
2626 #include "SKKInputModeListener.h"
2727 #include "SKKInputContext.h"
28+#include "SKKStateMachine.h"
2829 #include <vector>
2930
3031 class SKKInputSessionParameter;
@@ -65,6 +66,8 @@
6566
6667 void Activate();
6768 void Deactivate();
69+
70+ bool IsChildOf(SKKStateMachine::Handler handler);
6871 };
6972
7073 #endif
--- aquaskk/trunk/src/engine/session/SKKRecursiveEditor.cpp (revision 161)
+++ aquaskk/trunk/src/engine/session/SKKRecursiveEditor.cpp (revision 162)
@@ -70,6 +70,10 @@
7070 forEachWidget(&SKKWidget::Deactivate);
7171 }
7272
73+bool SKKRecursiveEditor::IsChildOf(SKKStateMachine::Handler handler) {
74+ return state_.IsChildOf(handler);
75+}
76+
7377 // ----------------------------------------------------------------------
7478
7579 void SKKRecursiveEditor::forEachWidget(WidgetMethod method) {
--- aquaskk/trunk/src/engine/session/SKKInputSession.cpp (revision 161)
+++ aquaskk/trunk/src/engine/session/SKKInputSession.cpp (revision 162)
@@ -110,6 +110,10 @@
110110 top()->Deactivate();
111111 }
112112
113+bool SKKInputSession::IsChildOf(SKKStateMachine::Handler handler) {
114+ return top()->IsChildOf(handler);
115+}
116+
113117 // ----------------------------------------------------------------------
114118
115119 void SKKInputSession::beginEvent() {
--- aquaskk/trunk/src/engine/session/SKKRecursiveEditor.h (revision 161)
+++ aquaskk/trunk/src/engine/session/SKKRecursiveEditor.h (revision 162)
@@ -62,6 +62,8 @@
6262
6363 void Activate();
6464 void Deactivate();
65+
66+ bool IsChildOf(SKKStateMachine::Handler handler);
6567 };
6668
6769 #endif
旧リポジトリブラウザで表示