From t-suwa ¡÷ users.sourceforge.jp Sun Nov 4 09:52:35 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Sun, 04 Nov 2007 09:52:35 +0900 Subject: [aquaskk-changes 427] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <1194137555.219767.20538.nullmailer@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/.cvsignore diff -u /dev/null AquaSKK/AquaSKK.xcodeproj/.cvsignore:1.1 --- /dev/null Sun Nov 4 09:52:35 2007 +++ AquaSKK/AquaSKK.xcodeproj/.cvsignore Sun Nov 4 09:52:35 2007 @@ -0,0 +1 @@ +t_suwa.mode1v3 Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.11 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.12 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.11 Mon Dec 18 00:05:42 2006 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Sun Nov 4 09:52:35 2007 @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 44; objects = { /* Begin PBXBuildFile section */ @@ -713,9 +713,11 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = D30C5463086B0F720046BC02 /* Build configuration list for PBXProject "AquaSKK" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 089C166AFE841209C02AAC07 /* BasicInputMethod */; projectDirPath = ""; + projectRoot = ""; targets = ( 849E1017055022FF009C3C25 /* AquaSKKInputMethod */, 849E109C055023C8009C3C25 /* AquaSKKServer */, @@ -923,6 +925,8 @@ GCC_PFE_FILE_C_DIALECTS = "objective-c c++ objective-c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_VERSION_i386 = 4.0; + GCC_VERSION_ppc = 3.3; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; @@ -946,6 +950,7 @@ PREBINDING = NO; PRODUCT_NAME = AquaSKKServer; SECTORDER_FLAGS = ""; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; @@ -964,6 +969,8 @@ GCC_PFE_FILE_C_DIALECTS = "objective-c c++ objective-c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_VERSION_i386 = 4.0; + GCC_VERSION_ppc = 3.3; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; @@ -987,6 +994,7 @@ PREBINDING = NO; PRODUCT_NAME = AquaSKKServer; SECTORDER_FLAGS = ""; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; WARNING_CFLAGS = ""; WRAPPER_EXTENSION = app; }; @@ -1000,6 +1008,8 @@ GCC_PFE_FILE_C_DIALECTS = "objective-c c++ objective-c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_VERSION_i386 = 4.0; + GCC_VERSION_ppc = 3.3; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; @@ -1022,6 +1032,7 @@ PREBINDING = NO; PRODUCT_NAME = AquaSKKServer; SECTORDER_FLAGS = ""; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = app; }; @@ -1031,17 +1042,21 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_GC = supported; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PFE_FILE_C_DIALECTS = "objective-c c++ objective-c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_USE_GCC3_PFE_SUPPORT = YES; + GCC_VERSION_i386 = 4.0; + GCC_VERSION_ppc = 3.3; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; @@ -1059,16 +1074,22 @@ INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = ""; + "MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4; + "MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = "-rd -d ppc_$(ppc) -d i386_$(i386)"; PRODUCT_NAME = AquaSKKInputMethod; SDKROOT = "$(SDKROOT)"; + "SDKROOT[arch=i386]" = /Developer/SDKs/MacOSX10.4u.sdk; + "SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.3.9.sdk; SECTORDER_FLAGS = ""; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = "ppc64 ppc7400 ppc970 i386 x86_64 ppc"; WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = component; - ZERO_LINK = YES; + ZERO_LINK = NO; }; name = Development; }; @@ -1076,12 +1097,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - ppc, - i386, - ); COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; FRAMEWORK_SEARCH_PATHS = ""; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_GC = supported; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 2; @@ -1089,6 +1109,9 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; + GCC_USE_GCC3_PFE_SUPPORT = YES; + GCC_VERSION_i386 = 4.0; + GCC_VERSION_ppc = 3.3; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; @@ -1108,33 +1131,39 @@ INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = ""; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; + "MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4; + "MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = "-rd -d ppc_$(ppc) -d i386_$(i386)"; PRODUCT_NAME = AquaSKKInputMethod; SDKROOT = "$(SDKROOT)"; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; - SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; + "SDKROOT[arch=i386]" = /Developer/SDKs/MacOSX10.4u.sdk; + "SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.3.9.sdk; SECTORDER_FLAGS = ""; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = "ppc64 ppc7400 ppc970 i386 x86_64 ppc"; WARNING_CFLAGS = ""; WRAPPER_EXTENSION = component; + ZERO_LINK = NO; }; name = Deployment; }; D30C5462086B0F720046BC02 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + DEAD_CODE_STRIPPING = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_GC = supported; + GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PFE_FILE_C_DIALECTS = "objective-c c++ objective-c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_USE_GCC3_PFE_SUPPORT = YES; + GCC_VERSION_i386 = 4.0; + GCC_VERSION_ppc = 3.3; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; @@ -1152,14 +1181,21 @@ INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.3; + MACOSX_DEPLOYMENT_TARGET = ""; + "MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4; + "MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = AquaSKKInputMethod; + "SDKROOT[arch=i386]" = /Developer/SDKs/MacOSX10.4u.sdk; + "SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.3.9.sdk; SECTORDER_FLAGS = ""; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + VALID_ARCHS = "ppc64 ppc7400 ppc970 i386 x86_64 ppc"; WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = component; + ZERO_LINK = NO; }; name = Default; }; From t-suwa ¡÷ users.sourceforge.jp Sun Nov 4 09:53:10 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Sun, 04 Nov 2007 09:53:10 +0900 Subject: [aquaskk-changes 428] CVS update: AquaSKK/Package/AquaSKK.pmdoc Message-ID: <1194137590.374176.20676.nullmailer@users.sourceforge.jp> From t-suwa ¡÷ users.sourceforge.jp Sun Nov 4 09:56:06 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Sun, 04 Nov 2007 09:56:06 +0900 Subject: [aquaskk-changes 429] CVS update: AquaSKK/Package Message-ID: <1194137766.982867.22638.nullmailer@users.sourceforge.jp> Index: AquaSKK/Package/Makefile diff -u AquaSKK/Package/Makefile:1.2 AquaSKK/Package/Makefile:1.3 --- AquaSKK/Package/Makefile:1.2 Mon Dec 18 00:05:42 2006 +++ AquaSKK/Package/Makefile Sun Nov 4 09:56:06 2007 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2006/12/17 15:05:42 t-suwa Exp $ +# $Id: Makefile,v 1.3 2007/11/04 00:56:06 t-suwa Exp $ # # Makefile for build installer @@ -7,20 +7,21 @@ TARGET = AquaSKKInputMethod.component DEPLOY = ../build/Deployment DEST = contents/Components -BUILD = /Developer/Tools/packagemaker -build -proj AquaSKK.pmproj +PKGMAKER= /Developer/usr/bin/packagemaker +BUILD = $(PKGMAKER) --doc AquaSKK.pmdoc TODAY = `date +%F` beta: $(DEST) - $(BUILD) -p AquaSKK-BETA-$(TODAY).pkg + $(BUILD) -o AquaSKK-BETA-$(TODAY).pkg release: $(DEST) - $(BUILD) -p AquaSKK-RELEASE.pkg + $(BUILD) -o AquaSKK-RELEASE.pkg $(DEST): build sudo rm -rf $(DEST) sudo mkdir -p $(DEST) - sudo cp -r $(DEPLOY)/$(TARGET) $(DEST) + sudo cp -R $(DEPLOY)/$(TARGET) $(DEST) sudo chown -R root:admin $(DEST) build: From t-suwa ¡÷ users.sourceforge.jp Sun Nov 4 09:56:07 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Sun, 04 Nov 2007 09:56:07 +0900 Subject: [aquaskk-changes 430] CVS update: AquaSKK/Package/AquaSKK.pmdoc Message-ID: <1194137767.156920.22652.nullmailer@users.sourceforge.jp> Index: AquaSKK/Package/AquaSKK.pmdoc/01contents-contents.xml diff -u /dev/null AquaSKK/Package/AquaSKK.pmdoc/01contents-contents.xml:1.1 --- /dev/null Sun Nov 4 09:56:07 2007 +++ AquaSKK/Package/AquaSKK.pmdoc/01contents-contents.xml Sun Nov 4 09:56:06 2007 @@ -0,0 +1 @@ +modegroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupgroupownergroupownergroup \ No newline at end of file Index: AquaSKK/Package/AquaSKK.pmdoc/01contents.xml diff -u /dev/null AquaSKK/Package/AquaSKK.pmdoc/01contents.xml:1.1 --- /dev/null Sun Nov 4 09:56:07 2007 +++ AquaSKK/Package/AquaSKK.pmdoc/01contents.xml Sun Nov 4 09:56:06 2007 @@ -0,0 +1 @@ +jp.sourceforge.AquaSKKInputMethod3.3/Volumes/LaCie/Users/t_suwa/sf.jp/AquaSKK/Package/contents/LibraryparentrequireAuthorizationpostInstallversioninstallToidentifierscripts01contents-contents.xml \ No newline at end of file Index: AquaSKK/Package/AquaSKK.pmdoc/index.xml diff -u /dev/null AquaSKK/Package/AquaSKK.pmdoc/index.xml:1.1 --- /dev/null Sun Nov 4 09:56:07 2007 +++ AquaSKK/Package/AquaSKK.pmdoc/index.xml Sun Nov 4 09:56:06 2007 @@ -0,0 +1 @@ +AquaSKK/Volumes/LaCie/Archive/AquaSKK BETA/AquaSKK-BETA-2007-11-04.pkgjp.sourceforge.aquaskkAquaSKK ????¸ã???? - ?¥æ?èª??å¿????/description>/Volumes/LaCie/Users/t_suwa/sf.jp/AquaSKK/Package/License.txt/Volumes/LaCie/Users/t_suwa/sf.jp/AquaSKK/Package/Welcome.rtf01contents.xml \ No newline at end of file From t-suwa ¡÷ users.sourceforge.jp Sat Nov 10 19:56:19 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Sat, 10 Nov 2007 19:56:19 +0900 Subject: [aquaskk-changes 431] CVS update: AquaSKK/Package Message-ID: <1194692179.065187.22217.nullmailer@users.sourceforge.jp> Index: AquaSKK/Package/Welcome.rtf diff -u AquaSKK/Package/Welcome.rtf:1.2 AquaSKK/Package/Welcome.rtf:1.3 --- AquaSKK/Package/Welcome.rtf:1.2 Wed Apr 26 22:36:14 2006 +++ AquaSKK/Package/Welcome.rtf Sat Nov 10 19:56:18 2007 @@ -1,5 +1,5 @@ -{\rtf1\mac\ansicpg10001\cocoartf824\cocoasubrtf350 -{\fonttbl\f0\fnil\fcharset77 LucidaGrande;\f1\fnil\fcharset78 HiraKakuPro-W3;} +{\rtf1\ansi\ansicpg932\cocoartf949 +{\fonttbl\f0\fnil\fcharset0 Monaco;\f1\fnil\fcharset128 HiraKakuProN-W3;} {\colortbl;\red255\green255\blue255;\red128\green89\blue200;} {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}} {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}} @@ -19,19 +19,20 @@ \f0 {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/software/emacs/emacs.html"}}{\fldrslt \cf2 GNU Emacs}} \f1 \'82\'c5\'93\'ae\'8d\'ec\'82\'b7\'82\'e9 \f0 {\field{\*\fldinst{HYPERLINK "http://openlab.jp/skk/index-j.html"}}{\fldrslt \cf2 SKK}} -\f1 \'82\'cc\'92\'b7\'8f\'8a\'82\'f0\'8c\'70\'8f\'b3\'82\'b5\'81\'41\'83\'56\'83\'93\'83\'76\'83\'8b\'82\'c5\'89\'f5\'93\'4b\'82\'c8\'93\'fa\'96\'7b\'8c\'ea\'93\'fc\'97\'cd\'8a\'c2\'8b\'ab\'82\'cc\'92\'f1\'8b\'9f\'82\'f0\'96\'da\'8e\'77\'82\'b5\'82\'dc\'82\'b7\'81\'42\ +\f1 \'82\'cc\'92\'b7\'8f\'8a\'82\'f0\'8c\'70\'8f\'b3\'82\'b5\'81\'41\'83\'56\'83\'93\'83\'76\'83\'8b\'82\'c5\'89\'f5\'93\'4b\'82\'c8\'93\'fa\'96\'7b\'8c\'ea\'93\'fc\'97\'cd\'8a\'c2\'8b\'ab\'82\'cc\'92\'f1\'8b\'9f\'82\'f0\'96\'da\'8e\'77\'82\'b5\'82\'dc\'82\'b7\'81\'42 +\f0 \ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural \cf0 \ - -\f0 \uc0\u8251 -\f1 \'92\'8d\'88\'d3\ +\uc0\u8251 +\f1 \'92\'8d\'88\'d3 +\f0 \ \pard\tx220\tx460\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li480\fi-480\ql\qnatural -\ls1\ilvl0\cf0 {\listtext -\f0 \'a5 }AquaSKK -\f1 \'82\'f0\'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'8b\'82\'b7\'82\'e9\'82\'bd\'82\'df\'82\'c9\'82\'cd\'8a\'c7\'97\'9d\'8e\'d2\'8c\'a0\'8c\'c0\'82\'aa\'95\'4b\'97\'76\'82\'c5\'82\'b7\'81\'42\ -{\listtext -\f0 \'a5 } +\ls1\ilvl0\cf0 {\listtext \'95 }AquaSKK +\f1 \'82\'f0\'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'8b\'82\'b7\'82\'e9\'82\'bd\'82\'df\'82\'c9\'82\'cd\'8a\'c7\'97\'9d\'8e\'d2\'8c\'a0\'8c\'c0\'82\'aa\'95\'4b\'97\'76\'82\'c5\'82\'b7\'81\'42 +\f0 \ +{\listtext \'95 } \f1 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'8b\'8c\'e3\'82\'c9 \f0 OS -\f1 \'82\'f0\'8d\'c4\'8b\'4e\'93\'ae\'82\'b7\'82\'e9\'95\'4b\'97\'76\'82\'aa\'82\'a0\'82\'e8\'82\'dc\'82\'b7\'81\'42\ +\f1 \'82\'f0\'8d\'c4\'8b\'4e\'93\'ae\'82\'b7\'82\'e9\'95\'4b\'97\'76\'82\'aa\'82\'a0\'82\'e8\'82\'dc\'82\'b7\'81\'42 +\f0 \ } \ No newline at end of file From t-suwa ¡÷ users.sourceforge.jp Sat Nov 10 20:05:05 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Sat, 10 Nov 2007 20:05:05 +0900 Subject: [aquaskk-changes 432] CVS update: AquaSKK Message-ID: <1194692705.527336.26908.nullmailer@users.sourceforge.jp> Index: AquaSKK/CandidatesManager.h diff -u AquaSKK/CandidatesManager.h:1.4 AquaSKK/CandidatesManager.h:1.5 --- AquaSKK/CandidatesManager.h:1.4 Sat Jul 15 09:49:00 2006 +++ AquaSKK/CandidatesManager.h Sat Nov 10 20:05:05 2007 @@ -1,10 +1,10 @@ /* - $Id: CandidatesManager.h,v 1.4 2006/07/15 00:49:00 t-suwa Exp $ + $Id: CandidatesManager.h,v 1.5 2007/11/10 11:05:05 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002 phonohawk - Copyright (C) 2005-2006 Tomotaka SUWA + Copyright (C) 2005-2007 Tomotaka SUWA 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 @@ -36,7 +36,7 @@ public: static CandidatesManager& sharedManager(); - unsigned createAndShow(SInt16 qd_x, SInt16 qd_y, const CppCFString& candidates, bool showLast = false); + unsigned createAndShow(SInt16 qd_x, SInt16 qd_y, const CppCFString& candidates, int level, bool showLast = false); void windowNext(unsigned int window_id); void windowPrev(unsigned int window_id); void closeWindow(unsigned int window_id); Index: AquaSKK/CandidatesManager.mm diff -u AquaSKK/CandidatesManager.mm:1.6 AquaSKK/CandidatesManager.mm:1.7 --- AquaSKK/CandidatesManager.mm:1.6 Sat Jul 15 09:49:00 2006 +++ AquaSKK/CandidatesManager.mm Sat Nov 10 20:05:05 2007 @@ -1,10 +1,10 @@ /* -*- objc -*- - $Id: CandidatesManager.mm,v 1.6 2006/07/15 00:49:00 t-suwa Exp $ + $Id: CandidatesManager.mm,v 1.7 2007/11/10 11:05:05 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk - Copyright (C) 2005-2006 Tomotaka SUWA + Copyright (C) 2005-2007 Tomotaka SUWA 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 @@ -42,7 +42,8 @@ // empty } -unsigned CandidatesManager::createAndShow(SInt16 qd_x, SInt16 qd_y, const CppCFString& candidates, bool showLast) { +unsigned CandidatesManager::createAndShow(SInt16 qd_x, SInt16 qd_y, + const CppCFString& candidates, int level, bool showLast) { // NSArray ????????? std::vector cands_vec = candidates.split(SKK_MSG_DELIMITER); NSMutableArray* cands_array = [[NSMutableArray alloc] init]; @@ -83,6 +84,9 @@ window_x = screen.size.width - cwc_size.width; [[cwc window] setFrameOrigin:NSMakePoint(window_x,window_y)]; + // ????????????? + [[cwc window] setLevel:level]; + // ?Ž¦?? if(showLast) { [cwc setCurrentFrame:[cwc getNumOfFrames] - 1]; Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.51 AquaSKK/ChangeLog:1.52 --- AquaSKK/ChangeLog:1.51 Sat Oct 20 10:38:08 2007 +++ AquaSKK/ChangeLog Sat Nov 10 20:05:05 2007 @@ -1,3 +1,13 @@ +2007-11-10 Tomotaka SUWA + + * CandidatesManager.mm: ????³ã??????????å¿?? + + * ServerMessageReceiver.mm: ????³ã??????????å¿?? + + * KanjiConversionMode.cpp: ???????³ã???¡¨ç¤ºæ?????£ã?????????? + 渡ã????????´ã??¾ã???arbon ?¢ã???????????¼ã?????³ã?????????+ ???ä¿????+ 2007-10-20 Tomotaka SUWA * HanAscInputMode.cpp, ZenAscInputMode.cpp: ?²ã?????¢ã???????ç§?Index: AquaSKK/Info-AquaSKKInputMethod.plist diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.20 AquaSKK/Info-AquaSKKInputMethod.plist:1.21 --- AquaSKK/Info-AquaSKKInputMethod.plist:1.20 Sun Oct 14 11:29:58 2007 +++ AquaSKK/Info-AquaSKKInputMethod.plist Sat Nov 10 20:05:05 2007 @@ -19,11 +19,11 @@ CFBundlePackageType thng CFBundleShortVersionString - 3.5.1 + objc-gc 1.1 CFBundleSignature askk CFBundleVersion - 2007-10-14 + 2007-11-10 CSResourcesFileMapped tsInputMethodIconFileKey Index: AquaSKK/Info-AquaSKKServer.plist diff -u AquaSKK/Info-AquaSKKServer.plist:1.20 AquaSKK/Info-AquaSKKServer.plist:1.21 --- AquaSKK/Info-AquaSKKServer.plist:1.20 Sun Oct 14 11:29:58 2007 +++ AquaSKK/Info-AquaSKKServer.plist Sat Nov 10 20:05:05 2007 @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.5.1 + objc-gc 1.1 CFBundleSignature askk CFBundleVersion - 2007-10-14 + 2007-11-10 NSMainNibFile Principal NSPrincipalClass Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.15 AquaSKK/KanjiConversionMode.cpp:1.16 --- AquaSKK/KanjiConversionMode.cpp:1.15 Sat Oct 20 10:38:08 2007 +++ AquaSKK/KanjiConversionMode.cpp Sat Nov 10 20:05:05 2007 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.15 2007/10/20 01:38:08 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.16 2007/11/10 11:05:05 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -367,6 +367,10 @@ if(status == STATUS_NULL || status == STATUS_WHITE_ROOT && root.length() == 0) { status = STATUS_WHITE_ROOT; // ?½ã??¼ã??¸ã? + // Carbon ?¢ã???????????¼ã?????³ã??????????????????+ // ä¸?? "?? ???è¡?¤º???(Leopard 対ç?) + parent->display(CppCFString().append(0x25bd)); + // å°????????»®??????å®???? parent->getCurrentInputMode().handleInput(skkchar + 0x20); @@ -1163,6 +1167,15 @@ SInt16 qd_x = offset_to_pos_params.fReplyPoint.h; SInt16 qd_y = offset_to_pos_params.fReplyPoint.v; + // Carbon ?¢ã???????????³ã????å¾?????????????+ SInt32 level; + if(WindowRef active = ActiveNonFloatingWindow()) { + GetWindowGroupLevel(GetWindowGroup(active), &level); + ++ level; + } else { + level = kCGFloatingWindowLevel; + } + // ?µã?????????????CFData?????? CppCFData cands_to_be_attached; cands_to_be_attached.own(str_candidates.toCFData()); @@ -1170,6 +1183,7 @@ attachment.append(CFSwapInt16HostToBig(qd_x)); attachment.append(CFSwapInt16HostToBig(qd_y)); attachment.append(CFSwapInt16HostToBig(open_direction)); + attachment.append(CFSwapInt16HostToBig(level)); attachment.append(cands_to_be_attached); // ???¿¡ Index: AquaSKK/ServerMessageReceiver.mm diff -u AquaSKK/ServerMessageReceiver.mm:1.10 AquaSKK/ServerMessageReceiver.mm:1.11 --- AquaSKK/ServerMessageReceiver.mm:1.10 Sat Oct 13 00:28:45 2007 +++ AquaSKK/ServerMessageReceiver.mm Sat Nov 10 20:05:05 2007 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: ServerMessageReceiver.mm,v 1.10 2007/10/12 15:28:45 t-suwa Exp $ + $Id: ServerMessageReceiver.mm,v 1.11 2007/11/10 11:05:05 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -166,10 +166,11 @@ SInt16 qd_x = CFSwapInt16BigToHost(attachment.getSInt16(0)); SInt16 qd_y = CFSwapInt16BigToHost(attachment.getSInt16(2)); int showLast = CFSwapInt16BigToHost(attachment.getSInt16(4)); - CppCFString candidates(attachment.subdata(6).getData()); + int level = CFSwapInt16BigToHost(attachment.getSInt16(6)); + CppCFString candidates(attachment.subdata(8).getData()); CandidatesManager& cm = CandidatesManager::sharedManager(); - unsigned window_id = cm.createAndShow(qd_x, qd_y, candidates, showLast); + unsigned window_id = cm.createAndShow(qd_x, qd_y, candidates, level, showLast); CandidatesWindowController* cwc = cm.getWindowController(window_id); unsigned cands_per_frame = [cwc getCandidatesPerFrame]; From t-suwa ¡÷ users.sourceforge.jp Sun Nov 11 01:54:25 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Sun, 11 Nov 2007 01:54:25 +0900 Subject: [aquaskk-changes 433] CVS update: AquaSKK Message-ID: <1194713665.217017.21761.nullmailer@users.sourceforge.jp> Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.52 AquaSKK/ChangeLog:1.53 --- AquaSKK/ChangeLog:1.52 Sat Nov 10 20:05:05 2007 +++ AquaSKK/ChangeLog Sun Nov 11 01:54:24 2007 @@ -1,3 +1,8 @@ +2007-11-11 Tomotaka SUWA + + * KanjiConversionMode.cpp: ??????ç´¢ã? Spotlight æ¤?´¢?§å?è£???£ã? + ???????¢ã?è¡?¤º??????ä¸?????ä¿????+ 2007-11-10 Tomotaka SUWA * CandidatesManager.mm: ????³ã??????????å¿?? Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.16 AquaSKK/KanjiConversionMode.cpp:1.17 --- AquaSKK/KanjiConversionMode.cpp:1.16 Sat Nov 10 20:05:05 2007 +++ AquaSKK/KanjiConversionMode.cpp Sun Nov 11 01:54:25 2007 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.16 2007/11/10 11:05:05 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.17 2007/11/10 16:54:25 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -1147,6 +1147,42 @@ current_candidate_index, candidates.size(), mode); } +SInt32 getCandidatesWindowLevel(const Point& pt) { + WindowRef active; + SInt32 level; + + // ????½ã?ä½?½®????£ã???????? + switch(FindWindow(pt, &active)) { + case inMenuBar: // ??????ç´?+ return kCGMainMenuWindowLevel + 1; + + case inContent: // Carbon ????³ã???+ GetWindowGroupLevel(GetWindowGroup(active), &level); + return level + 1; + } + + // ?????????????³ã??????? + level = kCGFloatingWindowLevel; + + // Spotlight ???????¹å??????+ CFBundleRef mainBundle = CFBundleGetMainBundle(); + if(mainBundle) { + CFRetain(mainBundle); + CFStringRef id = CFBundleGetIdentifier(mainBundle); + CFRelease(mainBundle); + + if(id) { + CFRetain(id); + if(CFStringCompare(id, CFSTR("com.apple.spotlight"), kCFCompareCaseInsensitive) == 0) { + level = kCGPopUpMenuWindowLevel; + } + CFRelease(id); + } + } + + return level; +} + // ????³ã? void openCandidatesWindow(const CppCFString& str_candidates, unsigned& window_id, @@ -1167,15 +1203,9 @@ SInt16 qd_x = offset_to_pos_params.fReplyPoint.h; SInt16 qd_y = offset_to_pos_params.fReplyPoint.v; - // Carbon ?¢ã???????????³ã????å¾?????????????- SInt32 level; - if(WindowRef active = ActiveNonFloatingWindow()) { - GetWindowGroupLevel(GetWindowGroup(active), &level); - ++ level; - } else { - level = kCGFloatingWindowLevel; - } - + // ???????³ã????????????? + SInt32 level = getCandidatesWindowLevel(offset_to_pos_params.fReplyPoint); + // ?µã?????????????CFData?????? CppCFData cands_to_be_attached; cands_to_be_attached.own(str_candidates.toCFData()); From t-suwa ¡÷ users.sourceforge.jp Sun Nov 11 14:18:53 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Sun, 11 Nov 2007 14:18:53 +0900 Subject: [aquaskk-changes 434] CVS update: AquaSKK Message-ID: <1194758333.213330.5244.nullmailer@users.sourceforge.jp> Index: AquaSKK/AsciiConversionMode.cpp diff -u AquaSKK/AsciiConversionMode.cpp:1.12 AquaSKK/AsciiConversionMode.cpp:1.13 --- AquaSKK/AsciiConversionMode.cpp:1.12 Sat Oct 20 10:38:08 2007 +++ AquaSKK/AsciiConversionMode.cpp Sun Nov 11 14:18:52 2007 @@ -1,5 +1,5 @@ /* - $Id: AsciiConversionMode.cpp,v 1.12 2007/10/20 01:38:08 t-suwa Exp $ + $Id: AsciiConversionMode.cpp,v 1.13 2007/11/11 05:18:52 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -648,6 +648,8 @@ current_candidate_index, candidates.size(), mode); + + parent->setWindowID(candidates_window_id); } void AsciiConversionMode::goToNextCandidatesFrame() { @@ -682,4 +684,6 @@ // ????³ã???D(UInt16)?????FData??????????¸é???? ServerConnectionFactory::theInstance().newConnection(). send(kSKKCloseCandidatesWindow, newCFDataRefWithWindowID(candidates_window_id)); + + parent->clearWindowID(); } Index: AquaSKK/BIM.cpp diff -u AquaSKK/BIM.cpp:1.16 AquaSKK/BIM.cpp:1.17 --- AquaSKK/BIM.cpp:1.16 Sat Feb 3 13:04:21 2007 +++ AquaSKK/BIM.cpp Sun Nov 11 14:18:52 2007 @@ -1,5 +1,5 @@ /* - $Id: BIM.cpp,v 1.16 2007/02/03 04:04:21 t-suwa Exp $ + $Id: BIM.cpp,v 1.17 2007/11/11 05:18:52 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -224,6 +224,15 @@ } } +CppCFData getWindowID(BIMSessionHandle inSessionHandle) { + CppCFData data; + + IMSessionInputMode* session = (*inSessionHandle)->imsession_input_mode; + data.append(CFSwapInt16HostToBig(session->getWindowID())); + + return data; +} + // ?????????????? ComponentResult BIMSessionActivate(BIMSessionHandle inSessionHandle) { ActiveSession::theInstance().Add(inSessionHandle); @@ -231,8 +240,9 @@ // ??????? ClientConfiguration::theInstance().reloadConfiguration(); - // ???????????????? - ServerConnectionFactory::theInstance().newConnection().send(kBasicMessageActivated); + // ??????????????????? + ServerConnectionFactory::theInstance().newConnection().send(kBasicMessageActivated, + getWindowID(inSessionHandle)); // ???????????????? InitializeKeyboardLayout(); @@ -244,10 +254,9 @@ ComponentResult BIMSessionDeactivate(BIMSessionHandle inSessionHandle) { ActiveSession::theInstance().Remove(inSessionHandle); - // ??????????????????? - if(ActiveSession::theInstance().Count() == 0) { - ServerConnectionFactory::theInstance().newConnection().send(kBasicMessageDeactivated); - } + // ????????????????????? + ServerConnectionFactory::theInstance().newConnection().send(kBasicMessageDeactivated, + getWindowID(inSessionHandle)); return 0; } Index: AquaSKK/CandidatesManager.h diff -u AquaSKK/CandidatesManager.h:1.5 AquaSKK/CandidatesManager.h:1.6 --- AquaSKK/CandidatesManager.h:1.5 Sat Nov 10 20:05:05 2007 +++ AquaSKK/CandidatesManager.h Sun Nov 11 14:18:52 2007 @@ -1,5 +1,5 @@ /* - $Id: CandidatesManager.h,v 1.5 2007/11/10 11:05:05 t-suwa Exp $ + $Id: CandidatesManager.h,v 1.6 2007/11/11 05:18:52 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -40,5 +40,7 @@ void windowNext(unsigned int window_id); void windowPrev(unsigned int window_id); void closeWindow(unsigned int window_id); + void showWindow(unsigned int window_id); + void hideWindow(unsigned int window_id); CandidatesWindowController* getWindowController(unsigned window_id); }; Index: AquaSKK/CandidatesManager.mm diff -u AquaSKK/CandidatesManager.mm:1.7 AquaSKK/CandidatesManager.mm:1.8 --- AquaSKK/CandidatesManager.mm:1.7 Sat Nov 10 20:05:05 2007 +++ AquaSKK/CandidatesManager.mm Sun Nov 11 14:18:52 2007 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: CandidatesManager.mm,v 1.7 2007/11/10 11:05:05 t-suwa Exp $ + $Id: CandidatesManager.mm,v 1.8 2007/11/11 05:18:52 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -115,6 +115,18 @@ cand_windows[window_id] = NULL; } +void CandidatesManager::showWindow(unsigned int window_id) { + CandidatesWindowController* cwc = cand_windows[window_id]; + + [[cwc window] orderFront:nil]; +} + +void CandidatesManager::hideWindow(unsigned int window_id) { + CandidatesWindowController* cwc = cand_windows[window_id]; + + [[cwc window] orderOut:nil]; +} + CandidatesWindowController* CandidatesManager::getWindowController(unsigned window_id) { return cand_windows[window_id]; } Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.53 AquaSKK/ChangeLog:1.54 --- AquaSKK/ChangeLog:1.53 Sun Nov 11 01:54:24 2007 +++ AquaSKK/ChangeLog Sun Nov 11 14:18:52 2007 @@ -1,5 +1,11 @@ 2007-11-11 Tomotaka SUWA + * BIM.cpp, ParentInputMode.*, *ConversionMode.cpp, + ServerMessageReceiver.*: ???????³ã?????¢ã????????»é??¢ã??????+ ???対å???+ + * CandidatesManager.*: showWindow() ??hideWindow() ??¿½??? + * KanjiConversionMode.cpp: ??????ç´¢ã? Spotlight æ¤?´¢?§å?è£???£ã? ???????¢ã?è¡?¤º??????ä¸?????ä¿???? Index: AquaSKK/Info-AquaSKKInputMethod.plist diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.21 AquaSKK/Info-AquaSKKInputMethod.plist:1.22 --- AquaSKK/Info-AquaSKKInputMethod.plist:1.21 Sat Nov 10 20:05:05 2007 +++ AquaSKK/Info-AquaSKKInputMethod.plist Sun Nov 11 14:18:52 2007 @@ -23,7 +23,7 @@ CFBundleSignature askk CFBundleVersion - 2007-11-10 + 2007-11-11 CSResourcesFileMapped tsInputMethodIconFileKey Index: AquaSKK/Info-AquaSKKServer.plist diff -u AquaSKK/Info-AquaSKKServer.plist:1.21 AquaSKK/Info-AquaSKKServer.plist:1.22 --- AquaSKK/Info-AquaSKKServer.plist:1.21 Sat Nov 10 20:05:05 2007 +++ AquaSKK/Info-AquaSKKServer.plist Sun Nov 11 14:18:52 2007 @@ -23,7 +23,7 @@ CFBundleSignature askk CFBundleVersion - 2007-11-10 + 2007-11-11 NSMainNibFile Principal NSPrincipalClass Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.17 AquaSKK/KanjiConversionMode.cpp:1.18 --- AquaSKK/KanjiConversionMode.cpp:1.17 Sun Nov 11 01:54:25 2007 +++ AquaSKK/KanjiConversionMode.cpp Sun Nov 11 14:18:52 2007 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.17 2007/11/10 16:54:25 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.18 2007/11/11 05:18:52 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -1145,6 +1145,8 @@ candidates_window_num_of_frames, candidates_window_current_frame, current_candidate_index, candidates.size(), mode); + + parent->setWindowID(candidates_window_id); } SInt32 getCandidatesWindowLevel(const Point& pt) { @@ -1277,6 +1279,8 @@ // ????³ã???D(UInt16)?????FData??????????¸é???? ServerConnectionFactory::theInstance().newConnection(). send(kSKKCloseCandidatesWindow, newCFDataRefWithWindowID(candidates_window_id)); + + parent->clearWindowID(); } void mergeCandidates(const NumericConverter& numconv, Index: AquaSKK/ParentInputMode.cpp diff -u AquaSKK/ParentInputMode.cpp:1.7 AquaSKK/ParentInputMode.cpp:1.8 --- AquaSKK/ParentInputMode.cpp:1.7 Sat Oct 20 10:38:08 2007 +++ AquaSKK/ParentInputMode.cpp Sun Nov 11 14:18:52 2007 @@ -1,5 +1,5 @@ /* - $Id: ParentInputMode.cpp,v 1.7 2007/10/20 01:38:08 t-suwa Exp $ + $Id: ParentInputMode.cpp,v 1.8 2007/11/11 05:18:52 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -44,17 +44,17 @@ #include "SKKConfig.h" ParentInputMode::ParentInputMode() - :hiragana_input_mode(*this), - zen_kata_input_mode(*this), - han_kata_input_mode(*this), - han_asc_input_mode(*this), - zen_asc_input_mode(*this), - kanji_conversion_mode(*this), - ascii_conversion_mode(*this), - is_kanji_mode(false), - is_ascii_conv_mode(false), - current_input_mode(&hiragana_input_mode) { - // empty + : hiragana_input_mode(*this), + zen_kata_input_mode(*this), + han_kata_input_mode(*this), + han_asc_input_mode(*this), + zen_asc_input_mode(*this), + kanji_conversion_mode(*this), + ascii_conversion_mode(*this), + is_kanji_mode(false), + is_ascii_conv_mode(false), + current_input_mode(&hiragana_input_mode) { + clearWindowID(); } ParentInputMode::~ParentInputMode() { @@ -317,3 +317,15 @@ redisplay(); } } + +void ParentInputMode::setWindowID(unsigned short id) { + windowID_ = id; +} + +void ParentInputMode::clearWindowID() { + windowID_ = 0xffff; +} + +unsigned short ParentInputMode::getWindowID() const { + return windowID_; +} Index: AquaSKK/ParentInputMode.h diff -u AquaSKK/ParentInputMode.h:1.6 AquaSKK/ParentInputMode.h:1.7 --- AquaSKK/ParentInputMode.h:1.6 Wed May 17 01:13:10 2006 +++ AquaSKK/ParentInputMode.h Sun Nov 11 14:18:52 2007 @@ -1,10 +1,10 @@ /* - $Id: ParentInputMode.h,v 1.6 2006/05/16 16:13:10 t-suwa Exp $ + $Id: ParentInputMode.h,v 1.7 2007/11/11 05:18:52 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk - Copyright (C) 2006 Tomotaka SUWA + Copyright (C) 2006-2007 Tomotaka SUWA 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 @@ -51,6 +51,8 @@ class ChildInputMode; class ParentInputMode: public InputMode { + unsigned short windowID_; + protected: HiraganaInputMode hiragana_input_mode; ZenKataInputMode zen_kata_input_mode; @@ -124,6 +126,10 @@ // ?????Ž¦???????????????Ž¦??????????????? virtual void display(const CppCFString& str_to_display) = 0; + + void setWindowID(unsigned short id); + void clearWindowID(); + unsigned short getWindowID() const; }; #endif // INC__ParentInputMode__ Index: AquaSKK/ServerMessageReceiver.h diff -u AquaSKK/ServerMessageReceiver.h:1.6 AquaSKK/ServerMessageReceiver.h:1.7 --- AquaSKK/ServerMessageReceiver.h:1.6 Tue Jun 12 23:25:08 2007 +++ AquaSKK/ServerMessageReceiver.h Sun Nov 11 14:18:52 2007 @@ -1,5 +1,5 @@ /* - $Id: ServerMessageReceiver.h,v 1.6 2007/06/12 14:25:08 t-suwa Exp $ + $Id: ServerMessageReceiver.h,v 1.7 2007/11/11 05:18:52 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -51,6 +51,8 @@ void showPreferencesBox(); CppCFData fetchCompletions(const CppCFData& attachment); CppCFData valueForKey(NSString* key); + void showCandidatesWindow(const CppCFData& data); + void hideCandidatesWindow(const CppCFData& data); public: static void start(const CFStringRef loopMode); Index: AquaSKK/ServerMessageReceiver.mm diff -u AquaSKK/ServerMessageReceiver.mm:1.11 AquaSKK/ServerMessageReceiver.mm:1.12 --- AquaSKK/ServerMessageReceiver.mm:1.11 Sat Nov 10 20:05:05 2007 +++ AquaSKK/ServerMessageReceiver.mm Sun Nov 11 14:18:52 2007 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: ServerMessageReceiver.mm,v 1.11 2007/11/10 11:05:05 t-suwa Exp $ + $Id: ServerMessageReceiver.mm,v 1.12 2007/11/11 05:18:52 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -70,69 +70,87 @@ switch(msgid) { case kBasicMessageActivated: // ????¤ã??³ã????????£ã?????£ã? ClientConnectionFactory::theInstance().setDefaultTarget(header.fProcessSerialNumber); + showCandidatesWindow(body); break; + case kBasicMessageDeactivated: { // ????¤ã??³ã????????£ã??§ã??????? ProcessSerialNumber psn; psn.highLongOfPSN = 0; psn.lowLongOfPSN = kNoProcess; - ClientConnectionFactory::theInstance().setDefaultTarget(psn); + hideCandidatesWindow(body); break; } + case kBasicMessageHidePalettes: // ??????????????SM?????¤º????£ã? break; + case kSKKMessageSearch: reply = searchWord(body); break; + case kSKKCreateCandidatesWindow: reply = createCandidatesWindow(body); break; + case kSKKCandidatesWindowNext: reply = candidatesWindowNext(body); break; + case kSKKCandidatesWindowPrev: reply = candidatesWindowPrev(body); break; + case kSKKCloseCandidatesWindow: closeCandidatesWindow(body); break; + case kSKKRegisterThisToUserDic: registerThisToUserDic(body); break; + case kSKKRegisterToggleEntry: registerToggleEntry(body); break; + case kSKKRemoveThisFromUserDic: removeThisFromUserDic(body); break; + case kSKKShowAboutBox: showAboutBox(); break; + case kSKKShowPreferencesBox: showPreferencesBox(); break; + case kSKKShowWordRegistrationBox: break; + case kSKKFetchCompletions: reply = fetchCompletions(body); break; + case kBasicMessageIsSkkEggLikeNewline: reply = valueForKey(KEY_egg_like_newline); break; + case kBasicMessageIsNumericKeypad_HalfWidth: reply = valueForKey(KEY_numkeypad_use_halfwidth); break; + case kBasicMessageIsAsciiModeStartup: reply = valueForKey(KEY_force_ascii_mode_startup); break; + case kBasicMessageUseNumericConversion: reply = valueForKey(KEY_use_numeric_conversion); break; + case kBasicMessageKbdLayoutId: reply = valueForKey(KEY_keyboard_layout_id); break; - default: - break; } return reply; @@ -292,3 +310,19 @@ return CppCFData(&result, sizeof(result)); } + +void ServerMessageReceiver::showCandidatesWindow(const CppCFData& data) { + unsigned short window_id = CFSwapInt16BigToHost(data.getUInt16(0)); + if(window_id == 0xffff) return; + + CandidatesManager& cm = CandidatesManager::sharedManager(); + cm.showWindow(window_id); +} + +void ServerMessageReceiver::hideCandidatesWindow(const CppCFData& data) { + unsigned short window_id = CFSwapInt16BigToHost(data.getUInt16(0)); + if(window_id == 0xffff) return; + + CandidatesManager& cm = CandidatesManager::sharedManager(); + cm.hideWindow(window_id); +} From t-suwa ¡÷ users.sourceforge.jp Sun Nov 11 19:23:16 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Sun, 11 Nov 2007 19:23:16 +0900 Subject: [aquaskk-changes 435] CVS update: AquaSKK Message-ID: <1194776596.470985.29550.nullmailer@users.sourceforge.jp> Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.18 AquaSKK/KanjiConversionMode.cpp:1.19 --- AquaSKK/KanjiConversionMode.cpp:1.18 Sun Nov 11 14:18:52 2007 +++ AquaSKK/KanjiConversionMode.cpp Sun Nov 11 19:23:16 2007 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.18 2007/11/11 05:18:52 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.19 2007/11/11 10:23:16 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -1175,9 +1175,12 @@ if(id) { CFRetain(id); - if(CFStringCompare(id, CFSTR("com.apple.spotlight"), kCFCompareCaseInsensitive) == 0) { + + if(CFStringCompare(id, CFSTR("com.apple.spotlight"), kCFCompareCaseInsensitive) == 0 || + CFStringCompare(id, CFSTR("com.apple.systemuiserver"), kCFCompareCaseInsensitive) == 0) { level = kCGPopUpMenuWindowLevel; } + CFRelease(id); } } From t-suwa ¡÷ users.sourceforge.jp Mon Nov 19 23:13:36 2007 From: t-suwa ¡÷ users.sourceforge.jp (t-suwa ¡÷ users.sourceforge.jp) Date: Mon, 19 Nov 2007 23:13:36 +0900 Subject: [aquaskk-changes 436] CVS update: AquaSKK Message-ID: <1195481616.907926.30390.nullmailer@users.sourceforge.jp> Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.54 AquaSKK/ChangeLog:1.55 --- AquaSKK/ChangeLog:1.54 Sun Nov 11 14:18:52 2007 +++ AquaSKK/ChangeLog Mon Nov 19 23:13:36 2007 @@ -1,3 +1,8 @@ +2007-11-19 Tomotaka SUWA + + * SKKDictionary.cpp: ????´æ?è¾???????????????¥å??§è?????????+ ????????????è¾???????????????¹å???+ 2007-11-11 Tomotaka SUWA * BIM.cpp, ParentInputMode.*, *ConversionMode.cpp, Index: AquaSKK/SKKDictionary.cpp diff -u AquaSKK/SKKDictionary.cpp:1.16 AquaSKK/SKKDictionary.cpp:1.17 --- AquaSKK/SKKDictionary.cpp:1.16 Wed Sep 19 22:57:17 2007 +++ AquaSKK/SKKDictionary.cpp Mon Nov 19 23:13:36 2007 @@ -1,10 +1,10 @@ /* - $Id: SKKDictionary.cpp,v 1.16 2007/09/19 13:57:17 t-suwa Exp $ + $Id: SKKDictionary.cpp,v 1.17 2007/11/19 14:13:36 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002 phonohawk - Copyright (C) 2005-2006 Tomotaka SUWA + Copyright (C) 2005-2007 Tomotaka SUWA 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 @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -333,28 +334,32 @@ session << "Connection: close" << std::endl; session << std::endl; - // ????????+ // ?´æ????????¸ã??µã??ºã??????? std::string response; - bool modified = false; - while(true) { - getline(session, response); - if(response.find("200 OK") != std::string::npos) { - modified = true; + int length = 0; + while(std::getline(session, response) && response != "\r") { + if(response.find("Content-Length") != std::string::npos) { + std::istringstream buf(response); + buf >> response >> length; } - if(response == "\r") break; } - // å¤??????????????????????????????????- if(modified) { - std::ofstream ofs(obj->path_.c_str()); - while(session.good()) { - getline(session, response); + // ?´æ????????????????????????+ if(length) { + std::string path(obj->path_); + path += ".download"; + std::ofstream ofs(path.c_str()); + while(std::getline(session, response)) { ofs << response << std::endl; } ofs.close(); - obj->reloadContainer(); - std::cerr << "SKKAutoUpdateDictionary: " << obj->path_ << " has been updated" << std::endl; + // å®?????????????????????????+ if(stat(path.c_str(), &st) == 0 && st.st_size == length) { + rename(path.c_str(), obj->path_.c_str()); + obj->reloadContainer(); + std::cerr << "SKKAutoUpdateDictionary: " << obj->path_ << " has been updated" << std::endl; + } } } else { std::cerr << "SKKAutoUpdateDictionary: can't connect to [" << obj->host_ << "]" << std::endl;