Tomotaka SUWA
t-suw****@users*****
2006年 4月 6日 (木) 23:13:54 JST
ForkIndex: AquaSKK/BIM.cpp
diff -u AquaSKK/BIM.cpp:1.11.2.5 AquaSKK/BIM.cpp:1.11.2.6
--- AquaSKK/BIM.cpp:1.11.2.5 Thu Apr 6 00:08:23 2006
+++ AquaSKK/BIM.cpp Thu Apr 6 23:13:54 2006
@@ -1,5 +1,5 @@
/*
- $Id: BIM.cpp,v 1.11.2.5 2006/04/05 15:08:23 t-suwa Exp $
+ $Id: BIM.cpp,v 1.11.2.6 2006/04/06 14:13:54 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -229,16 +229,9 @@
(**outSessionHandle)->fInputBufferCount = 0;
(**outSessionHandle)->fInputBuffer = NULL;
(**outSessionHandle)->terminate_disabled = false;
+ (**outSessionHandle)->asciimode_startup = ClientConfiguration::theInstance().isAsciiModeStartup();
(**outSessionHandle)->imsession_input_mode = new IMSessionInputMode(*outSessionHandle);
- // ASCII ƒ‚[ƒh‚ʼnŠú‰»‚·‚é
- if(ClientConfiguration::theInstance().isAsciiModeStartup()) {
- ScriptLanguageRecord slr;
- slr.fScript = smRoman;
- slr.fLanguage = langJapanese;
- SetDefaultInputMethodOfClass(BIMGetComponentID(), &slr, kKeyboardInputMethodClass);
- }
-
// ƒL[ƒ{[ƒhƒŒƒCƒAƒEƒg‚ð‰Šú‰»‚·‚é
InitializeKeyboardLayout();
} else {
Index: AquaSKK/BIM.h
diff -u AquaSKK/BIM.h:1.2.2.2 AquaSKK/BIM.h:1.2.2.3
--- AquaSKK/BIM.h:1.2.2.2 Thu Apr 6 00:08:23 2006
+++ AquaSKK/BIM.h Thu Apr 6 23:13:54 2006
@@ -1,5 +1,5 @@
/*
- $Id: BIM.h,v 1.2.2.2 2006/04/05 15:08:23 t-suwa Exp $
+ $Id: BIM.h,v 1.2.2.3 2006/04/06 14:13:54 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -41,6 +41,7 @@
UniCharPtr fInputBuffer;
bool terminate_disabled; // true Žž‚Í terminate ‚ª–³Œø
+ bool asciimode_startup;
class IMSessionInputMode* imsession_input_mode;
};
Index: AquaSKK/BIMComponent.cpp
diff -u AquaSKK/BIMComponent.cpp:1.4.2.3 AquaSKK/BIMComponent.cpp:1.4.2.4
--- AquaSKK/BIMComponent.cpp:1.4.2.3 Thu Apr 6 00:08:23 2006
+++ AquaSKK/BIMComponent.cpp Thu Apr 6 23:13:54 2006
@@ -1,5 +1,5 @@
/*
- $Id: BIMComponent.cpp,v 1.4.2.3 2006/04/05 15:08:23 t-suwa Exp $
+ $Id: BIMComponent.cpp,v 1.4.2.4 2006/04/06 14:13:54 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -249,6 +249,15 @@
// ƒRƒ“ƒ|[ƒlƒ“ƒg‚̉Šú‰»—v‹
ComponentResult BIMInitiateTextService(Handle inSessionHandle) {
+ // ASCII ƒ‚[ƒh‚ʼnŠú‰»‚·‚é
+ if((*(BIMSessionHandle)inSessionHandle)->asciimode_startup) {
+ (*(BIMSessionHandle)inSessionHandle)->asciimode_startup = false;
+ ScriptLanguageRecord slr;
+ slr.fScript = smRoman;
+ slr.fLanguage = langJapanese;
+ SetDefaultInputMethodOfClass(BIMGetComponentID(), &slr, kKeyboardInputMethodClass);
+ }
+
return noErr;
}