[aquaskk-changes 347] CVS update: AquaSKK/src/component

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;
 }


aquaskk-changes メーリングリストの案内