Tomotaka SUWA
t-suw****@users*****
2006年 4月 6日 (木) 00:08:24 JST
ForkIndex: AquaSKK/BIM.cpp
diff -u AquaSKK/BIM.cpp:1.11.2.4 AquaSKK/BIM.cpp:1.11.2.5
--- AquaSKK/BIM.cpp:1.11.2.4 Wed Mar 22 22:34:40 2006
+++ AquaSKK/BIM.cpp Thu Apr 6 00:08:23 2006
@@ -1,5 +1,5 @@
/*
- $Id: BIM.cpp,v 1.11.2.4 2006/03/22 13:34:40 t-suwa Exp $
+ $Id: BIM.cpp,v 1.11.2.5 2006/04/05 15:08:23 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -229,10 +229,16 @@
(**outSessionHandle)->fInputBufferCount = 0;
(**outSessionHandle)->fInputBuffer = NULL;
(**outSessionHandle)->terminate_disabled = false;
- (**outSessionHandle)->asciimode_startup = ClientConfiguration::theInstance().isAsciiModeStartup();
- (**outSessionHandle)->initialized = false;
(**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.1 AquaSKK/BIM.h:1.2.2.2
--- AquaSKK/BIM.h:1.2.2.1 Sat Jan 7 16:22:28 2006
+++ AquaSKK/BIM.h Thu Apr 6 00:08:23 2006
@@ -1,5 +1,5 @@
/*
- $Id: BIM.h,v 1.2.2.1 2006/01/07 07:22:28 t-suwa Exp $
+ $Id: BIM.h,v 1.2.2.2 2006/04/05 15:08:23 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -41,8 +41,6 @@
UniCharPtr fInputBuffer;
bool terminate_disabled; // true Žž‚Í terminate ‚ª–³Œø
- bool asciimode_startup; // ASCII ƒ‚[ƒh‚ʼnŠú‰»‚·‚é
- bool initialized;
class IMSessionInputMode* imsession_input_mode;
};
Index: AquaSKK/BIMComponent.cpp
diff -u AquaSKK/BIMComponent.cpp:1.4.2.2 AquaSKK/BIMComponent.cpp:1.4.2.3
--- AquaSKK/BIMComponent.cpp:1.4.2.2 Sun Jan 8 16:15:30 2006
+++ AquaSKK/BIMComponent.cpp Thu Apr 6 00:08:23 2006
@@ -1,5 +1,5 @@
/*
- $Id: BIMComponent.cpp,v 1.4.2.2 2006/01/08 07:15:30 t-suwa Exp $
+ $Id: BIMComponent.cpp,v 1.4.2.3 2006/04/05 15:08:23 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -249,13 +249,6 @@
// ƒRƒ“ƒ|[ƒlƒ“ƒg‚̉Šú‰»—v‹
ComponentResult BIMInitiateTextService(Handle inSessionHandle) {
- // ‰Šú‰»Ï‚Ý‚©H
- if((*(BIMSessionHandle)inSessionHandle)->initialized) {
- (*(BIMSessionHandle)inSessionHandle)->asciimode_startup = false;
- }
-
- (*(BIMSessionHandle)inSessionHandle)->initialized = true;
-
return noErr;
}
@@ -330,11 +323,6 @@
CFStringRef newMode = (CFStringRef)value;
IMSessionInputMode* inputMode = (*(BIMSessionHandle)inSessionHandle)->imsession_input_mode;
- // ASCII ƒ‚[ƒh‚ʼnŠú‰»‚·‚é(BIMInitiateTextService ‚àŽQÆ)
- if((*(BIMSessionHandle)inSessionHandle)->asciimode_startup) {
- newMode = kTextServiceInputModeRoman;
- }
-
// “ü—̓‚[ƒh‚ð•ÏX‚·‚é
if(CFStringCompare(newMode, kTextServiceInputModeJapanese, 0) == 0) {
if(!inputMode->isHiraganaInputMode()) {
Index: AquaSKK/ChangeLog
diff -u AquaSKK/ChangeLog:1.20.2.23 AquaSKK/ChangeLog:1.20.2.24
--- AquaSKK/ChangeLog:1.20.2.23 Tue Apr 4 22:46:58 2006
+++ AquaSKK/ChangeLog Thu Apr 6 00:08:23 2006
@@ -1,3 +1,9 @@
+2006-04-06 Tomotaka SUWA <t.suw****@mac*****>
+
+ * BIMComponent.cpp : ASCII ƒ‚[ƒh‰Šú‰»ˆ—‚ðC³B
+
+ * BIM.*: ASCII ƒ‚[ƒh‰Šú‰»ˆ—‚ðC³B
+
2006-04-04 Taiichi HASHIMOTO <taiic****@mac*****>
* BIMInputEvents.cpp: XV—̈æ‚ÌŽw’è‚ðC³B