From t-suwa ＠ users.sourceforge.jp Sat Jul 16 22:25:09 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 16 Jul 2005 22:25:09 +0900 Subject: [aquaskk-changes 1] CVS update: CVSROOT Message-ID: <20050716132509.A13632AC032@users.sourceforge.jp> Index: CVSROOT/cvsignore diff -u /dev/null CVSROOT/cvsignore:1.1 --- /dev/null Sat Jul 16 22:25:09 2005 +++ CVSROOT/cvsignore Sat Jul 16 22:25:09 2005 @@ -0,0 +1,6 @@ +build +.DS* +._.DS* +*~.* +*.pbxuser +*.mode1 Index: CVSROOT/cvswrappers diff -u CVSROOT/cvswrappers:1.1 CVSROOT/cvswrappers:1.2 --- CVSROOT/cvswrappers:1.1 Thu Jul 14 18:10:01 2005 +++ CVSROOT/cvswrappers Sat Jul 16 22:25:09 2005 @@ -1,19 +1,103 @@ -# This file affects handling of files based on their names. +# This file describes files that should be handled as binary by CVS. # -# The -m option specifies whether CVS attempts to merge files. +# Binary files effectively prevent RCS style merging of the files, +# thus preventing unresolveable conflicts in binary files. # -# The -k option specifies keyword expansion (e.g. -kb for binary). +# Tar wrappers are no longer supported by CVS. The specifications +# still exist in this file to ensure compatibility in those cases +# where the user may have created a symlink from this file +# to ~/.cvswrappers +# +# *** NOTICE *** +# When creating new repositories, do not use tar wrappers. They +# are deprecated and new versions of CVS do not support tar wrappers +# at all. # # Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers) # # wildcard [option value][option value]... # # where option is one of -# -f from cvs filter value: path to filter -# -t to cvs filter value: path to filter -# -m update methodology value: MERGE or COPY -# -k expansion mode value: b, o, kkv, &c +# -m update methodology value: MERGE or COPY +# -k RCS keyword expansion mode value: Any mode valid for -k. +# (This is an extension to cvs by Bill Bumgardner.) # # and value is a single-quote delimited value. -# For example: -#*.gif -k 'b' + +# File extensions that indicate a file should be treated as binary +*.aiff -k 'b' -m 'COPY' +*.aac -k 'b' -m 'COPY' +*.BMP -k 'b' -m 'COPY' +*.bmp -k 'b' -m 'COPY' +*.BPT -k 'b' -m 'COPY' +*.BRO -k 'b' -m 'COPY' +*.bw -k 'b' -m 'COPY' +*.class -k 'b' -m 'COPY' +*.COM -k 'b' -m 'COPY' +*.com -k 'b' -m 'COPY' +*.DAT -k 'b' -m 'COPY' +*.dat -k 'b' -m 'COPY' +*.DLL -k 'b' -m 'COPY' +*.dll -k 'b' -m 'COPY' +*.dylib -k 'b' -m 'COPY' +*.doc -k 'b' -m 'COPY' +*.eps -k 'b' -m 'COPY' +*.EXE -k 'b' -m 'COPY' +*.exe -k 'b' -m 'COPY' +*.ex_ -k 'b' -m 'COPY' +*.fm -k 'b' -m 'COPY' +*.GIF -k 'b' -m 'COPY' +*.gif -k 'b' -m 'COPY' +*.gz -k 'b' -m 'COPY' +*.icns -k 'b' -m 'COPY' +*.ICO -k 'b' -m 'COPY' +*.ico -k 'b' -m 'COPY' +*.ins -k 'b' -m 'COPY' +*.jar -k 'b' -m 'COPY' +*.JPEG -k 'b' -m 'COPY' +*.jpeg -k 'b' -m 'COPY' +*.JPG -k 'b' -m 'COPY' +*.jpg -k 'b' -m 'COPY' +*.LIB -k 'b' -m 'COPY' +*.lib -k 'b' -m 'COPY' +*.MAK -k 'b' -m 'COPY' +*.mcp -k 'b' -m 'COPY' +*.mid -k 'b' -m 'COPY' +*.mom -k 'b' -m 'COPY' +*.mov -k 'b' -m 'COPY' +*.mp3 -k 'b' -m 'COPY' +*.nib -k 'b' -m 'COPY' +*.objectplant -k 'b' -m 'COPY' +*.o -k 'b' -m 'COPY' +*.OPN -k 'b' -m 'COPY' +*.OVL -k 'b' -m 'COPY' +*.ovl -k 'b' -m 'COPY' +*.pct -k 'b' -m 'COPY' +*.pdf -k 'b' -m 'COPY' +*.PICT -k 'b' -m 'COPY' +*.PNG -k 'b' -m 'COPY' +*.png -k 'b' -m 'COPY' +*.ppt -k 'b' -m 'COPY' +*.PQG -k 'b' -m 'COPY' +*.pqg -k 'b' -m 'COPY' +*.prj -k 'b' -m 'COPY' +*.ps -k 'b' -m 'COPY' +*.rgb -k 'b' -m 'COPY' +*.sl -k 'b' -m 'COPY' +*.snd -k 'b' -m 'COPY' +*.so -k 'b' -m 'COPY' +*.so.3 -k 'b' -m 'COPY' +*.strings -k 'b' -m 'COPY' +*.tar -k 'b' -m 'COPY' +*.tgz -k 'b' -m 'COPY' +*.TIF -k 'b' -m 'COPY' +*.tif -k 'b' -m 'COPY' +*.TIFF -k 'b' -m 'COPY' +*.tiff -k 'b' -m 'COPY' +*.wav -k 'b' -m 'COPY' +*.wordbreak -k 'b' -m 'COPY' +*.zip -k 'b' -m 'COPY' + +# class/data model innards. +elements -k 'b' -m 'COPY' +layout -k 'b' -m 'COPY' From t-suwa ＠ users.sourceforge.jp Sun Jul 17 18:09:10 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 18:09:10 +0900 Subject: [aquaskk-changes 2] CVS update: sandbox/AquaSKK Message-ID: <20050717090910.B44BE2AC021@users.sourceforge.jp> From t-suwa ＠ users.sourceforge.jp Sun Jul 17 18:17:08 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 18:17:08 +0900 Subject: [aquaskk-changes 3] CVS update: CVSROOT Message-ID: <20050717091708.186C42AC021@users.sourceforge.jp> Index: CVSROOT/cvswrappers diff -u CVSROOT/cvswrappers:1.2 CVSROOT/cvswrappers:1.3 --- CVSROOT/cvswrappers:1.2 Sat Jul 16 22:25:09 2005 +++ CVSROOT/cvswrappers Sun Jul 17 18:17:07 2005 @@ -97,6 +97,7 @@ *.wav -k 'b' -m 'COPY' *.wordbreak -k 'b' -m 'COPY' *.zip -k 'b' -m 'COPY' +*.psd -k 'b' -m 'COPY' # class/data model innards. elements -k 'b' -m 'COPY' From t-suwa ＠ users.sourceforge.jp Sun Jul 17 18:23:25 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 18:23:25 +0900 Subject: [aquaskk-changes 4] CVS update: sandbox/AquaSKK Message-ID: <20050717092325.585C62AC021@users.sourceforge.jp> From t-suwa ＠ users.sourceforge.jp Sun Jul 17 18:44:54 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 18:44:54 +0900 Subject: [aquaskk-changes 5] CVS update: CVSROOT Message-ID: <20050717094454.575C62AC021@users.sourceforge.jp> Index: CVSROOT/cvsignore diff -u CVSROOT/cvsignore:1.1 CVSROOT/cvsignore:1.2 --- CVSROOT/cvsignore:1.1 Sat Jul 16 22:25:09 2005 +++ CVSROOT/cvsignore Sun Jul 17 18:44:54 2005 @@ -1,6 +1,6 @@ build .DS* -._.DS* +._* *~.* *.pbxuser *.mode1 From t-suwa ＠ users.sourceforge.jp Sun Jul 17 18:50:51 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 18:50:51 +0900 Subject: [aquaskk-changes 6] CVS update: sandbox/AquaSKK Message-ID: <20050717095051.5DC252AC021@users.sourceforge.jp> Index: sandbox/AquaSKK/AsciiConvertionMode.cpp diff -u sandbox/AquaSKK/AsciiConvertionMode.cpp:1.1.1.1 sandbox/AquaSKK/AsciiConvertionMode.cpp:removed --- sandbox/AquaSKK/AsciiConvertionMode.cpp:1.1.1.1 Sun Jul 17 18:09:03 2005 +++ sandbox/AquaSKK/AsciiConvertionMode.cpp Sun Jul 17 18:50:51 2005 @@ -1,706 +0,0 @@ -/* $Id: AsciiConvertionMode.cpp,v 1.1.1.1 2005/07/17 09:09:03 t-suwa Exp $ - - MacOS X implementation of the SKK input method. - Copyright (C) 2002-2004 phonohawk - - 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 - the Free Software Foundation; either version 2 of the License, or - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ -#include "AsciiConvertionMode.h" -#include "BIMInputEvents.h" -#include "HiraganaInputMode.h" -#include "ParentInputMode.h" -#include "CppCFData.h" -#include "WordRegisterMode.h" -#include "ServerConnectionFactory.h" -#include "KanjiConversionMode.h" // KanjiConversionMode????????????? -#include "ClientConfiguration.h" -#include "SkkConfig.h" - -AsciiConvertionMode::AsciiConvertionMode(ParentInputMode& parent) - :ChildInputMode(parent), - word_register_mode(NULL), - status(STATUS_NULL), - show_cands_window_after_Nth_cand(5), - completion_mode(false), - henkanModeStatus(false) { - -} - -AsciiConvertionMode::~AsciiConvertionMode() { - if (word_register_mode) { - delete word_register_mode; - } -} - -void AsciiConvertionMode::start() { - status = STATUS_WHITE; -} - -bool AsciiConvertionMode::handleInput(unsigned char inputChar) { - bool result = handleInputChar(inputChar); - henkanModeStatus = !result; - - return result; -} - -bool AsciiConvertionMode::handleInputChar(unsigned char inputChar) { - if (word_register_mode) { - word_register_mode->handleInput(inputChar); - return false; // WordRegisterMode::handleInput()??????????????? - } - - if (SkkConfig::config().isAbbrevNextKey(inputChar)) { - if (status == STATUS_WHITE && completion_mode) { - // ???????????????????B - current_completion_index++; - if (current_completion_index >= completions.size()) { - current_completion_index = 0; - } - index = completions[current_completion_index]; - return false; - } - } - - if (SkkConfig::config().isAbbrevPrevKey(inputChar)) { - if (status == STATUS_WHITE && completion_mode) { - // ??????????s????????? - if (current_completion_index == 0) { - current_completion_index = completions.size() - 1; - } - else { - current_completion_index--; - } - index = completions[current_completion_index]; - return false; - } - } - - // tab,????,????????????????????????????? - completion_mode = false; - - if (SkkConfig::config().isToggleKanaKey(inputChar)) { - if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // ????????? - // 1) ????????????????? - // 2) ????????????? - - parent->setEnabledKanjiMode(false); - if (parent->isHiraganaInputMode()) { - parent->goZenKataInputMode(); - } - else { - parent->goHiraganaInputMode(); - } - return true; - } - } - - if (SkkConfig::config().isPrevKouhoKey(inputChar)) { - if (status == STATUS_BLACK) { - // ???????????????????[????? - if (current_candidate_index > 0) { - current_candidate_index--; - } - else { - status = STATUS_WHITE; - } - return false; - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - // delete??????????? - handleBackSpace(); - return false; - } - // ????????? - } - - if (SkkConfig::config().isPurgeFromJisyoKey(inputChar)) { - if (status == STATUS_BLACK) { - // ??v???????B?????ﾀ?????ｫ??????????????- // ?????????????????????????????? - status = STATUS_PROMPT; - prompt_type = PROMPT_DELETE_FROM_USER_DIC; - prompt_input.clear(); - prompt.clear().append(0x672c).append(0x5f53).append(0x306b).append(' '); - prompt.append('/').append(index).append('/'); - prompt.append(candidates[current_candidate_index]).append("/ "); - prompt.append(0x3092).append(0x524a).append(0x9664).append(0x3057).append(0x3066). - append(0x3082).append(0x5b9c).append(0x3057).append(0x3044).append(0x3067). - append(0x3059).append(0x304b).append(0xff1f).append("(yes/no)"); - return false; - } - } - - if (SkkConfig::config().isToggleKatakanaKey(inputChar)) { - if (status == STATUS_WHITE) { - // ????????????????????????- parent->fix(ZenAscInputMode::convert(index)); - - parent->setEnabledAsciiConvertionMode(false); - initialize(); - - return false; - } - if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // ????????????? - // 1) ????????????????? - // 2) ????????????????? - - parent->setEnabledAsciiConvertionMode(false); - if (parent->isHanKataInputMode()) { - parent->goHiraganaInputMode(); - } - else { - parent->goHanKataInputMode(); - } - return true; - } - } - - if (SkkConfig::config().isKakuteiKey(inputChar)) { - return true; // ???? - } - - if (SkkConfig::config().isLatinModeKey(inputChar) - || SkkConfig::config().isJisx0208LatinModeKey(inputChar)) { - if (status == STATUS_BLACK) { - // ???????????/?????????? - if (SkkConfig::config().isLatinModeKey(inputChar)) { - parent->goHanAscInputMode(); - } - else { - parent->goZenAscInputMode(); - } - return true; - } - // ????????????????? - } - - if (SkkConfig::config().isAbbrevModeKey(inputChar)) { - if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - parent->fix(this->getStringToFix()); - parent->handleInput(inputChar); - return false; - } - } - - if (SkkConfig::config().isNextKouhoKey(inputChar)) { - if (status == STATUS_WHITE) { - if (index.length() == 0) { - // ??- parent->setEnabledAsciiConvertionMode(false); - parent->display(CppCFString()); - initialize(); - return false; - } - - // ??????? - askServerTheCandidates(); - - if (candidates.size() > 0) { - // ?????????????? - status = STATUS_BLACK; - current_candidate_index = 0; // ?????B - } - else { - // ???????????????? - startRegisteringWord(); - } - } - else if (status == STATUS_BLACK) { - // ????? - current_candidate_index++; - - if (current_candidate_index >= candidates.size()) { // ?????s?????????? - startRegisteringWord(); - } - else if (current_candidate_index >= show_cands_window_after_Nth_cand - 1) { - // ????????????????????????ｦ??? - status = STATUS_BLACK_WITH_WINDOW; - openCandidatesWindow(); - } - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - if (candidates_window_current_frame < candidates_window_num_of_frames - 1) { - // ??????????????????????? - goToNextCandidatesFrame(); - } - else { - // ???????????????????? - closeCandidatesWindow(); - startRegisteringWord(); - } - } - } - else { - if (status == STATUS_WHITE) { - // index?????? - index += inputChar; - } - else if (status == STATUS_BLACK) { - // ?????????????????I????? - // ???????ｦ/fix???????????? - // ?????????????????arent?handleInput???? - // AsciiConvertionMode?STATUS_NULL???? - // ??IgnoreThis???? - - // ???? - sendCurrentCandidateToServerToRegister(); - - // ?????????????????? - parent->fix(candidates[current_candidate_index]); - - parent->setEnabledAsciiConvertionMode(false); - initialize(); - - parent->handleInput(inputChar); - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - // asdfjkl?1????????????7????????????B???????? - // ???????????? - // ???????????????????? - int cand_index = CppCFString("asdfjkl").substring(0,candidates_window_cands_per_frame).indexOf(inputChar); - if (cand_index != -1) { - unsigned new_index = current_candidate_index + cand_index; - if (new_index < candidates.size()) { - // ??????????????????? - current_candidate_index = new_index; - return true; - } - } - return false; - } - else if (status == STATUS_PROMPT) { - // ????prompt_input???? - prompt_input += inputChar; - } - } - return false; -} - -void AsciiConvertionMode::startRegisteringWord() { - word_register_mode = new WordRegisterMode(*this,index); - word_register_mode->redisplay(); -} - -bool AsciiConvertionMode::handleBackSpace() { - if (word_register_mode) { - word_register_mode->handleBackSpace(); - return true; // WordRegisterMode::handleBackSpace()???????????????B - } - - if (status == STATUS_NULL) { - return false; - } - - if (status == STATUS_WHITE) { - // index?????????I? - // ??????index?????????B - if (index.length() == 0) { - parent->setEnabledAsciiConvertionMode(false); - parent->display(CppCFString()); - initialize(); - } - else { - completion_mode = false; // ??????????????[?????? - index.eraseLast(1); - } - } - else if (status == STATUS_BLACK) { - // ????????????????????B - // ????????I?? - CppCFString str_to_fix(candidates[current_candidate_index]); - str_to_fix.eraseLast(1); - - // ???? - sendCurrentCandidateToServerToRegister(); - - // ??? - parent->fix(str_to_fix); - parent->display(CppCFString()); - - parent->setEnabledAsciiConvertionMode(false); - initialize(); - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - // ???t????????????? - // ??????????????? - if (candidates_window_current_frame == 0) { - // ???????????? - current_candidate_index = show_cands_window_after_Nth_cand - 2; - - // ?????????? - closeCandidatesWindow(); - - status = STATUS_BLACK; - } - else { - goToPrevCandidatesFrame(); - } - } - else if (status == STATUS_PROMPT) { - // prompt_input???????????????B - if (prompt_input.length() > 0) { - prompt_input.eraseLast(1); - } - } - return true; -} - -bool AsciiConvertionMode::handleReturn() { - if (word_register_mode) { - word_register_mode->handleReturn(); - - if (word_register_mode) { - // handleReturn??wordRegistrationFinished??????word_register_mode????????? - word_register_mode->redisplay(); - } - - return true; // ??rue???? - } - - if (status == STATUS_PROMPT) { - switch (prompt_type) { - case PROMPT_DELETE_FROM_USER_DIC: { - // prompt_input?yes??????TATUS_WHITE???? - // ??????STATUS_BLACK???? - if (prompt_input == "yes") { - // ??- makeServerRemoveWord(); - - // STATUS_WHITE? - status = STATUS_WHITE; - } - else { - status = STATUS_BLACK; - } - } - break; - - default: - break; - } - return true; - } - - if (ClientConfiguration::sharedConfiguration().isSkkEggLikeNewline()) { - // skk-egglike-newline??????ｩ??????????????rue???? - - // ???? - parent->fix(getStringToFix()); - return true; - } - else { - return false; - } -} - -bool AsciiConvertionMode::handleArrow(int kind) { - if (word_register_mode) { - return word_register_mode->handleArrow(kind); // ??- } - - if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // ???? - sendCurrentCandidateToServerToRegister(); - - // ????????? - parent->fix(candidates[current_candidate_index]); - - if (status == STATUS_BLACK_WITH_WINDOW) { - // ?????????? - closeCandidatesWindow(); - } - } - - // ??????????????B - parent->setEnabledAsciiConvertionMode(false); - initialize(); - return false; -} - -bool AsciiConvertionMode::handleCg() { - if (word_register_mode) { - return word_register_mode->handleCg(); - } - - // ????????????handleCg????getStringToFix()?????????? - parent->getCurrentInputMode().handleCg(); - parent->getCurrentInputMode().getStringToFix(); - - if (status == STATUS_WHITE) { - // ???????????- parent->setEnabledAsciiConvertionMode(false); - initialize(); - } - else if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // okuri????STATUS_WHITE_ROOT?????????STATUS_WHITE_OKURI?? - // ????????????????? - if (status == STATUS_BLACK_WITH_WINDOW) { - closeCandidatesWindow(); - } - - status = STATUS_WHITE; - } - return true; -} - -bool AsciiConvertionMode::handleCy() { - if (word_register_mode) { - return word_register_mode->handleCy(); - } - else { - return false; - } -} - -bool AsciiConvertionMode::handleTab() { - if (word_register_mode) { - return word_register_mode->handleTab(); - } - - if (status == STATUS_WHITE) { - if (completion_mode) { - // ???????????????????B - current_completion_index++; - if (current_completion_index >= completions.size()) { - current_completion_index = 0; - } - index = completions[current_completion_index]; - } - else { - // ????????? - askServerTheCompletions(); - - // ?????????????????????????? - if (completions.size() > 0) { - completion_mode = true; - index = completions[0]; - } - } - return false; - } - - return false; -} - -void AsciiConvertionMode::terminate() { - if (word_register_mode) { - word_register_mode->terminate(); - } - - parent->fix(this->getStringToFix()); // ???? - parent->setEnabledAsciiConvertionMode(false); - initialize(); -} - -void AsciiConvertionMode::wordRegistrationFinished() { - if (word_register_mode) { - CppCFString content = word_register_mode->getContent(); - if (content.length() > 0) { - // ???? - sendWordToServerToRegister(index,content); - - // ?? - parent->fix(content); - - // ??- parent->setEnabledAsciiConvertionMode(false); - initialize(); - } - else { - status = STATUS_WHITE; - } - - delete word_register_mode; - word_register_mode = NULL; - parent->updatePencilMenuIcon(); - } -} - -void AsciiConvertionMode::wordRegistrationCanceled() { - delete word_register_mode; - word_register_mode = NULL; - parent->updatePencilMenuIcon(); - - if (status == STATUS_WHITE) { - // do nothing - } - else if (status == STATUS_BLACK) { - current_candidate_index = candidates.size() - 1; // ??????? - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - // ???????????????????- current_candidate_index = show_cands_window_after_Nth_cand - 1; // goToNextCandidatesFrame()????? - openCandidatesWindow(); - for (unsigned i = 1;i < candidates_window_num_of_frames;i++) { - goToNextCandidatesFrame(); - } - } -} - -CppCFString AsciiConvertionMode::getStringToDisplay() { - if (word_register_mode) { - // ?????????????WordRegisterMode??????????????? - return CppCFString().append(kIgnoreThis); - } - - if (status == STATUS_WHITE) { - // ?index - return CppCFString().append(0x25bd).append(index); - } - else if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // ?????? - return CppCFString().append(0x25bc).append(candidates[current_candidate_index]); - } - else if (status == STATUS_PROMPT) { - // [?????][??] - return CppCFString('[').append(prompt).append("][").append(prompt_input).append(kCaret).append(']'); - } - else { - return CppCFString().append(kIgnoreThis); - } -} - -CppCFString AsciiConvertionMode::getStringToFix() { - CppCFString result; - if (status == STATUS_WHITE) { - result = index; - } - else if (status == STATUS_BLACK) { - result = candidates[current_candidate_index]; - - // ???? - sendCurrentCandidateToServerToRegister(); - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - result = candidates[current_candidate_index]; - - // ???? - sendCurrentCandidateToServerToRegister(); - - // ?????????? - closeCandidatesWindow(); - } - else /* if (status == STATUS_NULL) */ { - result = CppCFString().append(kIgnoreThis); - } - - // ?????????????fix??????????????????????B - // ?????B - parent->setEnabledAsciiConvertionMode(false); - initialize(); - - return result; -} - -void AsciiConvertionMode::initialize() { - status = STATUS_NULL; - index.clear(); - candidates.clear(); - current_candidate_index = 0; - completion_mode = false; - completions.clear(); - current_completion_index = 0; -} - -void AsciiConvertionMode::askServerTheCandidates() { - // ahya???-ahya - CppCFData query; - query.own(CppCFString().append('-').append(index).toCFData()); - - current_candidate_index = 0; - ::askServerTheCandidates(query,candidates); -} - -void AsciiConvertionMode::askServerTheCompletions() { - // ????? - CppCFData cfdata_query; - cfdata_query.own(index.toCFData()); - - current_completion_index = 0; - ::askServerTheCompletions(cfdata_query,completions); -} - -void AsciiConvertionMode::sendCurrentCandidateToServerToRegister() { - // ???? - sendWordToServerToRegister(index,candidates[current_candidate_index]); -} - -void AsciiConvertionMode::makeServerRemoveWord() { - CppCFString query; - // ahya ??欲????-ahya ??欲? - query.append('-').append(index).append(' ').append(candidates[current_candidate_index]); - - // ???? - CppCFData cfdata_query; - cfdata_query.own(query.toCFData()); - ::makeServerRemoveWord(cfdata_query); -} - -void AsciiConvertionMode::openCandidatesWindow() { - // candidates?4???????????????? - //vector cands(candidates.begin()+(show_cands_window_after_Nth_cand-1),candidates.end()); - CppCFString space(" "); - CppCFString nbsp("[20]"); - vector cands; - for (vector::const_iterator ite = - candidates.begin() + (show_cands_window_after_Nth_cand-1); - ite != candidates.end(); - ite++) { - cands.push_back(ite->replaceClone(space,nbsp)); - } - - ::openCandidatesWindow(join(' ',cands), - candidates_window_id, - candidates_window_cands_per_frame, - candidates_window_num_of_frames); - candidates_window_current_frame = 0; -} - - -void AsciiConvertionMode::goToNextCandidatesFrame() { - // ?????ID(UInt16)???CFData?????????? - ServerConnectionFactory::sharedFactory().newConnection().send( - kSKKCandidatesWindowNext, - newCFDataRefWithWindowID(candidates_window_id)); - - // ????????????????? - candidates_window_current_frame++; - - // ???????????????????????? - current_candidate_index += candidates_window_cands_per_frame; -} - -void AsciiConvertionMode::goToPrevCandidatesFrame() { - // ?????ID(UInt16)???CFData?????????? - ServerConnectionFactory::sharedFactory().newConnection().send( - kSKKCandidatesWindowPrev, - newCFDataRefWithWindowID(candidates_window_id)); - - // ???????????????? - candidates_window_current_frame--; - - // ???????????????????????? - current_candidate_index -= candidates_window_cands_per_frame; -} - -void AsciiConvertionMode::closeCandidatesWindow() { - // ?????ID(UInt16)???CFData?????????? - ServerConnectionFactory::sharedFactory().newConnection().send( - kSKKCloseCandidatesWindow, - newCFDataRefWithWindowID(candidates_window_id)); -} - Index: sandbox/AquaSKK/AsciiConvertionMode.h diff -u sandbox/AquaSKK/AsciiConvertionMode.h:1.1.1.1 sandbox/AquaSKK/AsciiConvertionMode.h:removed --- sandbox/AquaSKK/AsciiConvertionMode.h:1.1.1.1 Sun Jul 17 18:09:03 2005 +++ sandbox/AquaSKK/AsciiConvertionMode.h Sun Jul 17 18:50:51 2005 @@ -1,99 +0,0 @@ -/* - $Id: AsciiConvertionMode.h,v 1.1.1.1 2005/07/17 09:09:03 t-suwa Exp $ - --------- - - MacOS X implementation of the SKK input method. - Copyright (C) 2002 phonohawk - - 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 - the Free Software Foundation; either version 2 of the License, or - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ -#pragma once -#include -#include -#include "CppCFString.h" -#include "BIM.h" -#include "InputMode.h" -#include "ChildInputMode.h" -#include "RegistrationStarter.h" -using namespace std; - -class AsciiConvertionMode : public ChildInputMode , public RegistrationStarter -{ - protected: - static const int STATUS_NULL = 0; // ??????????????????B?????????? - static const int STATUS_WHITE = 1; // ???? - static const int STATUS_BLACK = 2; // ???? - static const int STATUS_BLACK_WITH_WINDOW = 3; // ?????????????????????? - static const int STATUS_PROMPT = 4; // ???????????B - - class WordRegisterMode* word_register_mode; // NULL????????????????? - - int status; - CppCFString index; // ????- - static const int PROMPT_DELETE_FROM_USER_DIC = 1; // ????ｫ???P????- int prompt_type; // ????????? - CppCFString prompt; // ????? - CppCFString prompt_input; // ?????????????????? - - vector candidates; // ????? - unsigned current_candidate_index; // ??????? - - unsigned show_cands_window_after_Nth_cand; // ????????????????????ｦ???? - - unsigned candidates_window_id; // status?STATUS_BLACK_WITH_WINDOW??????????????ID? - unsigned candidates_window_current_frame; // ????????????????? - unsigned candidates_window_cands_per_frame; // ??????????1??????????? - unsigned candidates_window_num_of_frames; // ??????????????? - - bool completion_mode; // ???????[????????????????????????????? - vector completions; // ????? - unsigned current_completion_index; // ?????????? - - bool henkanModeStatus; - - virtual void startRegisteringWord(); - virtual void askServerTheCandidates(); - virtual void askServerTheCompletions(); - virtual void makeServerRemoveWord(); - virtual void sendCurrentCandidateToServerToRegister(); - virtual void openCandidatesWindow(); - virtual void goToPrevCandidatesFrame(); - virtual void goToNextCandidatesFrame(); - virtual void closeCandidatesWindow(); - virtual void initialize(); - - public: - AsciiConvertionMode(class ParentInputMode& parent); - virtual ~AsciiConvertionMode(); - - virtual void start(); // ???????????????? - virtual bool handleInput(unsigned char inputChar); - virtual bool handleBackSpace(); - virtual bool handleReturn(); - virtual bool handleArrow(int kind); - virtual bool handleCg(); - virtual bool handleCy(); - virtual bool handleTab(); - virtual void terminate(); - virtual CppCFString getStringToDisplay(); - virtual CppCFString getStringToFix(); - - virtual void wordRegistrationFinished(); // WordRegisterMode??? - virtual void wordRegistrationCanceled(); // WordRegisterMode??? - - private: - bool handleInputChar(unsigned char inputChar); -}; From t-suwa ＠ users.sourceforge.jp Sun Jul 17 18:55:08 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 18:55:08 +0900 Subject: [aquaskk-changes 7] CVS update: sandbox/AquaSKK/Icons Message-ID: <20050717095508.405FB2AC021@users.sourceforge.jp> Index: sandbox/AquaSKK/Icons/._AquaSKK-FullRoman.tif Index: sandbox/AquaSKK/Icons/._AquaSKK-HalfKatakana.tif Index: sandbox/AquaSKK/Icons/._AquaSKK-Hirakana.tif Index: sandbox/AquaSKK/Icons/._AquaSKK-Katakana.tif Index: sandbox/AquaSKK/Icons/._AquaSKK-Roman.tif Index: sandbox/AquaSKK/Icons/._AquaSKK.psd From t-suwa ＠ users.sourceforge.jp Sun Jul 17 18:55:08 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 18:55:08 +0900 Subject: [aquaskk-changes 8] CVS update: sandbox/AquaSKK/Japanese.lproj Message-ID: <20050717095508.7D8D22AC038@users.sourceforge.jp> Index: sandbox/AquaSKK/Japanese.lproj/._Menu.nib From t-suwa ＠ users.sourceforge.jp Sun Jul 17 19:17:47 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 19:17:47 +0900 Subject: [aquaskk-changes 9] CVS update: sandbox/AquaSKK Message-ID: <20050717101747.8D3C12AC021@users.sourceforge.jp> Index: sandbox/AquaSKK/CandidatesFrame.h diff -u sandbox/AquaSKK/CandidatesFrame.h:1.1.1.1 sandbox/AquaSKK/CandidatesFrame.h:1.2 --- sandbox/AquaSKK/CandidatesFrame.h:1.1.1.1 Sun Jul 17 18:20:17 2005 +++ sandbox/AquaSKK/CandidatesFrame.h Sun Jul 17 19:17:47 2005 @@ -1,4 +1,22 @@ -// -*- mode: ObjC; -*- +/* $Id: CandidatesFrame.h,v 1.2 2005/07/17 10:17:47 t-suwa Exp $ + + MacOS X implementation of the SKK input method. + Copyright (C) 2002-2004 phonohawk + + 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ #import Index: sandbox/AquaSKK/CandidatesFrame.m diff -u sandbox/AquaSKK/CandidatesFrame.m:1.1.1.1 sandbox/AquaSKK/CandidatesFrame.m:1.2 --- sandbox/AquaSKK/CandidatesFrame.m:1.1.1.1 Sun Jul 17 18:20:17 2005 +++ sandbox/AquaSKK/CandidatesFrame.m Sun Jul 17 19:17:47 2005 @@ -1,4 +1,22 @@ -// -*- mode: ObjC; -*- +/* $Id: CandidatesFrame.m,v 1.2 2005/07/17 10:17:47 t-suwa Exp $ + + MacOS X implementation of the SKK input method. + Copyright (C) 2002-2004 phonohawk + + 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ #import "CandidatesFrame.h" From t-suwa ＠ users.sourceforge.jp Sun Jul 17 19:34:46 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 19:34:46 +0900 Subject: [aquaskk-changes 10] CVS update: AquaSKK Message-ID: <20050717103446.B47242AC021@users.sourceforge.jp> From t-suwa ＠ users.sourceforge.jp Sun Jul 17 19:50:33 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 19:50:33 +0900 Subject: [aquaskk-changes 11] CVS update: AquaSKK Message-ID: <20050717105033.8B4D52AC039@users.sourceforge.jp> From t-suwa ＠ users.sourceforge.jp Sun Jul 17 19:53:06 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 17 Jul 2005 19:53:06 +0900 Subject: [aquaskk-changes 12] CVS update: AquaSKK Message-ID: <20050717105306.0D0E22AC039@users.sourceforge.jp> Index: AquaSKK/AsciiConvertionMode.cpp diff -u AquaSKK/AsciiConvertionMode.cpp:1.1.1.1 AquaSKK/AsciiConvertionMode.cpp:removed --- AquaSKK/AsciiConvertionMode.cpp:1.1.1.1 Sun Jul 17 19:34:41 2005 +++ AquaSKK/AsciiConvertionMode.cpp Sun Jul 17 19:53:05 2005 @@ -1,706 +0,0 @@ -/* $Id: AsciiConvertionMode.cpp,v 1.1.1.1 2005/07/17 10:34:41 t-suwa Exp $ - - MacOS X implementation of the SKK input method. - Copyright (C) 2002-2004 phonohawk - - 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 - the Free Software Foundation; either version 2 of the License, or - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ -#include "AsciiConvertionMode.h" -#include "BIMInputEvents.h" -#include "HiraganaInputMode.h" -#include "ParentInputMode.h" -#include "CppCFData.h" -#include "WordRegisterMode.h" -#include "ServerConnectionFactory.h" -#include "KanjiConversionMode.h" // KanjiConversionMode????????????? -#include "ClientConfiguration.h" -#include "SkkConfig.h" - -AsciiConvertionMode::AsciiConvertionMode(ParentInputMode& parent) - :ChildInputMode(parent), - word_register_mode(NULL), - status(STATUS_NULL), - show_cands_window_after_Nth_cand(5), - completion_mode(false), - henkanModeStatus(false) { - -} - -AsciiConvertionMode::~AsciiConvertionMode() { - if (word_register_mode) { - delete word_register_mode; - } -} - -void AsciiConvertionMode::start() { - status = STATUS_WHITE; -} - -bool AsciiConvertionMode::handleInput(unsigned char inputChar) { - bool result = handleInputChar(inputChar); - henkanModeStatus = !result; - - return result; -} - -bool AsciiConvertionMode::handleInputChar(unsigned char inputChar) { - if (word_register_mode) { - word_register_mode->handleInput(inputChar); - return false; // WordRegisterMode::handleInput()??????????????? - } - - if (SkkConfig::config().isAbbrevNextKey(inputChar)) { - if (status == STATUS_WHITE && completion_mode) { - // ???????????????????B - current_completion_index++; - if (current_completion_index >= completions.size()) { - current_completion_index = 0; - } - index = completions[current_completion_index]; - return false; - } - } - - if (SkkConfig::config().isAbbrevPrevKey(inputChar)) { - if (status == STATUS_WHITE && completion_mode) { - // ??????????s????????? - if (current_completion_index == 0) { - current_completion_index = completions.size() - 1; - } - else { - current_completion_index--; - } - index = completions[current_completion_index]; - return false; - } - } - - // tab,????,????????????????????????????? - completion_mode = false; - - if (SkkConfig::config().isToggleKanaKey(inputChar)) { - if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // ????????? - // 1) ????????????????? - // 2) ????????????? - - parent->setEnabledKanjiMode(false); - if (parent->isHiraganaInputMode()) { - parent->goZenKataInputMode(); - } - else { - parent->goHiraganaInputMode(); - } - return true; - } - } - - if (SkkConfig::config().isPrevKouhoKey(inputChar)) { - if (status == STATUS_BLACK) { - // ???????????????????[????? - if (current_candidate_index > 0) { - current_candidate_index--; - } - else { - status = STATUS_WHITE; - } - return false; - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - // delete??????????? - handleBackSpace(); - return false; - } - // ????????? - } - - if (SkkConfig::config().isPurgeFromJisyoKey(inputChar)) { - if (status == STATUS_BLACK) { - // ??v???????B?????ﾀ?????ｫ??????????????- // ?????????????????????????????? - status = STATUS_PROMPT; - prompt_type = PROMPT_DELETE_FROM_USER_DIC; - prompt_input.clear(); - prompt.clear().append(0x672c).append(0x5f53).append(0x306b).append(' '); - prompt.append('/').append(index).append('/'); - prompt.append(candidates[current_candidate_index]).append("/ "); - prompt.append(0x3092).append(0x524a).append(0x9664).append(0x3057).append(0x3066). - append(0x3082).append(0x5b9c).append(0x3057).append(0x3044).append(0x3067). - append(0x3059).append(0x304b).append(0xff1f).append("(yes/no)"); - return false; - } - } - - if (SkkConfig::config().isToggleKatakanaKey(inputChar)) { - if (status == STATUS_WHITE) { - // ????????????????????????- parent->fix(ZenAscInputMode::convert(index)); - - parent->setEnabledAsciiConvertionMode(false); - initialize(); - - return false; - } - if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // ????????????? - // 1) ????????????????? - // 2) ????????????????? - - parent->setEnabledAsciiConvertionMode(false); - if (parent->isHanKataInputMode()) { - parent->goHiraganaInputMode(); - } - else { - parent->goHanKataInputMode(); - } - return true; - } - } - - if (SkkConfig::config().isKakuteiKey(inputChar)) { - return true; // ???? - } - - if (SkkConfig::config().isLatinModeKey(inputChar) - || SkkConfig::config().isJisx0208LatinModeKey(inputChar)) { - if (status == STATUS_BLACK) { - // ???????????/?????????? - if (SkkConfig::config().isLatinModeKey(inputChar)) { - parent->goHanAscInputMode(); - } - else { - parent->goZenAscInputMode(); - } - return true; - } - // ????????????????? - } - - if (SkkConfig::config().isAbbrevModeKey(inputChar)) { - if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - parent->fix(this->getStringToFix()); - parent->handleInput(inputChar); - return false; - } - } - - if (SkkConfig::config().isNextKouhoKey(inputChar)) { - if (status == STATUS_WHITE) { - if (index.length() == 0) { - // ??- parent->setEnabledAsciiConvertionMode(false); - parent->display(CppCFString()); - initialize(); - return false; - } - - // ??????? - askServerTheCandidates(); - - if (candidates.size() > 0) { - // ?????????????? - status = STATUS_BLACK; - current_candidate_index = 0; // ?????B - } - else { - // ???????????????? - startRegisteringWord(); - } - } - else if (status == STATUS_BLACK) { - // ????? - current_candidate_index++; - - if (current_candidate_index >= candidates.size()) { // ?????s?????????? - startRegisteringWord(); - } - else if (current_candidate_index >= show_cands_window_after_Nth_cand - 1) { - // ????????????????????????ｦ??? - status = STATUS_BLACK_WITH_WINDOW; - openCandidatesWindow(); - } - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - if (candidates_window_current_frame < candidates_window_num_of_frames - 1) { - // ??????????????????????? - goToNextCandidatesFrame(); - } - else { - // ???????????????????? - closeCandidatesWindow(); - startRegisteringWord(); - } - } - } - else { - if (status == STATUS_WHITE) { - // index?????? - index += inputChar; - } - else if (status == STATUS_BLACK) { - // ?????????????????I????? - // ???????ｦ/fix???????????? - // ?????????????????arent?handleInput???? - // AsciiConvertionMode?STATUS_NULL???? - // ??IgnoreThis???? - - // ???? - sendCurrentCandidateToServerToRegister(); - - // ?????????????????? - parent->fix(candidates[current_candidate_index]); - - parent->setEnabledAsciiConvertionMode(false); - initialize(); - - parent->handleInput(inputChar); - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - // asdfjkl?1????????????7????????????B???????? - // ???????????? - // ???????????????????? - int cand_index = CppCFString("asdfjkl").substring(0,candidates_window_cands_per_frame).indexOf(inputChar); - if (cand_index != -1) { - unsigned new_index = current_candidate_index + cand_index; - if (new_index < candidates.size()) { - // ??????????????????? - current_candidate_index = new_index; - return true; - } - } - return false; - } - else if (status == STATUS_PROMPT) { - // ????prompt_input???? - prompt_input += inputChar; - } - } - return false; -} - -void AsciiConvertionMode::startRegisteringWord() { - word_register_mode = new WordRegisterMode(*this,index); - word_register_mode->redisplay(); -} - -bool AsciiConvertionMode::handleBackSpace() { - if (word_register_mode) { - word_register_mode->handleBackSpace(); - return true; // WordRegisterMode::handleBackSpace()???????????????B - } - - if (status == STATUS_NULL) { - return false; - } - - if (status == STATUS_WHITE) { - // index?????????I? - // ??????index?????????B - if (index.length() == 0) { - parent->setEnabledAsciiConvertionMode(false); - parent->display(CppCFString()); - initialize(); - } - else { - completion_mode = false; // ??????????????[?????? - index.eraseLast(1); - } - } - else if (status == STATUS_BLACK) { - // ????????????????????B - // ????????I?? - CppCFString str_to_fix(candidates[current_candidate_index]); - str_to_fix.eraseLast(1); - - // ???? - sendCurrentCandidateToServerToRegister(); - - // ??? - parent->fix(str_to_fix); - parent->display(CppCFString()); - - parent->setEnabledAsciiConvertionMode(false); - initialize(); - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - // ???t????????????? - // ??????????????? - if (candidates_window_current_frame == 0) { - // ???????????? - current_candidate_index = show_cands_window_after_Nth_cand - 2; - - // ?????????? - closeCandidatesWindow(); - - status = STATUS_BLACK; - } - else { - goToPrevCandidatesFrame(); - } - } - else if (status == STATUS_PROMPT) { - // prompt_input???????????????B - if (prompt_input.length() > 0) { - prompt_input.eraseLast(1); - } - } - return true; -} - -bool AsciiConvertionMode::handleReturn() { - if (word_register_mode) { - word_register_mode->handleReturn(); - - if (word_register_mode) { - // handleReturn??wordRegistrationFinished??????word_register_mode????????? - word_register_mode->redisplay(); - } - - return true; // ??rue???? - } - - if (status == STATUS_PROMPT) { - switch (prompt_type) { - case PROMPT_DELETE_FROM_USER_DIC: { - // prompt_input?yes??????TATUS_WHITE???? - // ??????STATUS_BLACK???? - if (prompt_input == "yes") { - // ??- makeServerRemoveWord(); - - // STATUS_WHITE? - status = STATUS_WHITE; - } - else { - status = STATUS_BLACK; - } - } - break; - - default: - break; - } - return true; - } - - if (ClientConfiguration::sharedConfiguration().isSkkEggLikeNewline()) { - // skk-egglike-newline??????ｩ??????????????rue???? - - // ???? - parent->fix(getStringToFix()); - return true; - } - else { - return false; - } -} - -bool AsciiConvertionMode::handleArrow(int kind) { - if (word_register_mode) { - return word_register_mode->handleArrow(kind); // ??- } - - if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // ???? - sendCurrentCandidateToServerToRegister(); - - // ????????? - parent->fix(candidates[current_candidate_index]); - - if (status == STATUS_BLACK_WITH_WINDOW) { - // ?????????? - closeCandidatesWindow(); - } - } - - // ??????????????B - parent->setEnabledAsciiConvertionMode(false); - initialize(); - return false; -} - -bool AsciiConvertionMode::handleCg() { - if (word_register_mode) { - return word_register_mode->handleCg(); - } - - // ????????????handleCg????getStringToFix()?????????? - parent->getCurrentInputMode().handleCg(); - parent->getCurrentInputMode().getStringToFix(); - - if (status == STATUS_WHITE) { - // ???????????- parent->setEnabledAsciiConvertionMode(false); - initialize(); - } - else if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // okuri????STATUS_WHITE_ROOT?????????STATUS_WHITE_OKURI?? - // ????????????????? - if (status == STATUS_BLACK_WITH_WINDOW) { - closeCandidatesWindow(); - } - - status = STATUS_WHITE; - } - return true; -} - -bool AsciiConvertionMode::handleCy() { - if (word_register_mode) { - return word_register_mode->handleCy(); - } - else { - return false; - } -} - -bool AsciiConvertionMode::handleTab() { - if (word_register_mode) { - return word_register_mode->handleTab(); - } - - if (status == STATUS_WHITE) { - if (completion_mode) { - // ???????????????????B - current_completion_index++; - if (current_completion_index >= completions.size()) { - current_completion_index = 0; - } - index = completions[current_completion_index]; - } - else { - // ????????? - askServerTheCompletions(); - - // ?????????????????????????? - if (completions.size() > 0) { - completion_mode = true; - index = completions[0]; - } - } - return false; - } - - return false; -} - -void AsciiConvertionMode::terminate() { - if (word_register_mode) { - word_register_mode->terminate(); - } - - parent->fix(this->getStringToFix()); // ???? - parent->setEnabledAsciiConvertionMode(false); - initialize(); -} - -void AsciiConvertionMode::wordRegistrationFinished() { - if (word_register_mode) { - CppCFString content = word_register_mode->getContent(); - if (content.length() > 0) { - // ???? - sendWordToServerToRegister(index,content); - - // ?? - parent->fix(content); - - // ??- parent->setEnabledAsciiConvertionMode(false); - initialize(); - } - else { - status = STATUS_WHITE; - } - - delete word_register_mode; - word_register_mode = NULL; - parent->updatePencilMenuIcon(); - } -} - -void AsciiConvertionMode::wordRegistrationCanceled() { - delete word_register_mode; - word_register_mode = NULL; - parent->updatePencilMenuIcon(); - - if (status == STATUS_WHITE) { - // do nothing - } - else if (status == STATUS_BLACK) { - current_candidate_index = candidates.size() - 1; // ??????? - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - // ???????????????????- current_candidate_index = show_cands_window_after_Nth_cand - 1; // goToNextCandidatesFrame()????? - openCandidatesWindow(); - for (unsigned i = 1;i < candidates_window_num_of_frames;i++) { - goToNextCandidatesFrame(); - } - } -} - -CppCFString AsciiConvertionMode::getStringToDisplay() { - if (word_register_mode) { - // ?????????????WordRegisterMode??????????????? - return CppCFString().append(kIgnoreThis); - } - - if (status == STATUS_WHITE) { - // ?index - return CppCFString().append(0x25bd).append(index); - } - else if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - // ?????? - return CppCFString().append(0x25bc).append(candidates[current_candidate_index]); - } - else if (status == STATUS_PROMPT) { - // [?????][??] - return CppCFString('[').append(prompt).append("][").append(prompt_input).append(kCaret).append(']'); - } - else { - return CppCFString().append(kIgnoreThis); - } -} - -CppCFString AsciiConvertionMode::getStringToFix() { - CppCFString result; - if (status == STATUS_WHITE) { - result = index; - } - else if (status == STATUS_BLACK) { - result = candidates[current_candidate_index]; - - // ???? - sendCurrentCandidateToServerToRegister(); - } - else if (status == STATUS_BLACK_WITH_WINDOW) { - result = candidates[current_candidate_index]; - - // ???? - sendCurrentCandidateToServerToRegister(); - - // ?????????? - closeCandidatesWindow(); - } - else /* if (status == STATUS_NULL) */ { - result = CppCFString().append(kIgnoreThis); - } - - // ?????????????fix??????????????????????B - // ?????B - parent->setEnabledAsciiConvertionMode(false); - initialize(); - - return result; -} - -void AsciiConvertionMode::initialize() { - status = STATUS_NULL; - index.clear(); - candidates.clear(); - current_candidate_index = 0; - completion_mode = false; - completions.clear(); - current_completion_index = 0; -} - -void AsciiConvertionMode::askServerTheCandidates() { - // ahya???-ahya - CppCFData query; - query.own(CppCFString().append('-').append(index).toCFData()); - - current_candidate_index = 0; - ::askServerTheCandidates(query,candidates); -} - -void AsciiConvertionMode::askServerTheCompletions() { - // ????? - CppCFData cfdata_query; - cfdata_query.own(index.toCFData()); - - current_completion_index = 0; - ::askServerTheCompletions(cfdata_query,completions); -} - -void AsciiConvertionMode::sendCurrentCandidateToServerToRegister() { - // ???? - sendWordToServerToRegister(index,candidates[current_candidate_index]); -} - -void AsciiConvertionMode::makeServerRemoveWord() { - CppCFString query; - // ahya ??欲????-ahya ??欲? - query.append('-').append(index).append(' ').append(candidates[current_candidate_index]); - - // ???? - CppCFData cfdata_query; - cfdata_query.own(query.toCFData()); - ::makeServerRemoveWord(cfdata_query); -} - -void AsciiConvertionMode::openCandidatesWindow() { - // candidates?4???????????????? - //vector cands(candidates.begin()+(show_cands_window_after_Nth_cand-1),candidates.end()); - CppCFString space(" "); - CppCFString nbsp("[20]"); - vector cands; - for (vector::const_iterator ite = - candidates.begin() + (show_cands_window_after_Nth_cand-1); - ite != candidates.end(); - ite++) { - cands.push_back(ite->replaceClone(space,nbsp)); - } - - ::openCandidatesWindow(join(' ',cands), - candidates_window_id, - candidates_window_cands_per_frame, - candidates_window_num_of_frames); - candidates_window_current_frame = 0; -} - - -void AsciiConvertionMode::goToNextCandidatesFrame() { - // ?????ID(UInt16)???CFData?????????? - ServerConnectionFactory::sharedFactory().newConnection().send( - kSKKCandidatesWindowNext, - newCFDataRefWithWindowID(candidates_window_id)); - - // ????????????????? - candidates_window_current_frame++; - - // ???????????????????????? - current_candidate_index += candidates_window_cands_per_frame; -} - -void AsciiConvertionMode::goToPrevCandidatesFrame() { - // ?????ID(UInt16)???CFData?????????? - ServerConnectionFactory::sharedFactory().newConnection().send( - kSKKCandidatesWindowPrev, - newCFDataRefWithWindowID(candidates_window_id)); - - // ???????????????? - candidates_window_current_frame--; - - // ???????????????????????? - current_candidate_index -= candidates_window_cands_per_frame; -} - -void AsciiConvertionMode::closeCandidatesWindow() { - // ?????ID(UInt16)???CFData?????????? - ServerConnectionFactory::sharedFactory().newConnection().send( - kSKKCloseCandidatesWindow, - newCFDataRefWithWindowID(candidates_window_id)); -} - Index: AquaSKK/AsciiConvertionMode.h diff -u AquaSKK/AsciiConvertionMode.h:1.1.1.1 AquaSKK/AsciiConvertionMode.h:removed --- AquaSKK/AsciiConvertionMode.h:1.1.1.1 Sun Jul 17 19:34:41 2005 +++ AquaSKK/AsciiConvertionMode.h Sun Jul 17 19:53:05 2005 @@ -1,99 +0,0 @@ -/* - $Id: AsciiConvertionMode.h,v 1.1.1.1 2005/07/17 10:34:41 t-suwa Exp $ - --------- - - MacOS X implementation of the SKK input method. - Copyright (C) 2002 phonohawk - - 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 - the Free Software Foundation; either version 2 of the License, or - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ -#pragma once -#include -#include -#include "CppCFString.h" -#include "BIM.h" -#include "InputMode.h" -#include "ChildInputMode.h" -#include "RegistrationStarter.h" -using namespace std; - -class AsciiConvertionMode : public ChildInputMode , public RegistrationStarter -{ - protected: - static const int STATUS_NULL = 0; // ??????????????????B?????????? - static const int STATUS_WHITE = 1; // ???? - static const int STATUS_BLACK = 2; // ???? - static const int STATUS_BLACK_WITH_WINDOW = 3; // ?????????????????????? - static const int STATUS_PROMPT = 4; // ???????????B - - class WordRegisterMode* word_register_mode; // NULL????????????????? - - int status; - CppCFString index; // ????- - static const int PROMPT_DELETE_FROM_USER_DIC = 1; // ????ｫ???P????- int prompt_type; // ????????? - CppCFString prompt; // ????? - CppCFString prompt_input; // ?????????????????? - - vector candidates; // ????? - unsigned current_candidate_index; // ??????? - - unsigned show_cands_window_after_Nth_cand; // ????????????????????ｦ???? - - unsigned candidates_window_id; // status?STATUS_BLACK_WITH_WINDOW??????????????ID? - unsigned candidates_window_current_frame; // ????????????????? - unsigned candidates_window_cands_per_frame; // ??????????1??????????? - unsigned candidates_window_num_of_frames; // ??????????????? - - bool completion_mode; // ???????[????????????????????????????? - vector completions; // ????? - unsigned current_completion_index; // ?????????? - - bool henkanModeStatus; - - virtual void startRegisteringWord(); - virtual void askServerTheCandidates(); - virtual void askServerTheCompletions(); - virtual void makeServerRemoveWord(); - virtual void sendCurrentCandidateToServerToRegister(); - virtual void openCandidatesWindow(); - virtual void goToPrevCandidatesFrame(); - virtual void goToNextCandidatesFrame(); - virtual void closeCandidatesWindow(); - virtual void initialize(); - - public: - AsciiConvertionMode(class ParentInputMode& parent); - virtual ~AsciiConvertionMode(); - - virtual void start(); // ???????????????? - virtual bool handleInput(unsigned char inputChar); - virtual bool handleBackSpace(); - virtual bool handleReturn(); - virtual bool handleArrow(int kind); - virtual bool handleCg(); - virtual bool handleCy(); - virtual bool handleTab(); - virtual void terminate(); - virtual CppCFString getStringToDisplay(); - virtual CppCFString getStringToFix(); - - virtual void wordRegistrationFinished(); // WordRegisterMode??? - virtual void wordRegistrationCanceled(); // WordRegisterMode??? - - private: - bool handleInputChar(unsigned char inputChar); -}; From t-suwa ＠ users.sourceforge.jp Mon Jul 18 17:50:29 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Mon, 18 Jul 2005 17:50:29 +0900 Subject: [aquaskk-changes 13] CVS update: AquaSKK/Package Message-ID: <20050718085029.6EF682AC022@users.sourceforge.jp> From t-suwa ＠ users.sourceforge.jp Mon Jul 18 19:44:16 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Mon, 18 Jul 2005 19:44:16 +0900 Subject: [aquaskk-changes 14] CVS update: AquaSKK/Package Message-ID: <20050718104416.E69112AC088@users.sourceforge.jp> Index: AquaSKK/Package/AquaSKK.pmproj Index: AquaSKK/Package/License.txt diff -u /dev/null AquaSKK/Package/License.txt:1.1 --- /dev/null Mon Jul 18 19:44:16 2005 +++ AquaSKK/Package/License.txt Mon Jul 18 19:44:16 2005 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Index: AquaSKK/Package/Makefile diff -u /dev/null AquaSKK/Package/Makefile:1.1 --- /dev/null Mon Jul 18 19:44:16 2005 +++ AquaSKK/Package/Makefile Mon Jul 18 19:44:16 2005 @@ -0,0 +1,15 @@ +# $Id: Makefile,v 1.1 2005/07/18 10:44:16 t-suwa Exp $ + +# +# Makefile for prepare contents +# + +TARGET = AquaSKKInputMethod.component +BUILD = ../build/Deployment +DEST = contents/Components + +all: + sudo rm -rf $(DEST) + sudo mkdir -p $(DEST) + sudo cp -r $(BUILD)/$(TARGET) $(DEST) + sudo chown -R root:admin $(DEST) Index: AquaSKK/Package/Welcome.rtf diff -u /dev/null AquaSKK/Package/Welcome.rtf:1.1 --- /dev/null Mon Jul 18 19:44:16 2005 +++ AquaSKK/Package/Welcome.rtf Mon Jul 18 19:44:16 2005 @@ -0,0 +1,42 @@ +{\rtf1\mac\ansicpg10001\cocoartf824\cocoasubrtf100 +{\fonttbl\f0\fnil\fcharset77 LucidaGrande;\f1\fswiss\fcharset77 Helvetica;\f2\fnil\fcharset78 HiraKakuPro-W3; +} +{\colortbl;\red255\green255\blue255;\red128\green89\blue200;} +{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}} +{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}} +\paperw11900\paperh16840\margl1440\margr1440\vieww12580\viewh10480\viewkind0 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\f0\fs36 \cf0 \kerning1\expnd-3\expndtw-14 +AquaSKK +\fs48 \kerning1\expnd0\expndtw0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f1\fs24 \cf0 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0 \cf0 AquaSKK +\f2 \'82\'cd +\f0 Mac OS X +\f2 \'97\'70\'82\'cc\'82\'a9\'82\'c8\'8a\'bf\'8e\'9a\'95\'cf\'8a\'b7\'83\'76\'83\'8d\'83\'4f\'83\'89\'83\'80\'82\'c5\'82\'b7\'81\'42\'91\'bd\'8b\'40\'94\'5c\'83\'47\'83\'66\'83\'42\'83\'5e +\f0 {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/software/emacs/emacs.html"}}{\fldrslt \cf2 GNU Emacs}} +\f2 \'82\'c5\'93\'ae\'8d\'ec\'82\'b7\'82\'e9 +\f0 {\field{\*\fldinst{HYPERLINK "http://openlab.jp/skk/index-j.html"}}{\fldrslt \cf2 SKK}} +\f2 \'82\'cc\'92\'b7\'8f\'8a\'82\'f0\'8c\'70\'8f\'b3\'82\'b5\'81\'41\'83\'56\'83\'93\'83\'76\'83\'8b\'82\'c5\'89\'f5\'93\'4b\'82\'c8\'93\'fa\'96\'7b\'8c\'ea\'93\'fc\'97\'cd\'8a\'c2\'8b\'ab\'82\'cc\'92\'f1\'8b\'9f\'82\'f0\'96\'da\'8e\'77\'82\'b5\'82\'dc\'82\'b7\'81\'42\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural +\cf0 \ +\'81\'a6\'92\'8d\'88\'d3\ +\pard\tx220\tx460\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li480\fi-480\ql\qnatural +\ls1\ilvl0 +\f0 \cf0 {\listtext \'a5 } +\f2 \'82\'b1\'82\'cc\'83\'70\'83\'62\'83\'50\'81\'5b\'83\'57\'82\'c9\'82\'cd\'8e\'ab\'8f\'91\'82\'aa\'8a\'dc\'82\'dc\'82\'ea\'82\'c4\'82\'a2\'82\'dc\'82\'b9\'82\'f1\'81\'42{\field{\*\fldinst{HYPERLINK "http://openlab.jp/skk/index-j.html"}}{\fldrslt +\f0 SKK Openlab}} +\f0 +\f2 \'82\'c5\'92\'f1\'8b\'9f\'82\'b3\'82\'ea\'82\'c4\'82\'a2\'82\'e9\'8e\'ab\'8f\'91\'82\'f0\'82\'b2\'97\'98\'97\'70\'89\'ba\'82\'b3\'82\'a2\'81\'42\ +\ls1\ilvl0 +\f0 {\listtext \'a5 }AquaSKK +\f2 \'82\'f0\'8a\'ae\'91\'53\'82\'c9\'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'8b\'82\'b7\'82\'e9\'82\'bd\'82\'df\'82\'c9\'82\'cd\'8a\'c7\'97\'9d\'8e\'d2\'8c\'a0\'8c\'c0\'82\'aa\'95\'4b\'97\'76\'82\'c5\'82\'b7\'81\'42\ +\ls1\ilvl0 +\f0 {\listtext \'a5 } +\f2 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'8b\'8c\'e3\'82\'c9\'81\'41\'8d\'c4\'93\'78\'83\'8d\'83\'4f\'83\'43\'83\'93\'82\'b5\'92\'bc\'82\'b7\'95\'4b\'97\'76\'82\'aa\'82\'a0\'82\'e8\'82\'dc\'82\'b7\'81\'42\ +} \ No newline at end of file From t-suwa ＠ users.sourceforge.jp Mon Jul 18 20:53:25 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Mon, 18 Jul 2005 20:53:25 +0900 Subject: [aquaskk-changes 15] CVS update: AquaSKK Message-ID: <20050718115325.95C4D2AC020@users.sourceforge.jp> Index: AquaSKK/BIMComponent.cpp diff -u AquaSKK/BIMComponent.cpp:1.1.1.2 AquaSKK/BIMComponent.cpp:1.2 --- AquaSKK/BIMComponent.cpp:1.1.1.2 Sun Jul 17 19:50:26 2005 +++ AquaSKK/BIMComponent.cpp Mon Jul 18 20:53:25 2005 @@ -1,5 +1,5 @@ /* - $Id: BIMComponent.cpp,v 1.1.1.2 2005/07/17 10:50:26 t-suwa Exp $ + $Id: BIMComponent.cpp,v 1.2 2005/07/18 11:53:25 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -216,7 +216,7 @@ case kCMGetTextServiceMenu: case kCMFixTextService: case kCMHidePaletteWindows: - case kCMCopyTextServiceInputModeList: + //case kCMCopyTextServiceInputModeList: case kCMSetTextServiceProperty: result = true; break; Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.1.1.2 AquaSKK/ChangeLog:1.2 --- AquaSKK/ChangeLog:1.1.1.2 Sun Jul 17 19:50:27 2005 +++ AquaSKK/ChangeLog Mon Jul 18 20:53:25 2005 @@ -1,3 +1,10 @@ +2005-07-18 Tomotaka SUWA + + * Info-AquaSKK*.plist: ?????? 2.0 ???B + + * BIMComponent.cpp (BIMCanDo): kCMCopyTextServiceInputModeList ?? + ??????????????????????B + 2005-07-16 Tomotaka SUWA * BIM.cpp (BIMSessionOpen): updatePencilMenuIcon() ???????? Index: AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist diff -u AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist:1.1.1.2 AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist:1.2 --- AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist:1.1.1.2 Sun Jul 17 19:50:28 2005 +++ AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist Mon Jul 18 20:53:25 2005 @@ -7,7 +7,7 @@ CFBundleExecutable AquaSKKInputMethod CFBundleGetInfoString - Copyright 息 2002-2003 phonohawk + Copyright 息 2002-2005 phonohawk CFBundleIconFile CFBundleIdentifier @@ -19,11 +19,11 @@ CFBundlePackageType thng CFBundleShortVersionString - AquaSKK #12 + AquaSKK 2.0 CFBundleSignature - ???? + CFBundleVersion - 1.0 + 2.0 CSResourcesFileMapped ComponentInputModeDict Index: AquaSKK/Info-AquaSKKServer__Upgraded_.plist diff -u AquaSKK/Info-AquaSKKServer__Upgraded_.plist:1.1.1.1 AquaSKK/Info-AquaSKKServer__Upgraded_.plist:1.2 --- AquaSKK/Info-AquaSKKServer__Upgraded_.plist:1.1.1.1 Sun Jul 17 19:34:42 2005 +++ AquaSKK/Info-AquaSKKServer__Upgraded_.plist Mon Jul 18 20:53:25 2005 @@ -7,7 +7,7 @@ CFBundleExecutable AquaSKKServer CFBundleGetInfoString - Copyright 息 2002-2003 phonohawk + Copyright 息 2002-2005 phonohawk CFBundleIconFile CFBundleIdentifier @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - AquaSKK #12 + AquaSKK 2.0 CFBundleSignature - ???? + CFBundleVersion - 1.0 + 2.0 NSMainNibFile Principal NSPrincipalClass From t-suwa ＠ users.sourceforge.jp Thu Jul 21 01:09:01 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Thu, 21 Jul 2005 01:09:01 +0900 Subject: [aquaskk-changes 16] CVS update: htdocs Message-ID: <20050720160901.5A8132AC030@users.sourceforge.jp> From t-suwa ＠ users.sourceforge.jp Thu Jul 21 16:50:16 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Thu, 21 Jul 2005 16:50:16 +0900 Subject: [aquaskk-changes 17] CVS update: htdocs Message-ID: <20050721165015.D18002AC018@users.sourceforge.jp> Index: htdocs/aquaskk.css diff -u htdocs/aquaskk.css:1.1.1.1 htdocs/aquaskk.css:1.2 --- htdocs/aquaskk.css:1.1.1.1 Thu Jul 21 01:08:56 2005 +++ htdocs/aquaskk.css Thu Jul 21 16:50:16 2005 @@ -1,16 +1,19 @@ + ＠ charset "EUC-JP"; + /* -? aquaskk.css ???? +$Id: aquaskk.css,v 1.2 2005/07/21 07:50:16 t-suwa Exp $ + +▼aquaskk.css について -http://namazu.org/~satoru/ ??????? satoru.css ????????? -??????ﾓ???? +http://namazu.org/~satoru/ で使われている satoru.css を流用しています。 +高林さんに感謝します。 */ - ＠ charset "shift_jis"; body { font-family: 'Lucida Sans Unicode', Verdana, - '?????? Pro W3', '??????3', + 'ヒラギノ角ゴ Pro W3', 'ヒラギノ角ゴ3', sans-serif; margin-right: 2em; margin-left: 2em; @@ -80,11 +83,12 @@ } p.last-modified { + /* padding-top: 1em; */ text-align: center; color: #ee7600; text-indent: 0em; font-size: smaller; - line-height: 0em; + /* line-height: 0em; */ } p.lang-navigator { @@ -133,7 +137,7 @@ } pre, code { - font-family: '??????3??', 'Lucida Console', 'Courier', + font-family: 'ヒラギノ角ゴ3等幅', 'Lucida Console', 'Courier', 'Courier New', monospace; } @@ -148,7 +152,7 @@ h1 { font-size: x-large; font-weight: normal; - font-family: '?????? Pro W3', '??????3', Verdana, serif; + font-family: 'ヒラギノ角ゴ Pro W3', 'ヒラギノ角ゴ3', Verdana, serif; padding: 0.4em 0.4em; line-height: 150%; } @@ -159,7 +163,7 @@ h2, h3, h4, h5, h6 { font-weight: normal; - font-family: '?????? Pro W6', '??????6', + font-family: 'ヒラギノ角ゴ Pro W6', 'ヒラギノ角ゴ6', 'Lucida Grande', Verdana, serif; } Index: htdocs/index.html diff -u htdocs/index.html:1.1.1.1 htdocs/index.html:1.2 --- htdocs/index.html:1.1.1.1 Thu Jul 21 01:08:56 2005 +++ htdocs/index.html Thu Jul 21 16:50:16 2005 @@ -55,7 +55,7 @@
-

最終更新日: 2005-07-18

+

$Date: 2005/07/21 07:50:16 $

Index: htdocs/screen_shot.html diff -u htdocs/screen_shot.html:1.1.1.1 htdocs/screen_shot.html:1.2 --- htdocs/screen_shot.html:1.1.1.1 Thu Jul 21 01:08:57 2005 +++ htdocs/screen_shot.html Thu Jul 21 16:50:16 2005 @@ -26,7 +26,7 @@
-

最終更新日: 2005-07-18

+

$Date: 2005/07/21 07:50:16 $

Index: htdocs/sidebar.js diff -u htdocs/sidebar.js:1.1.1.1 htdocs/sidebar.js:1.2 --- htdocs/sidebar.js:1.1.1.1 Thu Jul 21 01:08:57 2005 +++ htdocs/sidebar.js Thu Jul 21 16:50:16 2005 @@ -1,3 +1,5 @@ +/* $Id: sidebar.js,v 1.2 2005/07/21 07:50:16 t-suwa Exp $ */ + document.open(); document.writeln('

ダウンロード

'); document.writeln('
    '); From t-suwa ＠ users.sourceforge.jp Sun Jul 24 15:02:24 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 24 Jul 2005 15:02:24 +0900 Subject: [aquaskk-changes 18] CVS update: htdocs/images Message-ID: <20050724060224.124702AC01C@users.sourceforge.jp> Index: htdocs/images/dic_location.png Index: htdocs/images/inputmenu.png Index: htdocs/images/inputoption.png Index: htdocs/images/mini-dic_location.png Index: htdocs/images/mini-inputmenu.png Index: htdocs/images/mini-inputoption.png Index: htdocs/images/mini-langenv.png Index: htdocs/images/mini-package.png Index: htdocs/images/mini-system_pref.png Index: htdocs/images/open_pref.png Index: htdocs/images/package.png Index: htdocs/images/system_pref.png From t-suwa ＠ users.sourceforge.jp Sun Jul 24 15:12:35 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sun, 24 Jul 2005 15:12:35 +0900 Subject: [aquaskk-changes 19] CVS update: htdocs Message-ID: <20050724061235.23CB12AC01B@users.sourceforge.jp> Index: htdocs/aquaskk.css diff -u htdocs/aquaskk.css:1.2 htdocs/aquaskk.css:1.3 --- htdocs/aquaskk.css:1.2 Thu Jul 21 16:50:16 2005 +++ htdocs/aquaskk.css Sun Jul 24 15:12:35 2005 @@ -2,7 +2,7 @@ /* -$Id: aquaskk.css,v 1.2 2005/07/21 07:50:16 t-suwa Exp $ +$Id: aquaskk.css,v 1.3 2005/07/24 06:12:35 t-suwa Exp $ ▼aquaskk.css について @@ -15,8 +15,8 @@ font-family: 'Lucida Sans Unicode', Verdana, 'ヒラギノ角ゴ Pro W3', 'ヒラギノ角ゴ3', sans-serif; - margin-right: 2em; - margin-left: 2em; + margin-right: 1em; + margin-left: 1em; line-height: 150%; background-color: white; color: #111122; @@ -24,8 +24,8 @@ p { - margin-left: 0.5em; -/* text-indent: 1em; */ + margin-left: 2em; + text-indent: 1em; } .small { @@ -88,6 +88,7 @@ color: #ee7600; text-indent: 0em; font-size: smaller; + font-weight: bold; /* line-height: 0em; */ } @@ -136,6 +137,28 @@ padding: 0; } +blockquote.aquaskk { + color: black; + background-color: white; + border-width: 1px; + border-color: #a6a6a6; + font-family: 'ヒラギノ角ゴ3等幅', 'Lucida Console', 'Courier', + 'Courier New', monospace; + white-space: pre; + font-size: smaller; +} + +blockquote.candidate { + color: black; + background-color: #e6e6e6; + border-width: 1px; + border-color: #a6a6a6; + font-family: 'ヒラギノ角ゴ3等幅', 'Lucida Console', 'Courier', + 'Courier New', monospace; + white-space: pre; + font-size: smaller; +} + pre, code { font-family: 'ヒラギノ角ゴ3等幅', 'Lucida Console', 'Courier', 'Courier New', monospace; @@ -147,6 +170,7 @@ white-space: pre; width: 100%; overflow: auto; + margin-left: 4em; } h1 { @@ -158,6 +182,7 @@ } h2 { + clear: both; font-size: large; } @@ -237,8 +262,11 @@ border-width: 1px 2px 2px 1px; border-color: gray; font-family: monospace; - font-size: smaller; - margin: 1px; + /* font-size: small; */ + margin: 2px; + padding-left: 4px; + padding-right: 4px; + white-space: nowrap; } img { @@ -279,6 +307,13 @@ padding: 1em; } +img.mini { + border-style: solid; + border-width: 1px; + width: 256px; + padding: 0.5em; +} + a.navi { font-size: small; border-style: solid; @@ -408,6 +443,19 @@ color: #333344; } +span.label { + color: white; + background-color: #3875d7; +} + +span.you { + background-color: #e6e6fa; + padding-left: 3px; + padding-right: 3px; + margin: 2px; + /* text-shadow: #888888 3px 3px 3px; */ +} + div.ad { border: 0px; margin-left: 2em; @@ -453,6 +501,28 @@ clear: both; } +div.break p { + margin: 0.5em 0.5em 0em 1em; + line-height: 1.5em; +} + +div.break strong { + color: #27408b; +} + +div.break { + margin: 1em 1em 1em 8em; + padding: 0.5em; + /* border-style: none ridge groove none; */ + border-style: groove; + border-width: 1px; + border-color: #36648b; + margin-right: 2%; + font-size: smaller; + color: #333333; + background-color: #ddddff; +} + hr { clear: both; } Index: htdocs/aquaskk_pr.html diff -u /dev/null htdocs/aquaskk_pr.html:1.1 --- /dev/null Sun Jul 24 15:12:35 2005 +++ htdocs/aquaskk_pr.html Sun Jul 24 15:12:35 2005 @@ -0,0 +1,92 @@ + + + + + + + + +

    + +

    最初のKが大文字になっていますね。 + これは、ここから漢字変換を始めたいというあなたの想いを AquaSKK に伝える役目を果たします。 + 当然のことながら「今日」という変換をしたいのはあなたです。 + だからあなたは自らの意思に従い、大文字でKと入力するのです。

    + +

    そのままyouスペースで「今日」を確定したあなたは、続く「はとても」の部分について、一切変換する必要がないことを知っています。そこで、小文字のままhatotemoと入力します。

    + +

    期待通り、何の引っかかりもなく「はとても」が小気味良く確定されていきます。胸のすくような瞬間です。間違っても、「歯と手も」なんてうんざりするような誤変換を目にすることはありません。

    + +

    次はちょっと複雑です。「良い」という結果を得るためにまず、大文字でYと入力します。普通の感覚だとこれに続けてoiと入力し、スペースを叩きたくなるところですが、そこをぐっと我慢します。

    + +

    oを入力したあなたはおもむろに、シフトを押したままiへと指を伸ばします。言うまでもなく、大文字のIです。これは妙な違和感がありますね。入力したいのは「い」だからわざわざ変換する必要はありません。それなのになぜ大文字なんでしょうか。

    + +

    しばらくしてあなたは、「良い」の送り仮名が「い」であることに気付きます。そうです、「い」は送り仮名です。そして、変換中の大文字入力によって、送り仮名の開始位置を AquaSKK に教えることができるということもあなたは思い出すのです!

    + +

    「そんなもん知らねーっ!!!」という叫びがここまで聞こえてきそうです。気持は良くわかります。でも仕方がないのです。無駄な抵抗はやめましょう。AquaSKK は基本的に無能です。だから、あなたが頭を使わない限り、先に進むことはできないのです。

    + +

    無事に「良い」が確定されたのを確認したあなたは「天気」の変換に意識を集中し、 + Tenkiスペースと入力します。 + 最後にdesuと入力すると、可愛らしく「です」が確定されました。 + おめでとうございます。これで完成です。

    + +

    もちろんあなたは、一度もリターンを押さずに済んだことを知っていますよね?

    + +
    + 驚き最小の法則 + +

    SKK に代表される日本語入力方式は、ユーザがコントロールできる領域を広くすることで、より自然な入力を可能にします。大袈裟に言えば、かな漢字変換プログラムに奪われた「漢字変換の自由」を取り戻しているのです。

    + +

    制御不能な箇所を減らせば、突拍子もない「誤変換」に驚くことが減り、結果として入力スピードの向上へと繋がっていきます。

    +
    + +

    まとめ

    + +

    AquaSKK が万人向けでないことは確かです。

    + +

    でも、もし今の日本語入力環境に不満があるなら、AquaSKK + を試す価値はあります。運良く AquaSKK に馴染むことができれば、誤変換の回数はぐっと減り、文章の途中で立ち止まらずに入力できるようになるでしょう。思考の流れを分断せずに入力できる。この爽快な感覚を、一人でも多くの人に味わって欲しいと思います。

    + +

    とは言いながら、あまり AquaSKK に依存するというのも考えものです。世の中にはごく少数ですが、AquaSKK に深くのめり込み、一般的な日本語入力方式に戻れなくなってしまった人もいます。何事もほどほどに。

    + +

    さて、あなたならどんな日本語入力方式を「選択」しますか?

    + + + +
    + + +
    + + + Index: htdocs/index.html diff -u htdocs/index.html:1.2 htdocs/index.html:1.3 --- htdocs/index.html:1.2 Thu Jul 21 16:50:16 2005 +++ htdocs/index.html Sun Jul 24 15:12:35 2005 @@ -7,6 +7,7 @@ + +

    + +

    + +

    +

    その他のスクリーンショット...

    + +

    文書

    + + + +

    開発者向けリンク

    + +
    -

    $Date: 2005/07/21 07:50:16 $

    - +

    + +

    + + +

    次に、 + SKK OpenLab + の + 辞書アーカイブ + から、SKK-JISYO.L をダウンロードします。 + 辞書はどこでも好きな場所に置くことができますが、ここでは、

    + 
    ホーム/
+    ライブラリ/
+        Dictionaries/
+            SKK-JISYO.L
    +

    にあるものとして話を進めます。

    + +
    + SKK 辞書について +

    + SKK 辞書は、有志の方々により日々メンテナンスされています。 + L 辞書(SKK-JISYO.L)の編纂方針について知りたい、 + メンテナンスに協力したいという人は、 + SKK 辞書 Wiki + を参照して下さい。

    +
    + +

    AquaSKK のインストール

    + +

    パッケージの指示に従い、AquaSKK をインストールします。 + インストール完了後、再度ログインしたら「システム環境設定」を開き、 + 「言語環境」を選択します。

    + + + +

    「入力メニュー」に AquaSKK が追加されているので、チェックを付けます。 + もし AquaSKK が見つからない場合には、システムを再起動して下さい。

    + + + +

    必要に応じて以下のオプションも設定します。

    + + + +

    「メニューバーに入力メニューを表示」には、必ずチェックを付けて下さい。 + チェックがないと、AquaSKK がメニューバーに表示されません。

    + +

    辞書の設定

    + +

    動作を確認するために、テキストエディットを起動します。 + 入力メニューから「ひらかな」モードを選択するか、 + ⌘+スペースで + AquaSKK をアクティブにします。

    + +

    次に、入力メニューから「環境設定...」を選択して AquaSKK + の環境設定パネルを表示します。

    + + + +

    二つ目のテキストフィールドに、あらかじめダウンロードしておいた + SKK 辞書の場所を指定して下さい。

    + + + +

    環境設定パネルを閉じると、AquaSKK は指定された辞書を読み込みます。 + マシンスペックにもよりますが、おおよそ 30 + 秒以内で読み込みは完了するので、慌てずに待って下さい。

    + +

    これで AquaSKK を使う準備が整いました。

    + +

    動作の確認

    + +

    早速 AquaSKK の動作を確認してみます。 + AquaSKK が「ひらかな」モードになっていることを確認したら、 + + と入力します。最初の K は大文字で、以降は小文字にするのがポイントです。 + テキストエディットの表示は、以下のようになっているはずです。

    + + + +

    次に、スペースを押して変換します。

    + + + +

    「漢字」以外の文字が表示される場合もありますが、 + 今は気にせず、スペースを何度か押してみて下さい。 + そのうちに、以下のような変換候補ウィンドウが表示されます。

    + + + +

    ハイライトされている A, S, D, F, J, K, L は、 + 変換候補を選択するための文字です。 + ここでは試しにfを押してみます。

    + + + +

    ちゃんと確定されたでしょうか? + 以上で動作確認は終了です。お疲れ様でした。

    + +
    + +
    + + +
    + + + Index: htdocs/screen_shot.html diff -u htdocs/screen_shot.html:1.2 htdocs/screen_shot.html:1.3 --- htdocs/screen_shot.html:1.2 Thu Jul 21 16:50:16 2005 +++ htdocs/screen_shot.html Sun Jul 24 15:12:35 2005 @@ -7,27 +7,35 @@ + +

    +

    + +

    -

    $Date: 2005/07/21 07:50:16 $

    - + +

    + +

    + AquaSKK プロジェクト::迷っている人へ @@ -84,7 +84,7 @@
    - +
    Index: htdocs/index.html diff -u htdocs/index.html:1.3 htdocs/index.html:1.4 --- htdocs/index.html:1.3 Sun Jul 24 15:12:35 2005 +++ htdocs/index.html Tue Jul 26 00:16:54 2005 @@ -7,7 +7,7 @@ - AquaSKK プロジェクト @@ -29,6 +29,8 @@ AquaSKK プロジェクトページ を参照して下さい。

    +
    +

    スクリーンショット

    @@ -62,10 +64,10 @@

    -
    Index: htdocs/install_and_settings.html diff -u htdocs/install_and_settings.html:1.1 htdocs/install_and_settings.html:1.2 --- htdocs/install_and_settings.html:1.1 Sun Jul 24 15:12:35 2005 +++ htdocs/install_and_settings.html Tue Jul 26 00:16:54 2005 @@ -7,7 +7,7 @@ - AquaSKK プロジェクト::インストールと初期設定 @@ -140,7 +140,7 @@
    - +
    Index: htdocs/screen_shot.html diff -u htdocs/screen_shot.html:1.3 htdocs/screen_shot.html:1.4 --- htdocs/screen_shot.html:1.3 Sun Jul 24 15:12:35 2005 +++ htdocs/screen_shot.html Tue Jul 26 00:16:54 2005 @@ -7,7 +7,7 @@ - AquaSKK プロジェクト::スクリーンショット @@ -31,10 +31,10 @@

    -