t-suw****@users*****
t-suw****@users*****
2007年 9月 24日 (月) 07:44:34 JST
ForkIndex: AquaSKK/src/component/SKKSession.cpp
diff -u AquaSKK/src/component/SKKSession.cpp:1.1.2.3 AquaSKK/src/component/SKKSession.cpp:1.1.2.4
--- AquaSKK/src/component/SKKSession.cpp:1.1.2.3 Sun Sep 2 12:36:24 2007
+++ AquaSKK/src/component/SKKSession.cpp Mon Sep 24 07:44:34 2007
@@ -1,5 +1,5 @@
/* -*- C++ -*-
- $Id: SKKSession.cpp,v 1.1.2.3 2007/09/02 03:36:24 t-suwa Exp $
+ $Id: SKKSession.cpp,v 1.1.2.4 2007/09/23 22:44:34 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -37,7 +37,11 @@
SKKEventParam param = SKKPreProcessor::theInstance().Execute(event);
std::cerr << param.dump() << std::endl;
- engine_.Dispatch(Event(param.event, param));
+ handled_ = false;
+ engine_.Dispatch(SKKEngine::Event(param.event, param));
+ if(handled_) {
+ std::cerr << "handled" << std::endl;
+ }
// レガシーエンジン
SKKEvent legacy_event(event);
@@ -110,7 +114,7 @@
}
// 新エンジンã®å…¥åŠ›ãƒ¢ãƒ¼ãƒ‰å¤‰æ›´
- engine_.Dispatch(Event(param.event, param));
+ engine_.Dispatch(SKKEngine::Event(param.event, param));
}
Point SKKSession::GetInputPosition(long offset) const {
@@ -189,6 +193,8 @@
void SKKSession::updateActiveInputArea(const CFStringRef str, int UniChar_fixlen, int UniChar_caretpos) {
EventRef event = 0;
+ handled_ = true;
+
bufsize_.curr = CFStringGetLength(str);
// イベントを作æˆ
Index: AquaSKK/src/component/SKKSession.h
diff -u AquaSKK/src/component/SKKSession.h:1.1.2.2 AquaSKK/src/component/SKKSession.h:1.1.2.3
--- AquaSKK/src/component/SKKSession.h:1.1.2.2 Sun Sep 2 12:36:24 2007
+++ AquaSKK/src/component/SKKSession.h Mon Sep 24 07:44:34 2007
@@ -1,5 +1,5 @@
/* -*- C++ -*-
- $Id: SKKSession.h,v 1.1.2.2 2007/09/02 03:36:24 t-suwa Exp $
+ $Id: SKKSession.h,v 1.1.2.3 2007/09/23 22:44:34 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -30,10 +30,11 @@
#include "IMSessionInputMode.h"
#include "SKKEngine.h"
-class SKKSession : StateContainerTraits<SKKEnvironment> {
+class SKKSession {
ComponentInstance instance_;
SKKEngine engine_;
IMSessionInputMode legacy_;
+ bool handled_;
struct buffer_size {
long prev;