From t-suwa ¡÷ users.sourceforge.jp Fri May 5 00:27:02 2006 From: t-suwa ¡÷ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 5 May 2006 00:27:02 +0900 Subject: [aquaskk-changes 219] CVS update: AquaSKK Message-ID: <20060504152702.42E252AC7C5@users.sourceforge.jp> Index: AquaSKK/AsciiConversionMode.cpp diff -u AquaSKK/AsciiConversionMode.cpp:1.3 AquaSKK/AsciiConversionMode.cpp:1.4 --- AquaSKK/AsciiConversionMode.cpp:1.3 Wed Apr 26 22:36:12 2006 +++ AquaSKK/AsciiConversionMode.cpp Fri May 5 00:27:02 2006 @@ -1,5 +1,5 @@ /* - $Id: AsciiConversionMode.cpp,v 1.3 2006/04/26 13:36:12 t-suwa Exp $ + $Id: AsciiConversionMode.cpp,v 1.4 2006/05/04 15:27:02 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -621,7 +621,7 @@ void AsciiConversionMode::makeServerRemoveWord() { CppCFString query; // ahya ??Íß????-ahya ??Íß? - query.append('-').append(index).append(' ').append(candidates[current_candidate_index]); + query.append('-').append(index).append(SKK_MSG_DELIMITER).append(candidates[current_candidate_index]); // ???? CppCFData cfdata_query; @@ -630,17 +630,13 @@ } void AsciiConversionMode::openCandidatesWindow(OpenDirection mode) { - // candidates?4???????????????? - //vector cands(candidates.begin()+(show_cands_window_after_Nth_cand-1),candidates.end()); - CppCFString space(" "); - CppCFString nbsp("[20]"); std::vector cands; std::vector::const_iterator ite; for(ite = candidates.begin() + (show_cands_window_after_Nth_cand - 1); ite != candidates.end(); ++ ite) { - cands.push_back(ite->replaceClone(space,nbsp)); + cands.push_back(*ite); } - ::openCandidatesWindow(join(' ',cands), + ::openCandidatesWindow(join(SKK_MSG_DELIMITER, cands), candidates_window_id, candidates_window_cands_per_frame, candidates_window_num_of_frames, @@ -650,7 +646,6 @@ mode); } - void AsciiConversionMode::goToNextCandidatesFrame() { // ?????ID(UInt16)???CFData?????????? CppCFData reply(ServerConnectionFactory::theInstance().newConnection(). Index: AquaSKK/BIMClientServer.h diff -u AquaSKK/BIMClientServer.h:1.4 AquaSKK/BIMClientServer.h:1.5 --- AquaSKK/BIMClientServer.h:1.4 Wed Apr 26 22:36:12 2006 +++ AquaSKK/BIMClientServer.h Fri May 5 00:27:02 2006 @@ -1,5 +1,5 @@ /* - $Id: BIMClientServer.h,v 1.4 2006/04/26 13:36:12 t-suwa Exp $ + $Id: BIMClientServer.h,v 1.5 2006/05/04 15:27:02 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -21,16 +21,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#pragma once +#ifndef INC__BIMClientServer__ +#define INC__BIMClientServer__ -// IM?????? +// ????????????? #define kIMBundleIdentifier "jp.sourceforge.AquaSKKInputMethod" -// ?????? -#define kBasicServerName "\pAquaSKKServer.app" +// ????? +//#define kBasicServerName "\pAquaSKKServer.app" #define kCSTR_SKKServerName "AquaSKKServer.app" -// ?????? +// ???????? #define kBasicServerPortName "jp.sourceforge.AquaSKKServer" // ????? RunLoopMode @@ -69,6 +70,9 @@ typedef SInt32 BasicMessageID; +// ??????????? +#define SKK_MSG_DELIMITER (0x0b) /* ???? */ + enum { // ???????????????? kBasicMessageActivated = 100, // SKK??????????? kBasicMessageDeactivated = 101, // SKK????????????? @@ -113,3 +117,5 @@ enum { kSKKClientConfigurationModified = 100, }; + +#endif Index: AquaSKK/CandidatesManager.mm diff -u AquaSKK/CandidatesManager.mm:1.4 AquaSKK/CandidatesManager.mm:1.5 --- AquaSKK/CandidatesManager.mm:1.4 Mon Dec 19 23:03:37 2005 +++ AquaSKK/CandidatesManager.mm Fri May 5 00:27:02 2006 @@ -1,10 +1,10 @@ /* -*- objc -*- - $Id: CandidatesManager.mm,v 1.4 2005/12/19 14:03:37 t-suwa Exp $ + $Id: CandidatesManager.mm,v 1.5 2006/05/04 15:27:02 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk - Copyright (C) 2005 Tomotaka SUWA + Copyright (C) 2005-2006 Tomotaka SUWA 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 @@ -25,6 +25,7 @@ #import "CandidatesView.h" #import "CandidatesWindowController.h" +#include "BIMClientServer.h" #include "CppCFString.h" #include "CandidatesManager.h" @@ -42,28 +43,11 @@ } unsigned CandidatesManager::createAndShow(int qd_x, int qd_y, const CppCFString& candidates_string, bool showLast) { - const CppCFString space(" "); - const CppCFString space_ref("[20]"); - const CppCFString blockopen("["); - const CppCFString blockopen_ref("[5b]"); - const CppCFString slash("/"); - const CppCFString slash_ref("[2f]"); - const CppCFString semicolon(";"); - const CppCFString semicolon_ref("[3b]"); - // NSArray ????????? - std::vector cands_vec = candidates_string.split(' '); + std::vector cands_vec = candidates_string.split(SKK_MSG_DELIMITER); NSMutableArray* cands_array = [[NSMutableArray alloc] init]; for(std::vector::const_iterator ite = cands_vec.begin(); ite != cands_vec.end(); ++ ite) { - CppCFString tmp = ite->replaceClone(space_ref, space); - tmp.replace(semicolon_ref, semicolon); - tmp.replace(slash_ref, slash); - tmp.replace(blockopen_ref, blockopen); - - UniChar* unistr = tmp.toUniCharPtr(); - NSString* cand = [NSString stringWithCharacters:unistr length:tmp.length()]; - [cands_array addObject:cand]; - delete[] unistr; + [cands_array addObject:(NSString*)ite->decode().getString()]; } // ???ID??? Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.22 AquaSKK/ChangeLog:1.23 --- AquaSKK/ChangeLog:1.22 Wed Apr 26 23:36:39 2006 +++ AquaSKK/ChangeLog Fri May 5 00:27:02 2006 @@ -1,3 +1,19 @@ +2006-05-05 Tomotaka SUWA + + * BIMClientServer.h: SKK_MSG_DELIMITER ???????????????? + + * DictionarySet.cpp, KanjiConversionMode.cpp, + AsciiConversionMode.cpp, : SKK_MSG_DELIMITER ????????B?? + ???' ' ? [20] ?????B + + * CandidatesManager.mm: SKK_MSG_DELIMITER ????????B + + * CppCFString.*: encode() ? decode() ????"[/;" ??????? + ???/??????? + + * KotoeriDictionary.cpp: ????? CppCFString::encode() ???? + ???B + 2006-04-26 Tomotaka SUWA * Info-*.plist: ???? 3.0 ??????? Index: AquaSKK/CppCFString.cpp diff -u AquaSKK/CppCFString.cpp:1.4 AquaSKK/CppCFString.cpp:1.5 --- AquaSKK/CppCFString.cpp:1.4 Wed Apr 26 22:36:12 2006 +++ AquaSKK/CppCFString.cpp Fri May 5 00:27:02 2006 @@ -1,5 +1,5 @@ /* - $Id: CppCFString.cpp,v 1.4 2006/04/26 13:36:12 t-suwa Exp $ + $Id: CppCFString.cpp,v 1.5 2006/05/04 15:27:02 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -22,8 +22,55 @@ */ #include +#include +#include #include "CppCFString.h" +// encode/decode ?????? +class EncodeDecodeTable { + std::vector org_; + std::vector enc_; + + EncodeDecodeTable() { + // ?????????????d?) + char* chars = "[/;"; + + // ???????(i.e. ";" ? "[3b]") + for(char* ptr = chars; *ptr != 0x00; ++ ptr) { + std::stringstream buf; + org_.push_back(*ptr); + buf << "[" << std::hex << (unsigned)*ptr << "]"; + enc_.push_back(buf.str().c_str()); + } + } + +public: + static EncodeDecodeTable& theInstance() { + static EncodeDecodeTable obj; + return obj; + } + + CppCFString Encode(const CppCFString& src) const { + CppCFString result(src); + + for(unsigned i = 0; i < enc_.size(); ++ i) { + result.replace(org_[i], enc_[i]); + } + + return result; + } + + CppCFString Decode(const CppCFString& src) const { + CppCFString result(src); + + for(unsigned i = 0; i < enc_.size(); ++ i) { + result.replace(enc_[i], org_[i]); + } + + return result; + } +}; + CppCFString::CppCFString() : cf_string(0) { cf_string = CFStringCreateMutable(NULL, 0); } @@ -341,13 +388,13 @@ while(pos < len) { // ??????? if(unistr[pos] == delim) { - pos++; + ++ pos; } else { // ??????????????? int blockstart = pos; int blockend = -1; - for(int i = blockstart;i < len;i++) { + for(int i = blockstart; i < len; ++ i) { // ???????? if(unistr[i] == delim) { blockend = i; @@ -360,7 +407,7 @@ blockend = len; // ????????????? } - result.push_back(substring(blockstart,blockend)); + result.push_back(substring(blockstart, blockend)); pos = blockend; } } @@ -371,6 +418,14 @@ return result; } +CppCFString CppCFString::encode() const { + return EncodeDecodeTable::theInstance().Encode(*this); +} + +CppCFString CppCFString::decode() const { + return EncodeDecodeTable::theInstance().Decode(*this); +} + // ??????? CppCFString operator+(const CppCFString& l, const CppCFString& r) { return CppCFString(l).append(r); Index: AquaSKK/CppCFString.h diff -u AquaSKK/CppCFString.h:1.4 AquaSKK/CppCFString.h:1.5 --- AquaSKK/CppCFString.h:1.4 Wed Apr 26 22:36:12 2006 +++ AquaSKK/CppCFString.h Fri May 5 00:27:02 2006 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: CppCFString.h,v 1.4 2006/04/26 13:36:12 t-suwa Exp $ + $Id: CppCFString.h,v 1.5 2006/05/04 15:27:02 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -83,6 +83,9 @@ virtual CppCFString clone() const; virtual std::vector split(UniChar delim) const; + + virtual CppCFString encode() const; + virtual CppCFString decode() const; }; CppCFString operator+ (const CppCFString& l,const CppCFString& r); Index: AquaSKK/DictionarySet.cpp diff -u AquaSKK/DictionarySet.cpp:1.2 AquaSKK/DictionarySet.cpp:1.3 --- AquaSKK/DictionarySet.cpp:1.2 Wed Apr 26 22:36:12 2006 +++ AquaSKK/DictionarySet.cpp Fri May 5 00:27:02 2006 @@ -1,5 +1,5 @@ /* - $Id: DictionarySet.cpp,v 1.2 2006/04/26 13:36:12 t-suwa Exp $ + $Id: DictionarySet.cpp,v 1.3 2006/05/04 15:27:02 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -23,6 +23,7 @@ #include #include +#include "BIMClientServer.h" #include "CppCFString.h" #include "OkuriganaEntry.h" #include "Dictionary.h" @@ -305,18 +306,16 @@ } CppCFString DictionarySet::search(const CppCFString& query) { - CppCFString space(" "); - CppCFString nbsp("[20]"); bool has_okuri = query[0] == '+'; CppCFString query_str(query.substring(1)); // ???+,-???B D_PRINTF("QUERY: %s\n",query_str.toCString(kCFStringEncodingEUC_JP)); if(has_okuri) { - int pos_space = query_str.indexOf(' '); - CppCFString root = query_str.substring(0,pos_space).replace(nbsp,space); // ?+??r ???????r? - CppCFString okuri = query_str.substring(pos_space+1).replace(nbsp,space); // ?+??r ??????? - + int pos_space = query_str.indexOf(SKK_MSG_DELIMITER); + CppCFString root = query_str.substring(0, pos_space); // ?+??r ???????r? + CppCFString okuri = query_str.substring(pos_space + 1); // ?+??r ??????? + std::vector cand_strictly_matched; std::vector cand_unstrictly_matched; @@ -358,11 +357,11 @@ if(semicolon_pos != -1) { ite->erase(semicolon_pos, ite->length()); } - ite->append(okuri).replace(space,nbsp); + ite->append(okuri); } - D_PRINTF("REPLY: %s\n",join(' ',candidates).toCString(kCFStringEncodingEUC_JP)); - return join(' ', candidates); + D_PRINTF("REPLY: %s\n",join('/', candidates).toCString(kCFStringEncodingEUC_JP)); + return join(SKK_MSG_DELIMITER, candidates); } else { std::vector candidates; @@ -384,38 +383,30 @@ // candidates????`????????????????????B removeRedundantItems(candidates); - // candidates????????????[20]???? // ?Žß????????????B(??) for(std::vector::iterator ite = candidates.begin(); ite != candidates.end(); ++ ite) { const int semicolon_pos = ite->indexOf(';'); if(semicolon_pos != -1) { ite->erase(semicolon_pos, ite->length()); } - ite->replace(space,nbsp); } - D_PRINTF("REPLY: %s\n",join(' ',candidates).toCString(kCFStringEncodingEUC_JP)); - return join(' ',candidates); + D_PRINTF("REPLY: %s\n",join('/', candidates).toCString(kCFStringEncodingEUC_JP)); + return join(SKK_MSG_DELIMITER, candidates); } } void DictionarySet::registerToUserDic(const CppCFString& query) { - CppCFString space(" "); - CppCFString nbsp("[20]"); - D_PRINTF("REGISTER: %s\n",query.toCString(kCFStringEncodingEUC_JP)); // ????????+??r ? ?? if(query[0] == '+') { - int pos_first_space = query.indexOf(' '); - int pos_second_space = query.indexOf(' ',pos_first_space+1); + int pos_first_space = query.indexOf(SKK_MSG_DELIMITER); + int pos_second_space = query.indexOf(SKK_MSG_DELIMITER, pos_first_space + 1); - CppCFString index(query.substring(1,pos_first_space)); - index.replace(nbsp,space); // ??r - CppCFString okuri(query.substring(pos_first_space+1,pos_second_space)); - okuri.replace(nbsp,space); // ? - CppCFString kanji(query.substring(pos_second_space+1)); - kanji.replace(nbsp,space); // ? + CppCFString index(query.substring(1, pos_first_space)); + CppCFString okuri(query.substring(pos_first_space + 1, pos_second_space)); + CppCFString kanji(query.substring(pos_second_space + 1)); if(index.length() == 0 || okuri.length() == 0 || kanji.length() == 0) { std::cerr << "AquaSKK: Invalid registration received; index:" @@ -426,11 +417,10 @@ } } else { // ????????-?? ??? - int pos_space = query.indexOf(' '); - CppCFString index(query.substring(1,pos_space)); - index.replace(nbsp,space); - CppCFString kanji(query.substring(pos_space+1)); - kanji.replace(nbsp,space); + int pos_space = query.indexOf(SKK_MSG_DELIMITER); + + CppCFString index(query.substring(1, pos_space)); + CppCFString kanji(query.substring(pos_space + 1)); if(index.length() == 0 || kanji.length() == 0) { std::cerr << "AquaSKK: Invalid registration received; index:" @@ -443,22 +433,16 @@ } void DictionarySet::removeFromUserDic(const CppCFString& query) { - CppCFString space(" "); - CppCFString nbsp("[20]"); - D_PRINTF("REMOVE: %s\n",query.toCString(kCFStringEncodingEUC_JP)); // ????????+??r ? ?? if(query[0] == '+') { - int pos_first_space = query.indexOf(' '); - int pos_second_space = query.indexOf(' ',pos_first_space+1); - - CppCFString index(query.substring(1,pos_first_space)); - index.replace(nbsp,space); // ??r - CppCFString okuri(query.substring(pos_first_space+1,pos_second_space)); - okuri.replace(nbsp,space); // ? - CppCFString kanji(query.substring(pos_second_space+1)); - kanji.replace(nbsp,space); // ? + int pos_first_space = query.indexOf(SKK_MSG_DELIMITER); + int pos_second_space = query.indexOf(SKK_MSG_DELIMITER, pos_first_space + 1); + + CppCFString index(query.substring(1, pos_first_space)); + CppCFString okuri(query.substring(pos_first_space + 1, pos_second_space)); + CppCFString kanji(query.substring(pos_second_space + 1)); if(index.length() == 0 || okuri.length() == 0 || kanji.length() == 0) { std::cerr << "AquaSKK: Invalid removal received; index:" @@ -469,11 +453,10 @@ } } else { // ????????-?? ??? - int pos_space = query.indexOf(' '); - CppCFString index(query.substring(1,pos_space)); - index.replace(nbsp,space); - CppCFString kanji(query.substring(pos_space+1)); - kanji.replace(nbsp,space); + int pos_space = query.indexOf(SKK_MSG_DELIMITER); + + CppCFString index(query.substring(1, pos_space)); + CppCFString kanji(query.substring(pos_space + 1)); if(index.length() == 0 || kanji.length() == 0) { std::cerr << "AquaSKK: Invalid removal received; index:" @@ -486,15 +469,11 @@ } CppCFString DictionarySet::searchCompletions(const CppCFString& query) { - CppCFString space(" "); - CppCFString nbsp("[20]"); - D_PRINTF("COMPLETE: %s\n", query.toCString(kCFStringEncodingEUC_JP)); - CppCFString head = query.replaceClone(nbsp, space); - std::vector result = userdict_->findCompletions(head); + std::vector result = userdict_->findCompletions(query); - D_PRINTF("REPLY: %s\n", join(' ',result).toCString(kCFStringEncodingEUC_JP)); + D_PRINTF("REPLY: %s\n", join('/', result).toCString(kCFStringEncodingEUC_JP)); - return join(' ', result); + return join(SKK_MSG_DELIMITER, result); } Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.3 AquaSKK/KanjiConversionMode.cpp:1.4 --- AquaSKK/KanjiConversionMode.cpp:1.3 Wed Apr 26 22:36:12 2006 +++ AquaSKK/KanjiConversionMode.cpp Fri May 5 00:27:02 2006 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.3 2006/04/26 13:36:12 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.4 2006/05/04 15:27:02 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -981,74 +981,42 @@ void KanjiConversionMode::askServerTheCandidates(bool hasOkuri) { // ???????????+?????-????? CppCFString query; - if (hasOkuri) { - if (SkkConfig::config().useKanaToOkuri()) { -#ifdef DEBUG - cerr << "(C)OKURI-HEAD: " << okuri[0] << " - " << SkkConfig::config().kanaToOkuri(okuri[0]) << endl; -#endif - query = CppCFString().append('+').append(root).append(SkkConfig::config().kanaToOkuri(okuri[0])).append(' ').append(okuri); + if(hasOkuri) { + query.append('+').append(root); + if(SkkConfig::config().useKanaToOkuri()) { + query.append(SkkConfig::config().kanaToOkuri(okuri[0])).append(SKK_MSG_DELIMITER).append(okuri); } else { // ??????+??r ? - query = CppCFString().append('+').append(root).append(okuri_head).append(' ').append(okuri); + query.append(okuri_head).append(SKK_MSG_DELIMITER).append(okuri); } - } - else { + } else { // ?????-?? query = CppCFString().append('-').append(root); } - + // ???????????????? query = HiraganaInputMode::convert(query); - + D_PRINTF("query: %s\n",query.toCString(kCFStringEncodingEUC_JP)); - + // ????? CppCFData cfdata_query; - cfdata_query.own(query.toCFData()); - + cfdata_query.own(query.toCFData()); + current_candidate_index = 0; - ::askServerTheCandidates(cfdata_query,candidates); + ::askServerTheCandidates(cfdata_query, candidates); } // ???? void askServerTheCandidates(const CppCFData& query, std::vector& candidates) { - static CppCFString space(" "); - static CppCFString nbsp("[20]"); - CppCFString reply(ServerConnectionFactory::theInstance().newConnection(). send(kSKKMessageSearch, query, kAquaSKKServerRunLoopMode).getData()); D_PRINTF("reply: %s\n", reply.toCString(kCFStringEncodingEUC_JP)); - // ??????? + std::vector tmp = reply.split(SKK_MSG_DELIMITER); candidates.clear(); - const int reply_len = reply.length(); - int blockstart = 0; - for(int i = 0; i < reply_len; ++ i) { - if(reply[i] == ' ') { - if(i > blockstart) { - // ????? - addCandidate(reply.substring(blockstart, i).replace(nbsp, space), candidates); - } - blockstart = i + 1; - } - } - if(reply_len > blockstart) { - // ????? - addCandidate(reply.substring(blockstart, reply_len).replace(nbsp, space), candidates); - } -} -void addCandidate(const CppCFString& candidate, std::vector& candidates) { - static CppCFString blockopen("["); - static CppCFString blockopen_ref("[5b]"); - static CppCFString slash("/"); - static CppCFString slash_ref("[2f]"); - static CppCFString semicolon(";"); - static CppCFString semicolon_ref("[3b]"); - - // ?Žß????T??????? - candidates.push_back( - candidate.replaceClone(slash_ref,slash).replace(semicolon_ref,semicolon).replace(blockopen_ref,blockopen)); + std::transform(tmp.begin(), tmp.end(), std::back_inserter(candidates), std::mem_fun_ref(&CppCFString::decode)); } void KanjiConversionMode::makeServerRemoveWord() { @@ -1065,12 +1033,13 @@ } else { query.append(HiraganaInputMode::convert(root)).append(okuri_head); } - query.append(' ').append(HiraganaInputMode::convert(okuri)); - query.append(' ').append(candidates[current_candidate_index].clone().eraseLast(okuri.length())); // ???????B + query.append(SKK_MSG_DELIMITER).append(HiraganaInputMode::convert(okuri)); + query.append(SKK_MSG_DELIMITER).append( + candidates[current_candidate_index].clone().eraseLast(okuri.length())); // ???????B } else { // ?? ?????-?? ?? // ??????????????????????? - query.append('-').append(HiraganaInputMode::convert(root)).append(' '); + query.append('-').append(HiraganaInputMode::convert(root)).append(SKK_MSG_DELIMITER); query.append(candidates[current_candidate_index]); } @@ -1098,84 +1067,46 @@ } void askServerTheCompletions(const CppCFData& query, std::vector& completions) { - CppCFString space(" "); - CppCFString nbsp("[20]"); CppCFString reply(ServerConnectionFactory::theInstance().newConnection(). send(kSKKFetchCompletions, query, kAquaSKKServerRunLoopMode).getData()); - // ??????? - completions.clear(); - const int reply_len = reply.length(); - int blockstart = 0; - for(int i = 0; i < reply_len; ++ i) { - if(reply[i] == ' ') { - if(i > blockstart) { - // ????? - completions.push_back(reply.substring(blockstart, i).replace(nbsp, space)); - } - blockstart = i + 1; - } - } - if(reply_len > blockstart) { - // ????? - completions.push_back(reply.substring(blockstart, reply_len).replace(nbsp, space)); - } + completions = reply.split(SKK_MSG_DELIMITER); } // ???? void sendWordToServerToRegister(const CppCFString& index,const CppCFString& okuri,const CppCFString& kanji) { - CppCFString space(" "); - CppCFString nbsp("[20]"); - CppCFData query; - query.own(CppCFString().append('+').append(index.replaceClone(space,nbsp)). - append(' ').append(okuri.replaceClone(space,nbsp)). - append(' ').append(kanji.replaceClone(space,nbsp)).toCFData()); + + query.own(CppCFString().append('+').append(index).append(SKK_MSG_DELIMITER). + append(okuri).append(SKK_MSG_DELIMITER).append(kanji).toCFData()); + ServerConnectionFactory::theInstance().newConnection().send(kSKKRegisterThisToUserDic, query); } void sendWordToServerToRegister(const CppCFString& index,const CppCFString& kanji) { - static CppCFString space(" "); - static CppCFString nbsp("[20]"); - static CppCFString blockopen("["); - static CppCFString blockopen_ref("[5b]"); - static CppCFString slash("/"); - static CppCFString slash_ref("[2f]"); - static CppCFString semicolon(";"); - static CppCFString semicolon_ref("[3b]"); - - CppCFString encoded_kanji = - kanji.replaceClone(blockopen, blockopen_ref).replace(slash, slash_ref). - replace(semicolon, semicolon_ref).replace(space,nbsp); - CppCFData query; - query.own(CppCFString().append('-').append(index.replaceClone(space, nbsp)). - append(' ').append(encoded_kanji).toCFData()); + + query.own(CppCFString().append('-').append(index).append(SKK_MSG_DELIMITER).append(kanji.encode()).toCFData()); ServerConnectionFactory::theInstance().newConnection().send(kSKKRegisterThisToUserDic, query); } void KanjiConversionMode::openCandidatesWindow(OpenDirection mode) { - // candidates?4???????????????????z????? - // ???????????????????R?????? - CppCFString space(" "); - CppCFString nbsp("[20]"); - std::vector cands_without_okuri; unsigned okuri_length = okuri.length(); if(okuri_length > 0) { for(std::vector::const_iterator ite = candidates.begin() + (show_cands_window_after_Nth_cand - 1); ite != candidates.end(); ++ ite) { - cands_without_okuri.push_back(ite->substring(0, ite->length() - okuri_length).replace(space, nbsp)); + cands_without_okuri.push_back(ite->substring(0, ite->length() - okuri_length)); } } else { for(std::vector::const_iterator ite = candidates.begin() + (show_cands_window_after_Nth_cand - 1); ite != candidates.end(); ++ ite) { - cands_without_okuri.push_back(ite->replaceClone(space,nbsp)); + cands_without_okuri.push_back(*ite); } } - ::openCandidatesWindow(join(' ', cands_without_okuri), + ::openCandidatesWindow(join(SKK_MSG_DELIMITER, cands_without_okuri), candidates_window_id, candidates_window_cands_per_frame, candidates_window_num_of_frames, Index: AquaSKK/KotoeriDictionary.cpp diff -u AquaSKK/KotoeriDictionary.cpp:1.2 AquaSKK/KotoeriDictionary.cpp:1.3 --- AquaSKK/KotoeriDictionary.cpp:1.2 Wed Apr 26 22:36:12 2006 +++ AquaSKK/KotoeriDictionary.cpp Fri May 5 00:27:02 2006 @@ -1,5 +1,5 @@ /* - $Id: KotoeriDictionary.cpp,v 1.2 2006/04/26 13:36:12 t-suwa Exp $ + $Id: KotoeriDictionary.cpp,v 1.3 2006/05/04 15:27:02 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -148,14 +148,15 @@ if(status != noErr) break; -#if MAC_OS_X_VERSION_MAX_ALLOWED>=1040 // ??????? - result.push_back(CppCFData(dataBuffer, actualSize).getData()); +#if MAC_OS_X_VERSION_MAX_ALLOWED>=1040 + CppCFString entry(CppCFData(dataBuffer, actualSize).getData()); #else CFStringRef tmp = CFStringCreateWithBytes(NULL, dataBuffer, actualSize, kCFStringEncodingUnicode, false); - result.push_back(tmp); + CppCFString entry(tmp); CFRelease(tmp); #endif + result.push_back(entry.encode()); } DCMDisposeRecordIterator(iterator); From t-suwa ¡÷ users.sourceforge.jp Wed May 17 01:13:11 2006 From: t-suwa ¡÷ users.sourceforge.jp (Tomotaka SUWA) Date: Wed, 17 May 2006 01:13:11 +0900 Subject: [aquaskk-changes 220] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20060516161311.0E1662AC020@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.8 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.9 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.8 Wed Apr 26 22:36:13 2006 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Wed May 17 01:13:10 2006 @@ -37,7 +37,6 @@ 849E1037055022FF009C3C25 /* ClientConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = F500AE950356848401D799AD /* ClientConfiguration.h */; }; 849E1038055022FF009C3C25 /* CppMessagePortServer.h in Headers */ = {isa = PBXBuildFile; fileRef = F5CC9DC80356A67F01D799AD /* CppMessagePortServer.h */; }; 849E1039055022FF009C3C25 /* ClientMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = F5DEF5D60356DB3501CD0AD3 /* ClientMessageReceiver.h */; }; - 849E103A055022FF009C3C25 /* SkkConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = F54D049B03B1FA5A01CD0AD3 /* SkkConfig.h */; }; 849E103B055022FF009C3C25 /* AquaSKK_Prefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 84C301620471FED8008D3B10 /* AquaSKK_Prefix.h */; }; 849E1044055022FF009C3C25 /* BIM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01A38B190056394F1153986C /* BIM.cpp */; }; 849E1045055022FF009C3C25 /* BIMComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01A38B1A0056394F1153986C /* BIMComponent.cpp */; }; @@ -63,7 +62,6 @@ 849E105F055022FF009C3C25 /* ClientConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F500AE960356848401D799AD /* ClientConfiguration.cpp */; }; 849E1060055022FF009C3C25 /* CppMessagePortServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CC9DC90356A67F01D799AD /* CppMessagePortServer.cpp */; }; 849E1061055022FF009C3C25 /* ClientMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DEF5D70356DB3501CD0AD3 /* ClientMessageReceiver.cpp */; }; - 849E1062055022FF009C3C25 /* SkkConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F54D049903B1F8E801CD0AD3 /* SkkConfig.cpp */; }; 849E1069055022FF009C3C25 /* BIM.r in Rez */ = {isa = PBXBuildFile; fileRef = 01A38B34005639D21153986C /* BIM.r */; }; 849E109E055023C8009C3C25 /* BIMClientServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A38B3600563A7B1153986C /* BIMClientServer.h */; }; 849E109F055023C8009C3C25 /* SKKDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADAD302F4D02501CD4EB1 /* SKKDictionary.h */; }; @@ -125,8 +123,6 @@ D3332EFF086DB196001C607D /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3332EFD086DB196001C607D /* CoreServices.framework */; }; D33EC09E0970E61C00305791 /* AquaSKK-InputMethod.tif in Resources */ = {isa = PBXBuildFile; fileRef = D33EC09D0970E61C00305791 /* AquaSKK-InputMethod.tif */; }; D34ED13109A7862400F0986F /* PreferenceKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = D34ED13009A7862400F0986F /* PreferenceKeys.h */; }; - D35B313509A0B170004C9192 /* SkkConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F54D049903B1F8E801CD0AD3 /* SkkConfig.cpp */; }; - D35B313609A0B178004C9192 /* SkkConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = F54D049B03B1FA5A01CD0AD3 /* SkkConfig.h */; }; D35D2BC909A2363D004409C7 /* KotoeriDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D35D2BC709A2363D004409C7 /* KotoeriDictionary.cpp */; }; D35D2BCA09A2363D004409C7 /* KotoeriDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = D35D2BC809A2363D004409C7 /* KotoeriDictionary.h */; }; D35D2BCD09A23931004409C7 /* DictionarySet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D35D2BCB09A23931004409C7 /* DictionarySet.cpp */; }; @@ -136,6 +132,15 @@ D35D2BD409A23C0E004409C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D35D2BD309A23C0E004409C7 /* main.m */; }; D365BB1908E4B86B000B9512 /* PrivateRunLoop.mm in Sources */ = {isa = PBXBuildFile; fileRef = D365BB1808E4B86B000B9512 /* PrivateRunLoop.mm */; }; D365BB1A08E4B86B000B9512 /* PrivateRunLoop.mm in Sources */ = {isa = PBXBuildFile; fileRef = D365BB1808E4B86B000B9512 /* PrivateRunLoop.mm */; }; + D369F6B60A1A27ED00784FF4 /* SKKConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D369F6B50A1A27ED00784FF4 /* SKKConfig.cpp */; }; + D369F6B70A1A27ED00784FF4 /* SKKConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D369F6B50A1A27ED00784FF4 /* SKKConfig.cpp */; }; + D369F6B90A1A280600784FF4 /* SKKConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = D369F6B80A1A280600784FF4 /* SKKConfig.h */; }; + D369F6BA0A1A280600784FF4 /* SKKConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = D369F6B80A1A280600784FF4 /* SKKConfig.h */; }; + D369F6BD0A1A29C800784FF4 /* SKKChar.h in Headers */ = {isa = PBXBuildFile; fileRef = D369F6BB0A1A29C800784FF4 /* SKKChar.h */; }; + D369F6BE0A1A29C800784FF4 /* SKKEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = D369F6BC0A1A29C800784FF4 /* SKKEvent.h */; }; + D369F6BF0A1A29C800784FF4 /* SKKChar.h in Headers */ = {isa = PBXBuildFile; fileRef = D369F6BB0A1A29C800784FF4 /* SKKChar.h */; }; + D369F6C00A1A29C800784FF4 /* SKKEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = D369F6BC0A1A29C800784FF4 /* SKKEvent.h */; }; + D369F6CE0A1A2D9C00784FF4 /* config in Resources */ = {isa = PBXBuildFile; fileRef = D369F6CD0A1A2D9C00784FF4 /* config */; }; D39D4D6409A61FD70075FE25 /* skkserv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D39D4D6109A61FD70075FE25 /* skkserv.cpp */; }; D39D4D6509A61FD70075FE25 /* skkserv.h in Headers */ = {isa = PBXBuildFile; fileRef = D39D4D6209A61FD70075FE25 /* skkserv.h */; }; D39D4D6609A61FD70075FE25 /* socketstream.h in Headers */ = {isa = PBXBuildFile; fileRef = D39D4D6309A61FD70075FE25 /* socketstream.h */; }; @@ -146,6 +151,7 @@ D3D0C6F8086EECA800319954 /* AsciiConversionMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3D0C6F6086EECA800319954 /* AsciiConversionMode.cpp */; }; D3D0C6F9086EECA800319954 /* AsciiConversionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = D3D0C6F7086EECA800319954 /* AsciiConversionMode.h */; }; D3D46F7B0872F755009707C1 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D3D46F790872F755009707C1 /* InfoPlist.strings */; }; + D3D841440A1A310300E79929 /* Mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = D3D841430A1A310300E79929 /* Mutex.h */; }; D3F94BA708E3A6F500496C35 /* PrivateRunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */; }; D3F94BA908E3A6F500496C35 /* PrivateRunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */; }; /* End PBXBuildFile section */ @@ -250,6 +256,11 @@ D35D2BD009A23BCF004409C7 /* AquaSKKServer.mm */ = {isa = PBXFileReference; fileEncoding = "-2147481087"; lastKnownFileType = sourcecode.cpp.objcpp; path = AquaSKKServer.mm; sourceTree = ""; }; D35D2BD309A23C0E004409C7 /* main.m */ = {isa = PBXFileReference; fileEncoding = "-2147481087"; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; D365BB1808E4B86B000B9512 /* PrivateRunLoop.mm */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.objcpp; path = PrivateRunLoop.mm; sourceTree = ""; }; + D369F6B50A1A27ED00784FF4 /* SKKConfig.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = SKKConfig.cpp; sourceTree = ""; }; + D369F6B80A1A280600784FF4 /* SKKConfig.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = SKKConfig.h; sourceTree = ""; }; + D369F6BB0A1A29C800784FF4 /* SKKChar.h */ = {isa = PBXFileReference; fileEncoding = 3; lastKnownFileType = sourcecode.c.h; path = SKKChar.h; sourceTree = ""; }; + D369F6BC0A1A29C800784FF4 /* SKKEvent.h */ = {isa = PBXFileReference; fileEncoding = 3; lastKnownFileType = sourcecode.c.h; path = SKKEvent.h; sourceTree = ""; }; + D369F6CD0A1A2D9C00784FF4 /* config */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = text; name = config; path = Resources/config; sourceTree = ""; }; D39D4D6109A61FD70075FE25 /* skkserv.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = skkserv.cpp; sourceTree = ""; }; D39D4D6209A61FD70075FE25 /* skkserv.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = skkserv.h; sourceTree = ""; }; D39D4D6309A61FD70075FE25 /* socketstream.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = socketstream.h; sourceTree = ""; }; @@ -260,6 +271,7 @@ D3D0C6F6086EECA800319954 /* AsciiConversionMode.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = AsciiConversionMode.cpp; sourceTree = ""; }; D3D0C6F7086EECA800319954 /* AsciiConversionMode.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = AsciiConversionMode.h; sourceTree = ""; }; D3D46F7A0872F755009707C1 /* Japanese */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = Japanese; path = Japanese.lproj/InfoPlist.strings; sourceTree = ""; }; + D3D841430A1A310300E79929 /* Mutex.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = Mutex.h; sourceTree = ""; }; D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = PrivateRunLoop.h; sourceTree = ""; }; F500AE950356848401D799AD /* ClientConfiguration.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = ClientConfiguration.h; sourceTree = ""; }; F500AE960356848401D799AD /* ClientConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = ClientConfiguration.cpp; sourceTree = ""; }; @@ -292,8 +304,6 @@ F5351C0F03086FBB017A142D /* ZenKataInputMode.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = ZenKataInputMode.h; sourceTree = ""; }; F53AE7F50300BC3F01CD4EB1 /* CandidatesManager.mm */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.objcpp; path = CandidatesManager.mm; sourceTree = ""; }; F53AE7F60300BC3F01CD4EB1 /* CandidatesManager.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = CandidatesManager.h; sourceTree = ""; }; - F54D049903B1F8E801CD0AD3 /* SkkConfig.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = SkkConfig.cpp; sourceTree = ""; }; - F54D049B03B1FA5A01CD0AD3 /* SkkConfig.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = SkkConfig.h; sourceTree = ""; }; F551EC7B030FD24C012D3D1A /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/AboutBox.nib; sourceTree = ""; }; F551EE20030FEB44012D3D1A /* Japanese */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/Preferences.nib; sourceTree = ""; }; F551EE22030FED06012D3D1A /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = ""; }; @@ -377,6 +387,7 @@ 0197B302009015467F000001 /* Source */ = { isa = PBXGroup; children = ( + D3D841430A1A310300E79929 /* Mutex.h */, D3A9A94009B0964F00DF29C8 /* ProxyDictionary.cpp */, D3A9A94109B0964F00DF29C8 /* ProxyDictionary.h */, D34ED13009A7862400F0986F /* PreferenceKeys.h */, @@ -436,7 +447,9 @@ 046A91630058A55A1153986C /* Shared Headers */ = { isa = PBXGroup; children = ( - F54D049B03B1FA5A01CD0AD3 /* SkkConfig.h */, + D369F6BB0A1A29C800784FF4 /* SKKChar.h */, + D369F6BC0A1A29C800784FF4 /* SKKEvent.h */, + D369F6B80A1A280600784FF4 /* SKKConfig.h */, 01A38B3600563A7B1153986C /* BIMClientServer.h */, 84C301620471FED8008D3B10 /* AquaSKK_Prefix.h */, ); @@ -469,6 +482,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + D369F6CD0A1A2D9C00784FF4 /* config */, D308EC0A09DDED7400CCECDD /* kana-rule-list */, D308EC0B09DDED7400CCECDD /* okuri-list */, D308EC0C09DDED7400CCECDD /* translation-to-hankata */, @@ -573,7 +587,7 @@ F5E6AE7C02F8CD5901CD4EB1 /* Shared Source */ = { isa = PBXGroup; children = ( - F54D049903B1F8E801CD0AD3 /* SkkConfig.cpp */, + D369F6B50A1A27ED00784FF4 /* SKKConfig.cpp */, F5D6B81402F64CF5011002E2 /* CppCFString.h */, F5D6B81302F64CF5011002E2 /* CppCFString.cpp */, F554D11D03026A4301CD4EB1 /* CppCFData.h */, @@ -622,10 +636,12 @@ 849E1037055022FF009C3C25 /* ClientConfiguration.h in Headers */, 849E1038055022FF009C3C25 /* CppMessagePortServer.h in Headers */, 849E1039055022FF009C3C25 /* ClientMessageReceiver.h in Headers */, - 849E103A055022FF009C3C25 /* SkkConfig.h in Headers */, 849E103B055022FF009C3C25 /* AquaSKK_Prefix.h in Headers */, D3D0C6F9086EECA800319954 /* AsciiConversionMode.h in Headers */, D3F94BA708E3A6F500496C35 /* PrivateRunLoop.h in Headers */, + D369F6B90A1A280600784FF4 /* SKKConfig.h in Headers */, + D369F6BD0A1A29C800784FF4 /* SKKChar.h in Headers */, + D369F6BE0A1A29C800784FF4 /* SKKEvent.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -654,7 +670,6 @@ D311227D08E45154003A91E1 /* TransparentWindow.h in Headers */, 7BFD9A490919CD9A001D48F1 /* AboutBoxController.h in Headers */, D3B8C26F099ED66600C08C41 /* DictArrayController.h in Headers */, - D35B313609A0B178004C9192 /* SkkConfig.h in Headers */, D35D2BCA09A2363D004409C7 /* KotoeriDictionary.h in Headers */, D35D2BCE09A23931004409C7 /* DictionarySet.h in Headers */, D35D2BD109A23BCF004409C7 /* AquaSKKServer.h in Headers */, @@ -662,6 +677,10 @@ D39D4D6609A61FD70075FE25 /* socketstream.h in Headers */, D34ED13109A7862400F0986F /* PreferenceKeys.h in Headers */, D3A9A94309B0964F00DF29C8 /* ProxyDictionary.h in Headers */, + D369F6BA0A1A280600784FF4 /* SKKConfig.h in Headers */, + D369F6BF0A1A29C800784FF4 /* SKKChar.h in Headers */, + D369F6C00A1A29C800784FF4 /* SKKEvent.h in Headers */, + D3D841440A1A310300E79929 /* Mutex.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -786,6 +805,7 @@ D308EC1509DDED7400CCECDD /* translation-to-katakana in Resources */, D308EC1609DDED7400CCECDD /* tut-config in Resources */, D308EC1709DDED7400CCECDD /* tut-kana-rule-list in Resources */, + D369F6CE0A1A2D9C00784FF4 /* config in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -851,9 +871,9 @@ 849E105F055022FF009C3C25 /* ClientConfiguration.cpp in Sources */, 849E1060055022FF009C3C25 /* CppMessagePortServer.cpp in Sources */, 849E1061055022FF009C3C25 /* ClientMessageReceiver.cpp in Sources */, - 849E1062055022FF009C3C25 /* SkkConfig.cpp in Sources */, D3D0C6F8086EECA800319954 /* AsciiConversionMode.cpp in Sources */, D365BB1A08E4B86B000B9512 /* PrivateRunLoop.mm in Sources */, + D369F6B60A1A27ED00784FF4 /* SKKConfig.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -879,13 +899,13 @@ D365BB1908E4B86B000B9512 /* PrivateRunLoop.mm in Sources */, 7BFD9A480919CD99001D48F1 /* AboutBoxController.mm in Sources */, D3B8C270099ED66600C08C41 /* DictArrayController.m in Sources */, - D35B313509A0B170004C9192 /* SkkConfig.cpp in Sources */, D35D2BC909A2363D004409C7 /* KotoeriDictionary.cpp in Sources */, D35D2BCD09A23931004409C7 /* DictionarySet.cpp in Sources */, D35D2BD209A23BCF004409C7 /* AquaSKKServer.mm in Sources */, D35D2BD409A23C0E004409C7 /* main.m in Sources */, D39D4D6409A61FD70075FE25 /* skkserv.cpp in Sources */, D3A9A94209B0964F00DF29C8 /* ProxyDictionary.cpp in Sources */, + D369F6B70A1A27ED00784FF4 /* SKKConfig.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From t-suwa ¡÷ users.sourceforge.jp Wed May 17 01:13:11 2006 From: t-suwa ¡÷ users.sourceforge.jp (Tomotaka SUWA) Date: Wed, 17 May 2006 01:13:11 +0900 Subject: [aquaskk-changes 221] CVS update: AquaSKK/Resources Message-ID: <20060516161311.39F222AC036@users.sourceforge.jp> Index: AquaSKK/Resources/config diff -u /dev/null AquaSKK/Resources/config:1.1 --- /dev/null Wed May 17 01:13:11 2006 +++ AquaSKK/Resources/config Wed May 17 01:13:11 2006 @@ -0,0 +1,25 @@ +# $Id: config,v 1.1 2006/05/16 16:13:11 t-suwa Exp $ + +### +### default config +### + +kana-mode-key "\C-j" +toggle-kana-key "q" +toggle-katakana-key "\C-q" +latin-mode-key "l" +jisx0208-latin-mode-key "L" +abbrev-mode-key "/" +cancel-key "\C-g" +kakutei-key "\C-j" +next-kouho-key " " +prev-kouho-key "x" +purge-from-jisyo-key "X" +abbrev-prev-key "," +abbrev-next-key "." +set-henkan-point-key "Q" +paste-key "\C-y" + +fix-n true +use-eisuu-to-set-henkan-point false +use-kana-to-set-henkan-point false From t-suwa ¡÷ users.sourceforge.jp Wed May 17 01:40:01 2006 From: t-suwa ¡÷ users.sourceforge.jp (Tomotaka SUWA) Date: Wed, 17 May 2006 01:40:01 +0900 Subject: [aquaskk-changes 222] CVS update: AquaSKK/AquaSKK.pbproj Message-ID: <20060516164001.7C98D2AC036@users.sourceforge.jp> Index: AquaSKK/AquaSKK.pbproj/project.pbxproj diff -u AquaSKK/AquaSKK.pbproj/project.pbxproj:1.6 AquaSKK/AquaSKK.pbproj/project.pbxproj:1.7 --- AquaSKK/AquaSKK.pbproj/project.pbxproj:1.6 Wed Apr 26 22:36:13 2006 +++ AquaSKK/AquaSKK.pbproj/project.pbxproj Wed May 17 01:40:01 2006 @@ -215,6 +215,9 @@ }; 046A91630058A55A1153986C = { children = ( + D3451E3F0A1A340000C0E5F5, + D3451E400A1A340000C0E5F5, + D3451E410A1A340000C0E5F5, 01A38B3600563A7B1153986C, 84C301620471FED8008D3B10, ); @@ -278,6 +281,7 @@ }; 089C167CFE841241C02AAC07 = { children = ( + D3451E480A1A342300C0E5F5, D38B8DC409DE1BA70017227D, D38B8DC509DE1BA70017227D, D38B8DC609DE1BA70017227D, @@ -482,10 +486,12 @@ 849E1037055022FF009C3C25, 849E1038055022FF009C3C25, 849E1039055022FF009C3C25, - 849E103A055022FF009C3C25, 849E103B055022FF009C3C25, D3787C1F08ADBF280058EFCE, D3143F5908E50E40004A51AE, + D3451E420A1A340000C0E5F5, + D3451E430A1A340000C0E5F5, + D3451E440A1A340000C0E5F5, ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -652,12 +658,6 @@ settings = { }; }; - 849E103A055022FF009C3C25 = { - fileRef = F54D049B03B1FA5A01CD0AD3; - isa = PBXBuildFile; - settings = { - }; - }; 849E103B055022FF009C3C25 = { fileRef = 84C301620471FED8008D3B10; isa = PBXBuildFile; @@ -682,6 +682,7 @@ D38B8DCF09DE1BA70017227D, D38B8DD009DE1BA70017227D, D38B8DD109DE1BA70017227D, + D3451E490A1A342300C0E5F5, ); isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -713,9 +714,9 @@ 849E105F055022FF009C3C25, 849E1060055022FF009C3C25, 849E1061055022FF009C3C25, - 849E1062055022FF009C3C25, D3787C1E08ADBF280058EFCE, D3143F5A08E50E40004A51AE, + D3451E3D0A1A33DA00C0E5F5, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -864,12 +865,6 @@ settings = { }; }; - 849E1062055022FF009C3C25 = { - fileRef = F54D049903B1F8E801CD0AD3; - isa = PBXBuildFile; - settings = { - }; - }; 849E1064055022FF009C3C25 = { buildActionMask = 2147483647; files = ( @@ -959,7 +954,6 @@ 849E109D055023C8009C3C25 = { buildActionMask = 2147483647; files = ( - D30B325E09AA000500F214E0, 849E109E055023C8009C3C25, 849E109F055023C8009C3C25, 849E10A3055023C8009C3C25, @@ -989,6 +983,9 @@ D31CA3CA09A8AFBB008D7CE3, D3D4761709D6E29C00C4CF87, D3D4761909D6E29C00C4CF87, + D3451E450A1A340000C0E5F5, + D3451E460A1A340000C0E5F5, + D3451E470A1A340000C0E5F5, ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -1135,7 +1132,6 @@ 849E10BD055023C8009C3C25 = { buildActionMask = 2147483647; files = ( - D30B325D09A9FFFB00F214E0, 849E10BF055023C8009C3C25, 849E10C3055023C8009C3C25, 849E10C4055023C8009C3C25, @@ -1160,6 +1156,7 @@ D31CA3C609A8AFBB008D7CE3, D31CA3C809A8AFBB008D7CE3, D3D4761809D6E29C00C4CF87, + D3451E3E0A1A33DA00C0E5F5, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -1309,18 +1306,6 @@ //D32 //D33 //D34 - D30B325D09A9FFFB00F214E0 = { - fileRef = F54D049903B1F8E801CD0AD3; - isa = PBXBuildFile; - settings = { - }; - }; - D30B325E09AA000500F214E0 = { - fileRef = F54D049B03B1FA5A01CD0AD3; - isa = PBXBuildFile; - settings = { - }; - }; D3143F5708E50E40004A51AE = { fileEncoding = "-2147483647"; isa = PBXFileReference; @@ -1591,6 +1576,101 @@ settings = { }; }; + D3451E3C0A1A33DA00C0E5F5 = { + fileEncoding = "-2147483647"; + isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.cpp; + path = SKKConfig.cpp; + refType = 4; + sourceTree = ""; + }; + D3451E3D0A1A33DA00C0E5F5 = { + fileRef = D3451E3C0A1A33DA00C0E5F5; + isa = PBXBuildFile; + settings = { + }; + }; + D3451E3E0A1A33DA00C0E5F5 = { + fileRef = D3451E3C0A1A33DA00C0E5F5; + isa = PBXBuildFile; + settings = { + }; + }; + D3451E3F0A1A340000C0E5F5 = { + fileEncoding = "-2147483647"; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = SKKChar.h; + refType = 4; + sourceTree = ""; + }; + D3451E400A1A340000C0E5F5 = { + fileEncoding = "-2147483647"; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = SKKConfig.h; + refType = 4; + sourceTree = ""; + }; + D3451E410A1A340000C0E5F5 = { + fileEncoding = "-2147483647"; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = SKKEvent.h; + refType = 4; + sourceTree = ""; + }; + D3451E420A1A340000C0E5F5 = { + fileRef = D3451E3F0A1A340000C0E5F5; + isa = PBXBuildFile; + settings = { + }; + }; + D3451E430A1A340000C0E5F5 = { + fileRef = D3451E400A1A340000C0E5F5; + isa = PBXBuildFile; + settings = { + }; + }; + D3451E440A1A340000C0E5F5 = { + fileRef = D3451E410A1A340000C0E5F5; + isa = PBXBuildFile; + settings = { + }; + }; + D3451E450A1A340000C0E5F5 = { + fileRef = D3451E3F0A1A340000C0E5F5; + isa = PBXBuildFile; + settings = { + }; + }; + D3451E460A1A340000C0E5F5 = { + fileRef = D3451E400A1A340000C0E5F5; + isa = PBXBuildFile; + settings = { + }; + }; + D3451E470A1A340000C0E5F5 = { + fileRef = D3451E410A1A340000C0E5F5; + isa = PBXBuildFile; + settings = { + }; + }; + D3451E480A1A342300C0E5F5 = { + fileEncoding = "-2147483647"; + isa = PBXFileReference; + lastKnownFileType = text; + name = config; + path = Resources/config; + refType = 4; + sourceTree = ""; + }; + D3451E490A1A342300C0E5F5 = { + fileRef = D3451E480A1A342300C0E5F5; + isa = PBXBuildFile; + settings = { + }; + }; D3787C1C08ADBF280058EFCE = { fileEncoding = "-2147483647"; isa = PBXFileReference; @@ -2243,22 +2323,6 @@ refType = 4; sourceTree = ""; }; - F54D049903B1F8E801CD0AD3 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = SkkConfig.cpp; - refType = 4; - sourceTree = ""; - }; - F54D049B03B1FA5A01CD0AD3 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - path = SkkConfig.h; - refType = 4; - sourceTree = ""; - }; F551EC7A030FD24C012D3D1A = { children = ( F551EC7B030FD24C012D3D1A, @@ -2563,6 +2627,7 @@ }; F5E6AE7C02F8CD5901CD4EB1 = { children = ( + D3451E3C0A1A33DA00C0E5F5, F5D6B81402F64CF5011002E2, F5D6B81302F64CF5011002E2, F554D11D03026A4301CD4EB1, @@ -2573,8 +2638,6 @@ F5CC9DC90356A67F01D799AD, D3143F5708E50E40004A51AE, D3143F5808E50E40004A51AE, - F54D049903B1F8E801CD0AD3, - F54D049B03B1FA5A01CD0AD3, ); isa = PBXGroup; name = "Shared Source"; From t-suwa ¡÷ users.sourceforge.jp Tue May 23 23:47:01 2006 From: t-suwa ¡÷ users.sourceforge.jp (Tomotaka SUWA) Date: Tue, 23 May 2006 23:47:01 +0900 Subject: [aquaskk-changes 223] CVS update: AquaSKK Message-ID: <20060523144701.679682AC00E@users.sourceforge.jp> Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.24 AquaSKK/ChangeLog:1.25 --- AquaSKK/ChangeLog:1.24 Wed May 17 01:13:10 2006 +++ AquaSKK/ChangeLog Tue May 23 23:47:01 2006 @@ -1,3 +1,11 @@ +2006-05-23 Tomotaka SUWA + + * Japanese.lproj/Preferences.nib/keyedobjects.nib: ???????? + ??????? + + * PreferenceKeys.h, PreferencesController.mm: ?????????? + ?? + 2006-05-17 Tomotaka SUWA * Resources/config: ??????????? config? Index: AquaSKK/PreferenceKeys.h diff -u AquaSKK/PreferenceKeys.h:1.2 AquaSKK/PreferenceKeys.h:1.3 --- AquaSKK/PreferenceKeys.h:1.2 Wed Apr 26 22:36:12 2006 +++ AquaSKK/PreferenceKeys.h Tue May 23 23:47:01 2006 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferenceKeys.h,v 1.2 2006/04/26 13:36:12 t-suwa Exp $ + $Id: PreferenceKeys.h,v 1.3 2006/05/23 14:47:01 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -27,6 +27,7 @@ // ????????????? extern NSString* KEY_egg_like_newline; extern NSString* KEY_numkeypad_use_halfwidth; +extern NSString* KEY_use_numeric_conversion; extern NSString* KEY_force_ascii_mode_startup; extern NSString* KEY_keyboard_layout_id; Index: AquaSKK/PreferencesController.mm diff -u AquaSKK/PreferencesController.mm:1.7 AquaSKK/PreferencesController.mm:1.8 --- AquaSKK/PreferencesController.mm:1.7 Wed Apr 26 22:36:12 2006 +++ AquaSKK/PreferencesController.mm Tue May 23 23:47:01 2006 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.mm,v 1.7 2006/04/26 13:36:12 t-suwa Exp $ + $Id: PreferencesController.mm,v 1.8 2006/05/23 14:47:01 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -32,10 +32,11 @@ #include "skkserv.h" // ?????????? -NSString* KEY_keyboard_layout_id = @"keyboard_layout_id"; NSString* KEY_egg_like_newline = @"egg_like_newline"; NSString* KEY_numkeypad_use_halfwidth = @"numkeypad_use_halfwidth"; +NSString* KEY_use_numeric_conversion = @"use_numeric_conversion"; NSString* KEY_force_ascii_mode_startup = @"force_ascii_mode_startup"; +NSString* KEY_keyboard_layout_id = @"keyboard_layout_id"; NSString* KEY_candidates_count = @"candidates_count"; NSString* KEY_candidates_font_name = @"candidates_font_name";