Tomotaka SUWA
t-suw****@users*****
2006年 4月 25日 (火) 23:13:11 JST
Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.20.2.25 AquaSKK/ChangeLog:1.20.2.26 --- AquaSKK/ChangeLog:1.20.2.25 Sat Apr 8 00:41:04 2006 +++ AquaSKK/ChangeLog Tue Apr 25 23:13:11 2006 @@ -1,3 +1,10 @@ +2006-04-25 Tomotaka SUWA <t.suw****@mac*****> + + * KanjiConversionMode.cpp: ƒgƒOƒ‹•ÏŠ·‚ÌŒ‹‰Ê‚ðŠwK‚·‚é‚悤‚ÉC³B + + * WordRegisterMode.cpp: EUC ‚Å•\Œ»‚Å‚«‚È‚¢ƒR[ƒh‚Í“o˜^‚Å‚«‚È‚¢‚悤 + ‚ÉŽb’è“I‚ɧŒÀBƒ†[ƒU[‚ւ̃tƒB[ƒhƒoƒbƒN‚ð‘‚â‚·•K—v‚ ‚èB + 2006-04-08 Tomotaka SUWA <t.suw****@mac*****> * PreferencesController.*: ASCII ‰Šú‰»ƒIƒvƒVƒ‡ƒ“‚Í Panther ‚Å–³ŒøB Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.2.2.2 AquaSKK/KanjiConversionMode.cpp:1.2.2.3 --- AquaSKK/KanjiConversionMode.cpp:1.2.2.2 Wed Mar 22 22:34:40 2006 +++ AquaSKK/KanjiConversionMode.cpp Tue Apr 25 23:13:11 2006 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.2.2.2 2006/03/22 13:34:40 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.2.2.3 2006/04/25 14:13:11 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -124,16 +124,20 @@ // root‚ð‘SŠp•Ð‰¼–¼‚É•ÏŠ·‚µ‚Ä‚©‚çŠm’肵‚ÄI—¹B // ‚½‚¾‚µ‘SŠp•Ð‰¼–¼ƒ‚[ƒh‚¾‚Á‚½‚畽‰¼–¼‚Ö•ÏŠ·‚·‚éB - if (parent->isZenKataInputMode()) { - parent->fix(HiraganaInputMode::convert(root)); + CppCFString cand; + if(parent->isZenKataInputMode()) { + cand = HiraganaInputMode::convert(root); + } else { + cand = ZenKataInputMode::convert(root); } - else { - parent->fix(ZenKataInputMode::convert(root)); - } - + + // ŒÂlŽ«‘‚É“o˜^‚·‚é + sendWordToServerToRegister(root, cand); + + parent->fix(cand); parent->setEnabledKanjiMode(false); initialize(); - + return false; } else if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { Index: AquaSKK/WordRegisterMode.cpp diff -u AquaSKK/WordRegisterMode.cpp:1.3.2.3 AquaSKK/WordRegisterMode.cpp:1.3.2.4 --- AquaSKK/WordRegisterMode.cpp:1.3.2.3 Sun Apr 2 12:33:40 2006 +++ AquaSKK/WordRegisterMode.cpp Tue Apr 25 23:13:11 2006 @@ -1,5 +1,5 @@ /* - $Id: WordRegisterMode.cpp,v 1.3.2.3 2006/04/02 03:33:40 t-suwa Exp $ + $Id: WordRegisterMode.cpp,v 1.3.2.4 2006/04/25 14:13:11 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -62,8 +62,14 @@ if(!input_mode.handleReturn()) { fix(input_mode.getStringToFix()); - + if(buffer.length() > 0) { + // EUC ‚É•ÏŠ·‚Å‚«‚È‚¢H + CFDataRef euc = CFStringCreateExternalRepresentation(NULL, buffer.getString(), kCFStringEncodingEUC_JP, 0); + if(!euc) { + return true; + } + CFRelease(euc); (dynamic_cast<RegistrationStarter*>(owner))->wordRegistrationFinished(); // ’PŒê“o˜^I—¹B } else { (dynamic_cast<RegistrationStarter*>(owner))->wordRegistrationCanceled(); // ’PŒê“o˜^’†’fB
Fork