t-suw****@users*****
t-suw****@users*****
2007年 12月 17日 (月) 23:48:49 JST
ForkIndex: AquaSKK/BIM.cpp
diff -u AquaSKK/BIM.cpp:1.17 AquaSKK/BIM.cpp:1.18
--- AquaSKK/BIM.cpp:1.17 Sun Nov 11 14:18:52 2007
+++ AquaSKK/BIM.cpp Mon Dec 17 23:48:49 2007
@@ -1,5 +1,5 @@
/*
- $Id: BIM.cpp,v 1.17 2007/11/11 05:18:52 t-suwa Exp $
+ $Id: BIM.cpp,v 1.18 2007/12/17 14:48:49 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -380,6 +380,12 @@
case kUpArrowCharCode:
case kDownArrowCharCode:
return (*inSessionHandle)->imsession_input_mode->handleArrow(event);
+
+ case kHomeCharCode:
+ case kEndCharCode:
+ case kHelpCharCode:
+ return false;
+
default:
if(event == SKKConfig::CancelKey()) {
return (*inSessionHandle)->imsession_input_mode->handleCg();
Index: AquaSKK/ChangeLog
diff -u AquaSKK/ChangeLog:1.55 AquaSKK/ChangeLog:1.56
--- AquaSKK/ChangeLog:1.55 Mon Nov 19 23:13:36 2007
+++ AquaSKK/ChangeLog Mon Dec 17 23:48:49 2007
@@ -1,3 +1,15 @@
+2007-12-17 Tomotaka SUWA <t.suw****@mac*****>
+
+ * BIM.cpp: ASCII モード以外㧠HOME, END, HELP ãŒåŠ¹ã‹ãªã„ä¸å…·åˆã‚’ä¿®
+ æ£(#11413)。
+
+ * Japanese.lproj/AboutBox.nib/*: レイアウトエラーを修æ£ã€‚
+
+ * CppMessagePortServer.*: メッセージãƒãƒ¼ãƒˆã®ã‚¯ãƒãƒ¼ã‚ºã‚¿ã‚¤ãƒŸãƒ³ã‚°ã‚’デ
+ ストラクタã«ç§»å‹•ã€‚
+
+ * PreferencesController.mm: クライアントã¸ã®ä¸è¦ãªé€šçŸ¥ã‚’削除。
+
2007-11-19 Tomotaka SUWA <t.suw****@mac*****>
* SKKDictionary.cpp: 自動更新辞書ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã¯åˆ¥åã§è¡Œã„ã€ãƒãƒƒãƒˆ
Index: AquaSKK/CppMessagePortServer.cpp
diff -u AquaSKK/CppMessagePortServer.cpp:1.3 AquaSKK/CppMessagePortServer.cpp:1.4
--- AquaSKK/CppMessagePortServer.cpp:1.3 Wed Apr 26 22:36:12 2006
+++ AquaSKK/CppMessagePortServer.cpp Mon Dec 17 23:48:49 2007
@@ -1,5 +1,5 @@
/*
- $Id: CppMessagePortServer.cpp,v 1.3 2006/04/26 13:36:12 t-suwa Exp $
+ $Id: CppMessagePortServer.cpp,v 1.4 2007/12/17 14:48:49 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -46,24 +46,25 @@
context.copyDescription = NULL;
// ƒT[ƒo[ƒ|[ƒg‚ð쬂·‚é
- CFMessagePortRef port = CFMessagePortCreateLocal(
- NULL,
- portName.getString(),
- CppMessagePortServer::callbackFunction,
- &context,
- NULL);
- if(port == NULL) {
+ port_ = CFMessagePortCreateLocal(NULL, portName.getString(),
+ CppMessagePortServer::callbackFunction,
+ &context, NULL);
+ if(port_ == NULL) {
throw exception_CFMessagePortCreateLocal();
}
// RunLoop ‚𑖂点‚é
- runLoopSource_ = CFMessagePortCreateRunLoopSource(NULL, port, 0);
+ runLoopSource_ = CFMessagePortCreateRunLoopSource(NULL, port_, 0);
privateRunLoop_ = new PrivateRunLoop(loopMode, runLoopSource_);
-
- CFRelease(port);
}
CppMessagePortServer::~CppMessagePortServer() {
+ // Important: If you want to tear down the connection, you must
+ // invalidate the port (using CFMessagePortInvalidate) before
+ // releasing the runloop source and the message port object.
+ // (ADC ƒŠƒtƒ@ƒŒƒ“ƒX‚æ‚è)
+ CFMessagePortInvalidate(port_);
+
// RunLoop ‚ðŽ~‚ß‚é
if(privateRunLoop_) {
delete privateRunLoop_;
@@ -72,10 +73,12 @@
if(runLoopSource_) {
CFRelease(runLoopSource_);
}
+
+ CFRelease(port_);
}
CFDataRef CppMessagePortServer::callbackFunction(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void* info) {
- CppMessagePortServer* self = static_cast<CppMessagePortServer*>(info);
+ CppMessagePortServer* self = reinterpret_cast<CppMessagePortServer*>(info);
CppCFData packet(data);
return self->messageReceived(msgid, packet).getCloneOfData();
Index: AquaSKK/CppMessagePortServer.h
diff -u AquaSKK/CppMessagePortServer.h:1.4 AquaSKK/CppMessagePortServer.h:1.5
--- AquaSKK/CppMessagePortServer.h:1.4 Wed Apr 26 22:36:12 2006
+++ AquaSKK/CppMessagePortServer.h Mon Dec 17 23:48:49 2007
@@ -1,5 +1,5 @@
/*
- $Id: CppMessagePortServer.h,v 1.4 2006/04/26 13:36:12 t-suwa Exp $
+ $Id: CppMessagePortServer.h,v 1.5 2007/12/17 14:48:49 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -38,6 +38,7 @@
*/
class CppMessagePortServer {
+ CFMessagePortRef port_;
PrivateRunLoop* privateRunLoop_;
CFRunLoopSourceRef runLoopSource_;
Index: AquaSKK/Info-AquaSKKInputMethod.plist
diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.22 AquaSKK/Info-AquaSKKInputMethod.plist:1.23
--- AquaSKK/Info-AquaSKKInputMethod.plist:1.22 Sun Nov 11 14:18:52 2007
+++ AquaSKK/Info-AquaSKKInputMethod.plist Mon Dec 17 23:48:49 2007
@@ -19,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>thng</string>
<key>CFBundleShortVersionString</key>
- <string>objc-gc 1.1</string>
+ <string>objc-gc 1.3</string>
<key>CFBundleSignature</key>
<string>askk</string>
<key>CFBundleVersion</key>
- <string>2007-11-11</string>
+ <string>2007-12-17</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>tsInputMethodIconFileKey</key>
Index: AquaSKK/Info-AquaSKKServer.plist
diff -u AquaSKK/Info-AquaSKKServer.plist:1.22 AquaSKK/Info-AquaSKKServer.plist:1.23
--- AquaSKK/Info-AquaSKKServer.plist:1.22 Sun Nov 11 14:18:52 2007
+++ AquaSKK/Info-AquaSKKServer.plist Mon Dec 17 23:48:49 2007
@@ -19,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>objc-gc 1.1</string>
+ <string>objc-gc 1.3</string>
<key>CFBundleSignature</key>
<string>askk</string>
<key>CFBundleVersion</key>
- <string>2007-11-11</string>
+ <string>2007-12-17</string>
<key>NSMainNibFile</key>
<string>Principal</string>
<key>NSPrincipalClass</key>
Index: AquaSKK/PreferencesController.mm
diff -u AquaSKK/PreferencesController.mm:1.9 AquaSKK/PreferencesController.mm:1.10
--- AquaSKK/PreferencesController.mm:1.9 Mon Dec 18 00:05:41 2006
+++ AquaSKK/PreferencesController.mm Mon Dec 17 23:48:49 2007
@@ -1,5 +1,5 @@
/* -*- objc -*-
- $Id: PreferencesController.mm,v 1.9 2006/12/17 15:05:41 t-suwa Exp $
+ $Id: PreferencesController.mm,v 1.10 2007/12/17 14:48:49 t-suwa Exp $
MacOS X implementation of the SKK input method.
@@ -220,9 +220,6 @@
skkserv.start([defaults integerForKey:KEY_skkserv_port], [defaults boolForKey:KEY_skkserv_localonly]);
}
- // ƒNƒ‰ƒCƒ“ƒg‚É•ÏX‚ð’Ê’m‚·‚é
- ClientConnectionFactory::theInstance().newConnection().send(kSKKClientConfigurationModified, CppCFData());
-
return TRUE;
}