AquaSKK

Fork

[aquaskk-changes 333] CVS update: AquaSKK

Tomotaka SUWA t-suw****@users*****
2007年 8月 17日 (金) 21:47:27 JST

• 前の記事 [aquaskk-changes 332] CVS update: AquaSKK/proj/AquaSKK.xcodeproj
• 次の記事 [aquaskk-changes 334] CVS update: AquaSKK/AquaSKK.xcodeproj
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Index: AquaSKK/AquaSKKServer.mm
diff -u AquaSKK/AquaSKKServer.mm:1.2.2.4 AquaSKK/AquaSKKServer.mm:1.2.2.5
--- AquaSKK/AquaSKKServer.mm:1.2.2.4	Sat Feb  3 17:52:48 2007
+++ AquaSKK/AquaSKKServer.mm	Fri Aug 17 21:47:26 2007
@@ -1,10 +1,10 @@
 /* -*- objc -*-
-  $Id: AquaSKKServer.mm,v 1.2.2.4 2007/02/03 08:52:48 t-suwa Exp $
+  $Id: AquaSKKServer.mm,v 1.2.2.5 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2005-2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2005-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   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
@@ -22,6 +22,7 @@
 */
 
 #include <AppKit/AppKit.h>
+#include <Carbon/Carbon.h>
 #include "BIMClientServer.h"
 #include "AquaSKKServer.h"
 #include "PreferencesController.h"
Index: AquaSKK/BIM.cpp
diff -u AquaSKK/BIM.cpp:1.14.2.2 AquaSKK/BIM.cpp:1.14.2.3
--- AquaSKK/BIM.cpp:1.14.2.2	Sat Feb  3 17:52:48 2007
+++ AquaSKK/BIM.cpp	Fri Aug 17 21:47:26 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: BIM.cpp,v 1.14.2.2 2007/02/03 08:52:48 t-suwa Exp $
+  $Id: BIM.cpp,v 1.14.2.3 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -27,8 +27,6 @@
 #include <list>
 #include <cstdio>
 
-#include "SKKPreProcessor.h"
-
 #include "BIM.h"
 #include "BIMInputEvents.h"
 #include "BIMClientServer.h"
@@ -153,10 +151,7 @@
     menuEventSpec.eventKind = kEventProcessCommand;
     result = InstallMenuEventHandler(gPencilMenu, NewEventHandlerUPP(BIMPencilMenuEventHandler),
 				     1, &menuEventSpec, NULL, NULL);
-
-    // ƒvƒŠƒvƒƒZƒbƒT‚̏‰Šú‰»
-    SKKPreProcessor::theInstance().Initialize();
-
+    
     //  ƒƒbƒZ[ƒWŽóM‹@\‚ð‰Šú‰»
     ClientMessageReceiver::start(kAquaSKKClientRunLoopMode);
 
@@ -200,8 +195,6 @@
 	(**outSessionHandle)->terminate_disabled = false;
 	(**outSessionHandle)->asciimode_startup = ClientConfiguration::theInstance().isAsciiModeStartup();
 	(**outSessionHandle)->imsession_input_mode = new IMSessionInputMode(*outSessionHandle);
-	(**outSessionHandle)->engine = new SKKEngine();
-	(**outSessionHandle)->engine->Start();
 
 	// ƒL[ƒ{[ƒhƒŒƒCƒAƒEƒg‚ð‰Šú‰»‚·‚é
 	InitializeKeyboardLayout();
@@ -226,7 +219,6 @@
 	}
 
 	delete (*inSessionHandle)->imsession_input_mode;
-	delete (*inSessionHandle)->engine;
 
         DisposeHandle((Handle)inSessionHandle );
     }
@@ -264,20 +256,6 @@
 ComponentResult BIMSessionEvent(BIMSessionHandle inSessionHandle, EventRef inEventRef) {
     SKKEvent event(inEventRef);
 
-    SKKEventParam param = SKKPreProcessor::theInstance().Execute(inEventRef);
-    if(param.event != SKK_NULL) {
-	SKKEngine* engine = (*inSessionHandle)->engine;
-
-	int serial = engine->Result();
-
-	engine->Dispatch(SKKEnvironment::Event(param.event, param));
-
-	// ˆ—‚³‚ꂽH
-	if(serial != engine->Result()) {
-	    std::cerr << "SKKEngine: handled" << std::endl;
-	}
-    }
-
     if(0) {
 	event.Dump();
     }
Index: AquaSKK/BIM.h
diff -u AquaSKK/BIM.h:1.4.2.1 AquaSKK/BIM.h:1.4.2.2
--- AquaSKK/BIM.h:1.4.2.1	Sat Feb  3 16:53:29 2007
+++ AquaSKK/BIM.h	Fri Aug 17 21:47:26 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: BIM.h,v 1.4.2.1 2007/02/03 07:53:29 t-suwa Exp $
+  $Id: BIM.h,v 1.4.2.2 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -25,7 +25,6 @@
 #define INC__BIM__
 
 #include "SKKEvent.h"
-#include "SKKEngine.h"
 
 enum {
 	kHiraganaIconIndex = 0,
@@ -47,7 +46,6 @@
     bool terminate_disabled;	// true Žž‚Í terminate ‚ª–³Œø
     bool asciimode_startup;
     class IMSessionInputMode* imsession_input_mode;
-    SKKEngine* engine;
 };
 
 typedef struct BIMSessionRecord BIMSessionRecord;
Index: AquaSKK/BIMComponent.cpp
diff -u AquaSKK/BIMComponent.cpp:1.6.2.1 AquaSKK/BIMComponent.cpp:1.6.2.2
--- AquaSKK/BIMComponent.cpp:1.6.2.1	Sat Feb  3 16:53:29 2007
+++ AquaSKK/BIMComponent.cpp	Fri Aug 17 21:47:26 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: BIMComponent.cpp,v 1.6.2.1 2007/02/03 07:53:29 t-suwa Exp $
+  $Id: BIMComponent.cpp,v 1.6.2.2 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -372,16 +372,11 @@
 	BIMLog("Can't SetTextServiceProperty[%d]\n", tag);
 	return tsmComponentPropertyUnsupportedErr;
     }
-
     CFStringRef newMode = (CFStringRef)value;
     IMSessionInputMode* inputMode = (*(BIMSessionHandle)inSessionHandle)->imsession_input_mode;
-    SKKEngine* engine = (*(BIMSessionHandle)inSessionHandle)->engine;
-    SKKEventParam param;
 
     // “ü—̓‚[ƒh‚ð•ÏX‚·‚é
     if(CFStringCompare(newMode, kTextServiceInputModeJapanese, 0) == 0) {
-	param.event = SKK_HIRAKANA;
-	engine->Dispatch(SKKEnvironment::Event(param.event, param));
 	if(!inputMode->isHiraganaInputMode()) {
 	    inputMode->goHiraganaInputMode();
 	    return noErr;
@@ -389,8 +384,6 @@
     }
 
     if(CFStringCompare(newMode, kTextServiceInputModeJapaneseKatakana, 0) == 0) {
-	param.event = SKK_KATAKANA;
-	engine->Dispatch(SKKEnvironment::Event(param.event, param));
 	if(!inputMode->isZenKataInputMode()) {
 	    inputMode->goZenKataInputMode();
 	    return noErr;
@@ -398,8 +391,6 @@
     }
 
     if(CFStringCompare(newMode, kTextServiceInputModeJapaneseHalfWidthKana, 0) == 0) {
-	param.event = SKK_JISX0201KANA;
-	engine->Dispatch(SKKEnvironment::Event(param.event, param));
 	if(!inputMode->isHanKataInputMode()) {
 	    inputMode->goHanKataInputMode();
 	    return noErr;
@@ -407,8 +398,6 @@
     }
 
     if(CFStringCompare(newMode, kTextServiceInputModeJapaneseFullWidthRoman, 0) == 0) {
-	param.event = SKK_JISX0208LATIN;
-	engine->Dispatch(SKKEnvironment::Event(param.event, param));
 	if(!inputMode->isZenAscInputMode()) {
 	    inputMode->goZenAscInputMode();
 	    return noErr;
@@ -416,8 +405,6 @@
     }
 
     if(CFStringCompare(newMode, kTextServiceInputModeRoman, 0) == 0) {
-	param.event = SKK_ASCII;
-	engine->Dispatch(SKKEnvironment::Event(param.event, param));
 	if(!inputMode->isHanAscInputMode()) {
 	    inputMode->goHanAscInputMode();
 	    return noErr;
Index: AquaSKK/CandidatesManager.mm
diff -u AquaSKK/CandidatesManager.mm:1.6.2.2 AquaSKK/CandidatesManager.mm:1.6.2.3
--- AquaSKK/CandidatesManager.mm:1.6.2.2	Thu Aug 16 19:58:18 2007
+++ AquaSKK/CandidatesManager.mm	Fri Aug 17 21:47:26 2007
@@ -1,10 +1,10 @@
 /* -*- objc -*-
-  $Id: CandidatesManager.mm,v 1.6.2.2 2007/08/16 10:58:18 t-suwa Exp $
+  $Id: CandidatesManager.mm,v 1.6.2.3 2007/08/17 12:47:26 t-suwa Exp $
 	
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002-2004 phonohawk
-  Copyright (C) 2005-2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2005-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   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
@@ -21,9 +21,10 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#import <AppKit/AppKit.h>
-#import "CandidatesView.h"
-#import "CandidatesWindowController.h"
+#include <AppKit/AppKit.h>
+#include <Carbon/Carbon.h>
+#include "CandidatesView.h"
+#include "CandidatesWindowController.h"
 
 #include "BIMClientServer.h"
 #include "CppCFString.h"
Index: AquaSKK/ClientConnectionFactory.cpp
diff -u AquaSKK/ClientConnectionFactory.cpp:1.3 AquaSKK/ClientConnectionFactory.cpp:1.3.2.1
--- AquaSKK/ClientConnectionFactory.cpp:1.3	Wed Apr 26 22:36:12 2006
+++ AquaSKK/ClientConnectionFactory.cpp	Fri Aug 17 21:47:26 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: ClientConnectionFactory.cpp,v 1.3 2006/04/26 13:36:12 t-suwa Exp $
+  $Id: ClientConnectionFactory.cpp,v 1.3.2.1 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2006-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   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
@@ -21,7 +21,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <CoreFoundation/CoreFoundation.h>
+#include <Carbon/Carbon.h>
 #include <vector>
 #include "BIMClientServer.h"
 #include "CppCFString.h"
Index: AquaSKK/DictionarySet.cpp
diff -u AquaSKK/DictionarySet.cpp:1.5.2.8 AquaSKK/DictionarySet.cpp:1.5.2.9
--- AquaSKK/DictionarySet.cpp:1.5.2.8	Thu Aug 16 19:58:18 2007
+++ AquaSKK/DictionarySet.cpp	Fri Aug 17 21:47:26 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: DictionarySet.cpp,v 1.5.2.8 2007/08/16 10:58:18 t-suwa Exp $
+  $Id: DictionarySet.cpp,v 1.5.2.9 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -21,6 +21,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include <Carbon/Carbon.h>
 #include <iostream>
 #include <sstream>
 #include "BIMClientServer.h"
Index: AquaSKK/PreferenceKeys.h
diff -u AquaSKK/PreferenceKeys.h:1.3.2.1 AquaSKK/PreferenceKeys.h:1.3.2.2
--- AquaSKK/PreferenceKeys.h:1.3.2.1	Sat Feb  3 16:53:29 2007
+++ AquaSKK/PreferenceKeys.h	Fri Aug 17 21:47:26 2007
@@ -1,5 +1,5 @@
 /* -*- objc -*-
-  $Id: PreferenceKeys.h,v 1.3.2.1 2007/02/03 07:53:29 t-suwa Exp $
+  $Id: PreferenceKeys.h,v 1.3.2.2 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -42,6 +42,4 @@
 extern NSString* KEY_skkserv_port;
 extern NSString* KEY_skkserv_localonly;
 
-extern NSString* KEY_use_brand_new_engine;
-
 #endif
Index: AquaSKK/PreferencesController.mm
diff -u AquaSKK/PreferencesController.mm:1.8.2.4 AquaSKK/PreferencesController.mm:1.8.2.5
--- AquaSKK/PreferencesController.mm:1.8.2.4	Sat Feb  3 17:52:48 2007
+++ AquaSKK/PreferencesController.mm	Fri Aug 17 21:47:26 2007
@@ -1,10 +1,10 @@
 /*  -*- objc -*-
-  $Id: PreferencesController.mm,v 1.8.2.4 2007/02/03 08:52:48 t-suwa Exp $
+  $Id: PreferencesController.mm,v 1.8.2.5 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2005-2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2005-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   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
@@ -22,6 +22,7 @@
 */
 
 #include <AppKit/AppKit.h>
+#include <Carbon/Carbon.h>
 #include "PreferencesController.h"
 
 #include "BIMClientServer.h"
@@ -49,8 +50,6 @@
 NSString* KEY_skkserv_port = @"skkserv_port";
 NSString* KEY_skkserv_localonly = @"skkserv_localonly";
 
-NSString* KEY_use_brand_new_engine = @"use_brand_new_engine";
-
 // ŠeŽíƒpƒX
 NSString* path_for_library = @"Library/AquaSKK";
 NSString* path_for_dictionary_set = @"DictionarySet.plist";
Index: AquaSKK/SKKConfig.cpp
diff -u AquaSKK/SKKConfig.cpp:1.2.2.1 AquaSKK/SKKConfig.cpp:1.2.2.2
--- AquaSKK/SKKConfig.cpp:1.2.2.1	Sat Feb  3 16:53:29 2007
+++ AquaSKK/SKKConfig.cpp	Fri Aug 17 21:47:26 2007
@@ -1,9 +1,9 @@
 /*
-  $Id: SKKConfig.cpp,v 1.2.2.1 2007/02/03 07:53:29 t-suwa Exp $
+  $Id: SKKConfig.cpp,v 1.2.2.2 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
-  Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****>
+  Copyright (C) 2006-2007 Tomotaka SUWA <t.suw****@mac*****>
 
   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
@@ -30,6 +30,7 @@
  *
  */
 
+#include <Carbon/Carbon.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>
Index: AquaSKK/ServerMessageReceiver.mm
diff -u AquaSKK/ServerMessageReceiver.mm:1.7.2.5 AquaSKK/ServerMessageReceiver.mm:1.7.2.6
--- AquaSKK/ServerMessageReceiver.mm:1.7.2.5	Thu Aug 16 19:58:18 2007
+++ AquaSKK/ServerMessageReceiver.mm	Fri Aug 17 21:47:26 2007
@@ -1,5 +1,5 @@
 /* -*- objc -*-
-  $Id: ServerMessageReceiver.mm,v 1.7.2.5 2007/08/16 10:58:18 t-suwa Exp $
+  $Id: ServerMessageReceiver.mm,v 1.7.2.6 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -22,6 +22,7 @@
 */
 
 #include <AppKit/AppKit.h>
+#include <Carbon/Carbon.h>
 #include "CandidatesView.h"
 #include "CandidatesWindowController.h"
 #include "PreferenceKeys.h"
Index: AquaSKK/skkserv.cpp
diff -u AquaSKK/skkserv.cpp:1.3.2.6 AquaSKK/skkserv.cpp:1.3.2.7
--- AquaSKK/skkserv.cpp:1.3.2.6	Sat Feb  3 17:52:48 2007
+++ AquaSKK/skkserv.cpp	Fri Aug 17 21:47:26 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: skkserv.cpp,v 1.3.2.6 2007/02/03 08:52:48 t-suwa Exp $
+  $Id: skkserv.cpp,v 1.3.2.7 2007/08/17 12:47:26 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -21,6 +21,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include <CoreFoundation/CoreFoundation.h>
 #include <iostream>
 #include <string>
 #include <cctype>

• 前の記事 [aquaskk-changes 332] CVS update: AquaSKK/proj/AquaSKK.xcodeproj
• 次の記事 [aquaskk-changes 334] CVS update: AquaSKK/AquaSKK.xcodeproj
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]