t-suw****@users*****
t-suw****@users*****
2007年 8月 26日 (日) 01:34:45 JST
Index: AquaSKK/src/component/SKKComponent.cpp diff -u AquaSKK/src/component/SKKComponent.cpp:1.1.2.1 AquaSKK/src/component/SKKComponent.cpp:1.1.2.2 --- AquaSKK/src/component/SKKComponent.cpp:1.1.2.1 Sun Aug 19 19:00:32 2007 +++ AquaSKK/src/component/SKKComponent.cpp Sun Aug 26 01:34:45 2007 @@ -1,5 +1,5 @@ /* -*- C++ -*- - $Id: SKKComponent.cpp,v 1.1.2.1 2007/08/19 10:00:32 t-suwa Exp $ + $Id: SKKComponent.cpp,v 1.1.2.2 2007/08/25 16:34:45 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -35,6 +35,7 @@ #include "SKKComponent.h" #include "SKKSession.h" +#include "SKKPreProcessor.h" enum { kAboutCommand = 'abou', @@ -99,11 +100,14 @@ InstallEventHandler(GetMenuEventTarget(menu_), &SKKComponent::menuEventHandler, 1, &spec, 0, 0); } - // ã¡ãã»ã¼ã¸åä¿¡æ©æ§ãåæå + // ã¡ãã»ã¼ã¸åä¿¡æ©æ§ãåæå ClientMessageReceiver::start(kAquaSKKClientRunLoopMode); - // AquaSKKServer ã®èµ·å + // AquaSKKServer ã®èµ·å ServerConnectionFactory::theInstance().prepareServer(); + + // ãã¼ãããã®åæå + SKKPreProcessor::theInstance().Initialize(); } SKKComponent::~SKKComponent() { Index: AquaSKK/src/component/SKKSession.cpp diff -u AquaSKK/src/component/SKKSession.cpp:1.1.2.1 AquaSKK/src/component/SKKSession.cpp:1.1.2.2 --- AquaSKK/src/component/SKKSession.cpp:1.1.2.1 Sun Aug 19 19:00:32 2007 +++ AquaSKK/src/component/SKKSession.cpp Sun Aug 26 01:34:45 2007 @@ -1,5 +1,5 @@ /* -*- C++ -*- - $Id: SKKSession.cpp,v 1.1.2.1 2007/08/19 10:00:32 t-suwa Exp $ + $Id: SKKSession.cpp,v 1.1.2.2 2007/08/25 16:34:45 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -25,6 +25,7 @@ #include "BIM.h" #include "SKKComponent.h" #include "SKKSession.h" +#include "SKKPreProcessor.h" #include "SKKConfig.h" SKKSession::SKKSession(const ComponentInstance instance) : instance_(instance) { @@ -32,6 +33,9 @@ // ã¤ãã³ã bool SKKSession::HandleInput(const EventRef event) { + SKKEventParam param = SKKPreProcessor::theInstance().Execute(event); + std::cerr << param.dump() << std::endl; + // ã¬ã¬ã·ã¼ã¨ã³ã¸ã³ SKKEvent legacy_event(event); @@ -139,8 +143,8 @@ } // 座æ¨ã®èª¿æ´ - CGRect mainscreen = CGDisplayBounds(CGMainDisplayID()); - pt.v = mainscreen.size.height - pt.v; + //CGRect mainscreen = CGDisplayBounds(CGMainDisplayID()); + //pt.v = mainscreen.size.height - pt.v; return pt; }