From t-suwa ＠ users.sourceforge.jp Mon Sep 5 10:01:35 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Mon, 5 Sep 2005 10:01:35 +0900 Subject: [aquaskk-changes 26] CVS update: AquaSKK Message-ID: <20050905010135.B72B22AC014@users.sourceforge.jp> Index: AquaSKK/BIM.cpp diff -u AquaSKK/BIM.cpp:1.1.1.2 AquaSKK/BIM.cpp:1.2 --- AquaSKK/BIM.cpp:1.1.1.2 Sun Jul 17 19:50:26 2005 +++ AquaSKK/BIM.cpp Mon Sep 5 10:01:35 2005 @@ -1,4 +1,4 @@ -/* $Id: BIM.cpp,v 1.1.1.2 2005/07/17 10:50:26 t-suwa Exp $ +/* $Id: BIM.cpp,v 1.2 2005/09/05 01:01:35 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -269,7 +269,7 @@ handled = BIMHandleInput(inSessionHandle, SkkConfig::config().setHenkanPointKey()); } else { - handled = BIMHandleInput(inSessionHandle, SkkConfig::config().latinModeKey()); + handled = true; } } else if (keyCode == 0x68) { // ?? Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.2 AquaSKK/ChangeLog:1.3 --- AquaSKK/ChangeLog:1.2 Mon Jul 18 20:53:25 2005 +++ AquaSKK/ChangeLog Mon Sep 5 10:01:35 2005 @@ -1,3 +1,12 @@ +2005-09-05 Tomotaka SUWA + + * BIM.cpp: ??????????????B??????????? + 'l' ??????????????? + +2005-08-27 Tomotaka SUWA + + * BIM.r: cbnm ???? + 2005-07-18 Tomotaka SUWA * Info-AquaSKK*.plist: ?????? 2.0 ???B From t-suwa ＠ users.sourceforge.jp Tue Sep 6 10:25:12 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Tue, 6 Sep 2005 10:25:12 +0900 Subject: [aquaskk-changes 27] CVS update: AquaSKK Message-ID: <20050906012512.B242E2AC019@users.sourceforge.jp> Index: AquaSKK/BIM.cpp diff -u AquaSKK/BIM.cpp:1.2 AquaSKK/BIM.cpp:1.3 --- AquaSKK/BIM.cpp:1.2 Mon Sep 5 10:01:35 2005 +++ AquaSKK/BIM.cpp Tue Sep 6 10:25:12 2005 @@ -1,4 +1,4 @@ -/* $Id: BIM.cpp,v 1.2 2005/09/05 01:01:35 t-suwa Exp $ +/* $Id: BIM.cpp,v 1.3 2005/09/06 01:25:12 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -437,7 +437,7 @@ // BIM.r ??? cd.componentType = 'tsvc'; cd.componentSubType = 'inpm'; - cd.componentManufacturer = 'ccm '; + cd.componentManufacturer = 'askk'; cd.componentFlags = 0; cd.componentFlagsMask = 0; Index: AquaSKK/BIM.r diff -u AquaSKK/BIM.r:1.2 AquaSKK/BIM.r:1.3 --- AquaSKK/BIM.r:1.2 Sat Aug 27 22:46:32 2005 +++ AquaSKK/BIM.r Tue Sep 6 10:25:12 2005 @@ -1,5 +1,5 @@ /* - $Id: BIM.r,v 1.2 2005/08/27 13:46:32 t-suwa Exp $ + $Id: BIM.r,v 1.3 2005/09/06 01:25:12 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -35,7 +35,7 @@ { 'tsvc', // ???????????TextService???'tsvc' 'inpm', // ?????????????InputMethod???'inpm' - 'ccm ', // ????????????? + 'askk', // ????????????? 0x8000 + kBIMScript * 0x100 + kBIMLanguage, // ???? kAnyComponentFlagsMask, // kAnyComponentFlagsMask?????????? 'dlle', kBaseResourceID, // ???????????Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.3 AquaSKK/ChangeLog:1.4 --- AquaSKK/ChangeLog:1.3 Mon Sep 5 10:01:35 2005 +++ AquaSKK/ChangeLog Tue Sep 6 10:25:12 2005 @@ -1,3 +1,18 @@ +2005-09-06 Tomotaka SUWA + + * AquaSKK.xcodeproj, AquaSKK.pbproj: Info.plist ????????? + + * BIM.cpp, BIM.r: ???????? 'askk' ???? + + * Info-AquaSKKInputMethod.plist: + Info-AquaSKKInputMethod__Upgraded_.plist ????????????? + 2.2 ???B + + * Info-AquaSKKServer.plist: Info-AquaSKKServer__Upgraded_.plist ? + ???????????? 2.2 ???B + + * util/StringTokenizer.*: ?????????ﾀ?? + 2005-09-05 Tomotaka SUWA * BIM.cpp: ??????????????B??????????? @@ -5,7 +20,8 @@ 2005-08-27 Tomotaka SUWA - * BIM.r: cbnm ???? + * BIM.r: cbnm ??????????Panther ???????????? + ?ｦ???????? 2005-07-18 Tomotaka SUWA Index: AquaSKK/Info-AquaSKKInputMethod.plist diff -u /dev/null AquaSKK/Info-AquaSKKInputMethod.plist:1.1 --- /dev/null Tue Sep 6 10:25:12 2005 +++ AquaSKK/Info-AquaSKKInputMethod.plist Tue Sep 6 10:25:12 2005 @@ -0,0 +1,157 @@ + + + + + CFBundleDevelopmentRegion + Japanese + CFBundleExecutable + AquaSKKInputMethod + CFBundleGetInfoString + Copyright 息 2002-2005 phonohawk + CFBundleIconFile + + CFBundleIdentifier + org.ccm-software.AquaSKKInputMethod + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + AquaSKK Input Method + CFBundlePackageType + thng + CFBundleShortVersionString + 2.2 + CFBundleSignature + askk + CFBundleVersion + 2005-09-06 + CSResourcesFileMapped + + ComponentInputModeDict + + tsInputModeListKey + + com.apple.inputmethod.Japanese + + tsInputModeAlternateMenuIconFileKey + AquaSKK-Hirakana.tif + tsInputModeDefaultStateKey + + tsInputModeIsVisibleKey + + tsInputModeJISKeyboardShortcutKey + 1 + tsInputModeKeyEquivalentKey + J + tsInputModeKeyEquivalentModifiersKey + 4096 + tsInputModeMenuIconFileKey + AquaSKK-Hirakana.tif + tsInputModePaletteIconFileKey + AquaSKK-Hirakana.tif + tsInputModePrimaryInScriptKey + + tsInputModeScriptKey + smJapanese + + com.apple.inputmethod.Japanese.FullWidthRoman + + tsInputModeAlternateMenuIconFileKey + AquaSKK-FullRoman.tif + tsInputModeDefaultStateKey + + tsInputModeIsVisibleKey + + tsInputModeJISKeyboardShortcutKey + 0 + tsInputModeKeyEquivalentKey + L + tsInputModeKeyEquivalentModifiersKey + 512 + tsInputModeMenuIconFileKey + AquaSKK-FullRoman.tif + tsInputModePaletteIconFileKey + AquaSKK-FullRoman.tif + tsInputModePrimaryInScriptKey + + tsInputModeScriptKey + smJapanese + + com.apple.inputmethod.Japanese.HalfWidthKana + + tsInputModeAlternateMenuIconFileKey + AquaSKK-HalfKatakana.tif + tsInputModeDefaultStateKey + + tsInputModeIsVisibleKey + + tsInputModeKeyEquivalentKey + Q + tsInputModeKeyEquivalentModifiersKey + 4096 + tsInputModeMenuIconFileKey + AquaSKK-HalfKatakana.tif + tsInputModePaletteIconFileKey + HalfKatakana.tif + tsInputModePrimaryInScriptKey + + tsInputModeScriptKey + smJapanese + + com.apple.inputmethod.Japanese.Katakana + + tsInputModeAlternateMenuIconFileKey + AquaSKK-Katakana.tif + tsInputModeDefaultStateKey + + tsInputModeIsVisibleKey + + tsInputModeJISKeyboardShortcutKey + 2 + tsInputModeKeyEquivalentKey + Q + tsInputModeKeyEquivalentModifiersKey + 0 + tsInputModeMenuIconFileKey + AquaSKK-Katakana.tif + tsInputModePaletteIconFileKey + AquaSKK-Katakana.tif + tsInputModePrimaryInScriptKey + + tsInputModeScriptKey + smJapanese + + com.apple.inputmethod.Roman + + tsInputModeAlternateMenuIconFileKey + AquaSKK-Roman.tif + tsInputModeDefaultStateKey + + tsInputModeIsVisibleKey + + tsInputModeJISKeyboardShortcutKey + 3 + tsInputModeKeyEquivalentKey + l + tsInputModeKeyEquivalentModifiersKey + 0 + tsInputModeMenuIconFileKey + AquaSKK-Roman.tif + tsInputModePaletteIconFileKey + AquaSKK-Roman.tif + tsInputModePrimaryInScriptKey + + tsInputModeScriptKey + smRoman + + + tsVisibleInputModeOrderedArrayKey + + com.apple.inputmethod.Japanese + com.apple.inputmethod.Japanese.Katakana + com.apple.inputmethod.Japanese.FullWidthRoman + com.apple.inputmethod.Japanese.HalfWidthKana + com.apple.inputmethod.Roman + + + + Index: AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist diff -u AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist:1.2 AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist:removed --- AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist:1.2 Mon Jul 18 20:53:25 2005 +++ AquaSKK/Info-AquaSKKInputMethod__Upgraded_.plist Tue Sep 6 10:25:12 2005 @@ -1,157 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - AquaSKKInputMethod - CFBundleGetInfoString - Copyright 息 2002-2005 phonohawk - CFBundleIconFile - - CFBundleIdentifier - org.ccm-software.AquaSKKInputMethod - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - AquaSKK Input Method - CFBundlePackageType - thng - CFBundleShortVersionString - AquaSKK 2.0 - CFBundleSignature - - CFBundleVersion - 2.0 - CSResourcesFileMapped - - ComponentInputModeDict - - tsInputModeListKey - - com.apple.inputmethod.Japanese - - tsInputModeAlternateMenuIconFileKey - AquaSKK-Hirakana.tif - tsInputModeDefaultStateKey - - tsInputModeIsVisibleKey - - tsInputModeJISKeyboardShortcutKey - 1 - tsInputModeKeyEquivalentKey - J - tsInputModeKeyEquivalentModifiersKey - 4096 - tsInputModeMenuIconFileKey - AquaSKK-Hirakana.tif - tsInputModePaletteIconFileKey - AquaSKK-Hirakana.tif - tsInputModePrimaryInScriptKey - - tsInputModeScriptKey - smJapanese - - com.apple.inputmethod.Japanese.Katakana - - tsInputModeAlternateMenuIconFileKey - AquaSKK-Katakana.tif - tsInputModeDefaultStateKey - - tsInputModeIsVisibleKey - - tsInputModeJISKeyboardShortcutKey - 2 - tsInputModeKeyEquivalentKey - Q - tsInputModeKeyEquivalentModifiersKey - 0 - tsInputModeMenuIconFileKey - AquaSKK-Katakana.tif - tsInputModePaletteIconFileKey - AquaSKK-Katakana.tif - tsInputModePrimaryInScriptKey - - tsInputModeScriptKey - smJapanese - - com.apple.inputmethod.Japanese.FullWidthRoman - - tsInputModeAlternateMenuIconFileKey - AquaSKK-FullRoman.tif - tsInputModeDefaultStateKey - - tsInputModeIsVisibleKey - - tsInputModeJISKeyboardShortcutKey - 0 - tsInputModeKeyEquivalentKey - L - tsInputModeKeyEquivalentModifiersKey - 512 - tsInputModeMenuIconFileKey - AquaSKK-FullRoman.tif - tsInputModePaletteIconFileKey - AquaSKK-FullRoman.tif - tsInputModePrimaryInScriptKey - - tsInputModeScriptKey - smJapanese - - com.apple.inputmethod.Japanese.HalfWidthKana - - tsInputModeAlternateMenuIconFileKey - AquaSKK-HalfKatakana.tif - tsInputModeDefaultStateKey - - tsInputModeIsVisibleKey - - tsInputModeKeyEquivalentKey - Q - tsInputModeKeyEquivalentModifiersKey - 4096 - tsInputModeMenuIconFileKey - AquaSKK-HalfKatakana.tif - tsInputModePaletteIconFileKey - HalfKatakana.tif - tsInputModePrimaryInScriptKey - - tsInputModeScriptKey - smJapanese - - com.apple.inputmethod.Roman - - tsInputModeAlternateMenuIconFileKey - AquaSKK-Roman.tif - tsInputModeDefaultStateKey - - tsInputModeIsVisibleKey - - tsInputModeJISKeyboardShortcutKey - 3 - tsInputModeKeyEquivalentKey - l - tsInputModeKeyEquivalentModifiersKey - 0 - tsInputModeMenuIconFileKey - AquaSKK-Roman.tif - tsInputModePaletteIconFileKey - AquaSKK-Roman.tif - tsInputModePrimaryInScriptKey - - tsInputModeScriptKey - smRoman - - - tsVisibleInputModeOrderedArrayKey - - com.apple.inputmethod.Japanese - com.apple.inputmethod.Japanese.Katakana - com.apple.inputmethod.Japanese.FullWidthRoman - com.apple.inputmethod.Japanese.HalfWidthKana - com.apple.inputmethod.Roman - - - - Index: AquaSKK/Info-AquaSKKServer.plist diff -u /dev/null AquaSKK/Info-AquaSKKServer.plist:1.1 --- /dev/null Tue Sep 6 10:25:12 2005 +++ AquaSKK/Info-AquaSKKServer.plist Tue Sep 6 10:25:12 2005 @@ -0,0 +1,34 @@ + + + + + CFBundleDevelopmentRegion + Japanese + CFBundleExecutable + AquaSKKServer + CFBundleGetInfoString + Copyright 息 2002-2005 phonohawk + CFBundleIconFile + + CFBundleIdentifier + org.ccm-software.AquaSKKServer + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + AquaSKK Server + CFBundlePackageType + APPL + CFBundleShortVersionString + 2.2 + CFBundleSignature + askk + CFBundleVersion + 2005-09-06 + NSMainNibFile + Principal + NSPrincipalClass + NSApplication + NSUIElement + 1 + + Index: AquaSKK/Info-AquaSKKServer__Upgraded_.plist diff -u AquaSKK/Info-AquaSKKServer__Upgraded_.plist:1.2 AquaSKK/Info-AquaSKKServer__Upgraded_.plist:removed --- AquaSKK/Info-AquaSKKServer__Upgraded_.plist:1.2 Mon Jul 18 20:53:25 2005 +++ AquaSKK/Info-AquaSKKServer__Upgraded_.plist Tue Sep 6 10:25:12 2005 @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - AquaSKKServer - CFBundleGetInfoString - Copyright 息 2002-2005 phonohawk - CFBundleIconFile - - CFBundleIdentifier - org.ccm-software.AquaSKKServer - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - AquaSKK Server - CFBundlePackageType - APPL - CFBundleShortVersionString - AquaSKK 2.0 - CFBundleSignature - - CFBundleVersion - 2.0 - NSMainNibFile - Principal - NSPrincipalClass - NSApplication - NSUIElement - 1 - - From t-suwa ＠ users.sourceforge.jp Tue Sep 6 10:25:12 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Tue, 6 Sep 2005 10:25:12 +0900 Subject: [aquaskk-changes 28] CVS update: AquaSKK/AquaSKK.pbproj Message-ID: <20050906012512.D82B72AC035@users.sourceforge.jp> Index: AquaSKK/AquaSKK.pbproj/project.pbxproj diff -u AquaSKK/AquaSKK.pbproj/project.pbxproj:1.2 AquaSKK/AquaSKK.pbproj/project.pbxproj:1.3 --- AquaSKK/AquaSKK.pbproj/project.pbxproj:1.2 Sat Aug 13 15:15:06 2005 +++ AquaSKK/AquaSKK.pbproj/project.pbxproj Tue Sep 6 10:25:12 2005 @@ -261,8 +261,6 @@ 046A91630058A55A1153986C, 089C1671FE841209C02AAC07, 19C28FB4FE9D528D11CA2CBB, - 849E106E055022FF009C3C25, - 849E10DD055023C8009C3C25, ); isa = PBXGroup; name = BasicInputMethod; @@ -495,7 +493,7 @@ GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = "Info-AquaSKKInputMethod__Upgraded_.plist"; + INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/default; OTHER_CFLAGS = ""; @@ -1090,14 +1088,6 @@ settings = { }; }; - 849E106E055022FF009C3C25 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist; - path = "Info-AquaSKKInputMethod__Upgraded_.plist"; - refType = 4; - sourceTree = ""; - }; 849E106F055022FF009C3C25 = { explicitFileType = wrapper.cfbundle; includeInIndex = 0; @@ -1122,7 +1112,7 @@ GCC_PREFIX_HEADER = AquaSKK_Prefix.h; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "Info-AquaSKKServer__Upgraded_.plist"; + INFOPLIST_FILE = "Info-AquaSKKServer.plist"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/default; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; @@ -1583,14 +1573,6 @@ isa = PBXRezBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; - 849E10DD055023C8009C3C25 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist; - path = "Info-AquaSKKServer__Upgraded_.plist"; - refType = 4; - sourceTree = ""; - }; 849E10DE055023C8009C3C25 = { explicitFileType = wrapper.application; includeInIndex = 0; From t-suwa ＠ users.sourceforge.jp Tue Sep 6 10:25:13 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Tue, 6 Sep 2005 10:25:13 +0900 Subject: [aquaskk-changes 29] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20050906012513.090012AC019@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.1.1.1 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.1.1.1 Sun Jul 17 19:50:31 2005 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Tue Sep 6 10:25:12 2005 @@ -223,9 +223,7 @@ 847A147E04A2F8E9008925B0 /* Socket.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = Socket.h; sourceTree = ""; }; 847A148104A31366008925B0 /* Skkserv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Skkserv.h; sourceTree = ""; }; 847A148204A31366008925B0 /* Skkserv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Skkserv.cpp; sourceTree = ""; }; - 849E106E055022FF009C3C25 /* Info-AquaSKKInputMethod__Upgraded_.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = "Info-AquaSKKInputMethod__Upgraded_.plist"; sourceTree = ""; }; 849E106F055022FF009C3C25 /* AquaSKKInputMethod.component */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AquaSKKInputMethod.component; sourceTree = BUILT_PRODUCTS_DIR; }; - 849E10DD055023C8009C3C25 /* Info-AquaSKKServer__Upgraded_.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = "Info-AquaSKKServer__Upgraded_.plist"; sourceTree = ""; }; 849E10DE055023C8009C3C25 /* AquaSKKServer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AquaSKKServer.app; sourceTree = BUILT_PRODUCTS_DIR; }; 84C301620471FED8008D3B10 /* AquaSKK_Prefix.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = AquaSKK_Prefix.h; sourceTree = ""; }; 84C3016504720AAB008D3B10 /* CppScrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CppScrap.h; sourceTree = ""; }; @@ -457,8 +455,6 @@ 046A91630058A55A1153986C /* Shared Headers */, 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */, 19C28FB4FE9D528D11CA2CBB /* Products */, - 849E106E055022FF009C3C25 /* Info-AquaSKKInputMethod__Upgraded_.plist */, - 849E10DD055023C8009C3C25 /* Info-AquaSKKServer__Upgraded_.plist */, ); name = BasicInputMethod; sourceTree = ""; @@ -998,9 +994,20 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_SHADOW = YES; GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "Info-AquaSKKServer__Upgraded_.plist"; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_LABEL = YES; + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = "Info-AquaSKKServer.plist"; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; @@ -1024,10 +1031,21 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_SHADOW = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "Info-AquaSKKServer__Upgraded_.plist"; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_LABEL = YES; + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = "Info-AquaSKKServer.plist"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = ""; OPTIMIZATION_CFLAGS = "-O2"; @@ -1049,9 +1067,20 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_SHADOW = YES; GCC_WARN_UNKNOWN_PRAGMAS = NO; - INFOPLIST_FILE = "Info-AquaSKKServer__Upgraded_.plist"; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_LABEL = YES; + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = "Info-AquaSKKServer.plist"; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; @@ -1075,10 +1104,21 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_SHADOW = YES; GCC_WARN_UNKNOWN_PRAGMAS = NO; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_LABEL = YES; + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = "Info-AquaSKKInputMethod__Upgraded_.plist"; + INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; OPTIMIZATION_CFLAGS = "-O0"; @@ -1102,11 +1142,22 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_SHADOW = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNKNOWN_PRAGMAS = NO; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_LABEL = YES; + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = "Info-AquaSKKInputMethod__Upgraded_.plist"; + INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = ""; @@ -1128,10 +1179,21 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_SHADOW = YES; GCC_WARN_UNKNOWN_PRAGMAS = NO; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_LABEL = YES; + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = "Info-AquaSKKInputMethod__Upgraded_.plist"; + INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ""; From t-suwa ＠ users.sourceforge.jp Tue Sep 6 10:25:13 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Tue, 6 Sep 2005 10:25:13 +0900 Subject: [aquaskk-changes 30] CVS update: AquaSKK/util Message-ID: <20050906012513.2E3692AC035@users.sourceforge.jp> Index: AquaSKK/util/StringTokenizer.cpp diff -u AquaSKK/util/StringTokenizer.cpp:1.1.1.2 AquaSKK/util/StringTokenizer.cpp:1.2 --- AquaSKK/util/StringTokenizer.cpp:1.1.1.2 Sun Jul 17 19:50:32 2005 +++ AquaSKK/util/StringTokenizer.cpp Tue Sep 6 10:25:13 2005 @@ -1,5 +1,5 @@ /* - $Id: StringTokenizer.cpp,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $ + $Id: StringTokenizer.cpp,v 1.2 2005/09/06 01:25:13 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -19,47 +19,41 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "StringTokenizer.h" #include -using namespace util; +#include "StringTokenizer.h" -StringTokenizer::StringTokenizer(const string& world,const string& delim) - : world(world) , delim(delim) , pos(0) -{ - +StringTokenizer::StringTokenizer( + const std::string& word, const std::string& delim) + : word_(word), delim_(delim) , pos_(0) { + // empty } -StringTokenizer::~StringTokenizer() -{ - +StringTokenizer::~StringTokenizer() { + // empty } bool StringTokenizer::hasMoreTokens() { - // pos??????????????????????true? - return world.find_first_not_of(delim,pos) != string::npos; + // pos??????????????????????true? + return word_.find_first_not_of(delim_, pos_) != std::string::npos; } -string StringTokenizer::nextToken() +std::string StringTokenizer::nextToken() { - // pos?????????????????????? - unsigned int pos_not_delim = world.find_first_not_of(delim,pos); - if (pos_not_delim == string::npos) - { - throw string("NoMoreTokensException"); - } + // pos?????????????????????? + size_t pos_not_delim = word_.find_first_not_of(delim_, pos_); + if(pos_not_delim == std::string::npos) { + throw std::string("NoMoreTokensException"); + } - // ?????????????T? - unsigned int pos_next_delim = world.find_first_of(delim,pos_not_delim+1); - if (pos_next_delim == string::npos) - { - // ??????? - pos = world.length(); - return world.substr(pos_not_delim,world.length() - pos_not_delim); - } - else - { - pos = pos_next_delim + 1; - return world.substr(pos_not_delim,pos_next_delim - pos_not_delim); - } + // ?????????????T? + size_t pos_next_delim = word_.find_first_of(delim_, pos_not_delim + 1); + if(pos_next_delim == std::string::npos) { + // ??????? + pos_ = word_.length(); + return word_.substr(pos_not_delim, word_.length() - pos_not_delim); + } else { + pos_ = pos_next_delim + 1; + return word_.substr(pos_not_delim, pos_next_delim - pos_not_delim); + } } Index: AquaSKK/util/StringTokenizer.h diff -u AquaSKK/util/StringTokenizer.h:1.1.1.2 AquaSKK/util/StringTokenizer.h:1.2 --- AquaSKK/util/StringTokenizer.h:1.1.1.2 Sun Jul 17 19:50:32 2005 +++ AquaSKK/util/StringTokenizer.h Tue Sep 6 10:25:13 2005 @@ -1,5 +1,5 @@ /* - $Id: StringTokenizer.h,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $ + $Id: StringTokenizer.h,v 1.2 2005/09/06 01:25:13 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,25 +20,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #pragma once -#include -using namespace std; -namespace util -{ - class StringTokenizer; + +namespace util { + class StringTokenizer; } -class util::StringTokenizer -{ - public: - StringTokenizer(const string& world,const string& delim); - virtual ~StringTokenizer(); - - virtual bool hasMoreTokens(); - virtual string nextToken(); - - - private: - string world; - string delim; - int pos; -}; \ No newline at end of file +class StringTokenizer { + std::string word_; + std::string delim_; + size_t pos_; + +public: + StringTokenizer(const std::string& word, const std::string& delim); + virtual ~StringTokenizer(); + + virtual bool hasMoreTokens(); + virtual std::string nextToken(); +}; From t-suwa ＠ users.sourceforge.jp Tue Sep 6 12:35:34 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Tue, 6 Sep 2005 12:35:34 +0900 Subject: [aquaskk-changes 31] CVS update: htdocs Message-ID: <20050906033534.1830C2AC018@users.sourceforge.jp> Index: htdocs/index.html diff -u htdocs/index.html:1.6 htdocs/index.html:1.7 --- htdocs/index.html:1.6 Sat Aug 27 23:20:39 2005 +++ htdocs/index.html Tue Sep 6 12:35:33 2005 @@ -34,6 +34,8 @@

最近の出来事

    +
  • 2005/09/06 - AquaSKK 2.2 リリース
    + 「英数」キーで 'l' が入力されてしまう不具合を修正しました。
  • 2005/08/27 - AquaSKK 2.1 リリース
    入力モードのアイコン表示を Panther でもサポートしました。
@@ -74,7 +76,7 @@

From t-suwa ＠ users.sourceforge.jp Wed Sep 7 07:54:43 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Wed, 7 Sep 2005 07:54:43 +0900 Subject: [aquaskk-changes 32] CVS update: AquaSKK/Package/scripts Message-ID: <20050906225443.C22FE2AC011@users.sourceforge.jp> From t-suwa ＠ users.sourceforge.jp Wed Sep 7 07:56:47 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Wed, 7 Sep 2005 07:56:47 +0900 Subject: [aquaskk-changes 33] CVS update: AquaSKK/Package/scripts Message-ID: <20050906225647.CDF0A2AC01D@users.sourceforge.jp> Index: AquaSKK/Package/scripts/preflight diff -u /dev/null AquaSKK/Package/scripts/preflight:1.1 --- /dev/null Wed Sep 7 07:56:47 2005 +++ AquaSKK/Package/scripts/preflight Wed Sep 7 07:56:47 2005 @@ -0,0 +1,4 @@ +#!/bin/sh + +# remove previous version +rm -fr /Library/Components/AquaSKKInputMethod.component From t-suwa ＠ users.sourceforge.jp Wed Sep 7 07:57:44 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Wed, 7 Sep 2005 07:57:44 +0900 Subject: [aquaskk-changes 34] CVS update: AquaSKK/Package Message-ID: <20050906225744.44F062AC01D@users.sourceforge.jp> Index: AquaSKK/Package/AquaSKK.pmproj From xdd ＠ users.sourceforge.jp Mon Sep 19 23:03:45 2005 From: xdd ＠ users.sourceforge.jp (S.Abe) Date: Mon, 19 Sep 2005 23:03:45 +0900 Subject: [aquaskk-changes 35] CVS update: sandbox/AquaSKK Message-ID: <20050919140345.7FA242AC00E@users.sourceforge.jp> Index: sandbox/AquaSKK/BIM.cpp diff -u sandbox/AquaSKK/BIM.cpp:1.2 sandbox/AquaSKK/BIM.cpp:1.3 --- sandbox/AquaSKK/BIM.cpp:1.2 Sun Sep 18 21:10:56 2005 +++ sandbox/AquaSKK/BIM.cpp Mon Sep 19 23:03:45 2005 @@ -1,4 +1,4 @@ -/* $Id: BIM.cpp,v 1.2 2005/09/18 12:10:56 xdd Exp $ +/* $Id: BIM.cpp,v 1.3 2005/09/19 14:03:45 xdd Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -17,7 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* test */ #define TARGET_API_MAC_CARBON 1 #define kMENU_Pencil (kBaseResourceID + 1) From xdd ＠ users.sourceforge.jp Wed Sep 21 01:45:40 2005 From: xdd ＠ users.sourceforge.jp (S.Abe) Date: Wed, 21 Sep 2005 01:45:40 +0900 Subject: [aquaskk-changes 36] CVS update: AquaSKK Message-ID: <20050920164540.CA0A12AC01F@users.sourceforge.jp> Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.4 AquaSKK/ChangeLog:1.5 --- AquaSKK/ChangeLog:1.4 Tue Sep 6 10:25:12 2005 +++ AquaSKK/ChangeLog Wed Sep 21 01:45:40 2005 @@ -1,3 +1,13 @@ +2005-09-19 Shin_ichi Abe + + * PreferencesController.*: ????????????? + AquaSKK???????????????????????????? + + * Preferences.nib: ??????????????????? + + * AquaSKK.xcodeproj: Development?????????????????A + AquaSKKServer?zeroLink??????? + 2005-09-06 Tomotaka SUWA * AquaSKK.xcodeproj, AquaSKK.pbproj: Info.plist ????????? From t-suwa ＠ users.sourceforge.jp Fri Sep 23 00:11:14 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 00:11:14 +0900 Subject: [aquaskk-changes 37] CVS update: htdocs Message-ID: <20050922151114.014AC2AC013@users.sourceforge.jp> Index: htdocs/index.html diff -u htdocs/index.html:1.7 htdocs/index.html:1.8 --- htdocs/index.html:1.7 Tue Sep 6 12:35:33 2005 +++ htdocs/index.html Fri Sep 23 00:11:13 2005 @@ -25,7 +25,7 @@ target="_blank">SKK の長所を継承し、シンプルで快適な日本語入力環境の提供を目指します。

-

開発状況の詳細については、SourceForgeJP の +

開発状況の詳細については、SourceForge.JP の AquaSKK プロジェクトページ を参照して下さい。

@@ -34,6 +34,8 @@

最近の出来事

    +
  • 2005/09/23 - AquaSKK 2.3 リリース
    + 候補ウィンドウのフォントサイズを変更できるようにしました。
  • 2005/09/06 - AquaSKK 2.2 リリース
    「英数」キーで 'l' が入力されてしまう不具合を修正しました。
  • 2005/08/27 - AquaSKK 2.1 リリース
    @@ -76,7 +78,7 @@

    Index: htdocs/sidebar.js diff -u htdocs/sidebar.js:1.4 htdocs/sidebar.js:1.5 --- htdocs/sidebar.js:1.4 Sat Aug 27 23:15:34 2005 +++ htdocs/sidebar.js Fri Sep 23 00:11:13 2005 @@ -1,4 +1,4 @@ -/* $Id: sidebar.js,v 1.4 2005/08/27 14:15:34 t-suwa Exp $ */ +/* $Id: sidebar.js,v 1.5 2005/09/22 15:11:13 t-suwa Exp $ */ document.open(); document.writeln('

    ダウンロード

    '); @@ -13,7 +13,7 @@ document.writeln(' '); document.writeln(''); @@ -44,12 +44,12 @@ document.writeln('

    プロジェクトへの参加方法

    '); document.writeln(''); document.writeln('
      '); -document.writeln('
    1. SourceForgeJP で アカウントを作成 する
      2. '); +document.writeln('
    2. SourceForge.JP で アカウントを作成 する
      3. '); document.writeln('
    3. AquaSKK プロジェクトの メンバーリスト から管理者を探して「参加希望」メールを送信する
      4. '); document.writeln('
    4. 開発者向けメーリングリスト にも参加する
      5. '); document.writeln('
    '); document.writeln(''); -document.writeln('

    Powered by SourceForgeJP

    '); +document.writeln('

    Powered by SourceForge.JP

    '); document.writeln('

    '); document.writeln(' SourceForge.jp'); document.writeln('

    '); From t-suwa ＠ users.sourceforge.jp Fri Sep 23 00:30:56 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 00:30:56 +0900 Subject: [aquaskk-changes 38] CVS update: AquaSKK Message-ID: <20050922153056.04F222AC013@users.sourceforge.jp> Index: AquaSKK/Info-AquaSKKInputMethod.plist diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.1 AquaSKK/Info-AquaSKKInputMethod.plist:1.2 --- AquaSKK/Info-AquaSKKInputMethod.plist:1.1 Tue Sep 6 10:25:12 2005 +++ AquaSKK/Info-AquaSKKInputMethod.plist Fri Sep 23 00:30:55 2005 @@ -19,11 +19,11 @@ CFBundlePackageType thng CFBundleShortVersionString - 2.2 + 2.3 CFBundleSignature askk CFBundleVersion - 2005-09-06 + 2005-09-23 CSResourcesFileMapped ComponentInputModeDict Index: AquaSKK/Info-AquaSKKServer.plist diff -u AquaSKK/Info-AquaSKKServer.plist:1.1 AquaSKK/Info-AquaSKKServer.plist:1.2 --- AquaSKK/Info-AquaSKKServer.plist:1.1 Tue Sep 6 10:25:12 2005 +++ AquaSKK/Info-AquaSKKServer.plist Fri Sep 23 00:30:55 2005 @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.2 + 2.3 CFBundleSignature askk CFBundleVersion - 2005-09-06 + 2005-09-23 NSMainNibFile Principal NSPrincipalClass From t-suwa ＠ users.sourceforge.jp Fri Sep 23 00:30:56 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 00:30:56 +0900 Subject: [aquaskk-changes 39] CVS update: AquaSKK/Package Message-ID: <20050922153056.25F402AC02A@users.sourceforge.jp> Index: AquaSKK/Package/AquaSKK.pmproj From t-suwa ＠ users.sourceforge.jp Fri Sep 23 11:20:44 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 11:20:44 +0900 Subject: [aquaskk-changes 40] CVS update: AquaSKK Message-ID: <20050923022044.2C1192AC013@users.sourceforge.jp> Index: AquaSKK/CandidatesFrame.m diff -u AquaSKK/CandidatesFrame.m:1.1.1.1 AquaSKK/CandidatesFrame.m:1.1.1.1.2.1 --- AquaSKK/CandidatesFrame.m:1.1.1.1 Sun Jul 17 19:50:26 2005 +++ AquaSKK/CandidatesFrame.m Fri Sep 23 11:20:44 2005 @@ -1,4 +1,4 @@ -/* $Id: CandidatesFrame.m,v 1.1.1.1 2005/07/17 10:50:26 t-suwa Exp $ +/* $Id: CandidatesFrame.m,v 1.1.1.1.2.1 2005/09/23 02:20:44 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -24,9 +24,10 @@ - (id)init { if(self = [super init]) { + float fontSize = [[[NSUserDefaults standardUserDefaults] objectForKey:@"dic.FontSize.Window"] floatValue]; labels_ = @"ASDFJKL"; attributes_ = [NSDictionary - dictionaryWithObject:[NSFont systemFontOfSize:0] + dictionaryWithObject:[NSFont systemFontOfSize:fontSize] forKey:NSFontAttributeName]; candidates_ = [[NSMutableArray alloc] init]; Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.4 AquaSKK/ChangeLog:1.4.2.1 --- AquaSKK/ChangeLog:1.4 Tue Sep 6 10:25:12 2005 +++ AquaSKK/ChangeLog Fri Sep 23 11:20:44 2005 @@ -1,3 +1,13 @@ +2005-09-19 Shin_ichi Abe + + * PreferencesController.*: ????????????? + AquaSKK???????????????????????????? + + * Preferences.nib: ??????????????????? + + * AquaSKK.xcodeproj: Development?????????????????A + AquaSKKServer?zeroLink??????? + 2005-09-06 Tomotaka SUWA * AquaSKK.xcodeproj, AquaSKK.pbproj: Info.plist ????????? Index: AquaSKK/Info-AquaSKKInputMethod.plist diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.1 AquaSKK/Info-AquaSKKInputMethod.plist:1.1.2.1 --- AquaSKK/Info-AquaSKKInputMethod.plist:1.1 Tue Sep 6 10:25:12 2005 +++ AquaSKK/Info-AquaSKKInputMethod.plist Fri Sep 23 11:20:44 2005 @@ -19,11 +19,11 @@ CFBundlePackageType thng CFBundleShortVersionString - 2.2 + 2.3 CFBundleSignature askk CFBundleVersion - 2005-09-06 + 2005-09-23 CSResourcesFileMapped ComponentInputModeDict Index: AquaSKK/Info-AquaSKKServer.plist diff -u AquaSKK/Info-AquaSKKServer.plist:1.1 AquaSKK/Info-AquaSKKServer.plist:1.1.2.1 --- AquaSKK/Info-AquaSKKServer.plist:1.1 Tue Sep 6 10:25:12 2005 +++ AquaSKK/Info-AquaSKKServer.plist Fri Sep 23 11:20:44 2005 @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.2 + 2.3 CFBundleSignature askk CFBundleVersion - 2005-09-06 + 2005-09-23 NSMainNibFile Principal NSPrincipalClass Index: AquaSKK/PreferencesController.h diff -u AquaSKK/PreferencesController.h:1.1.1.2 AquaSKK/PreferencesController.h:1.1.1.2.2.1 --- AquaSKK/PreferencesController.h:1.1.1.2 Sun Jul 17 19:50:28 2005 +++ AquaSKK/PreferencesController.h Fri Sep 23 11:20:44 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.h,v 1.1.1.2 2005/07/17 10:50:28 t-suwa Exp $ + $Id: PreferencesController.h,v 1.1.1.2.2.1 2005/09/23 02:20:44 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -27,6 +27,7 @@ @interface PreferencesController : NSWindowController { IBOutlet id skkEggLikeNewlineBtn; + IBOutlet id fontSizePopUp; IBOutlet id winColor; IBOutlet id winTransparent; Index: AquaSKK/PreferencesController.mm diff -u AquaSKK/PreferencesController.mm:1.1.1.2 AquaSKK/PreferencesController.mm:1.1.1.2.2.1 --- AquaSKK/PreferencesController.mm:1.1.1.2 Sun Jul 17 19:50:29 2005 +++ AquaSKK/PreferencesController.mm Fri Sep 23 11:20:44 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.mm,v 1.1.1.2 2005/07/17 10:50:29 t-suwa Exp $ + $Id: PreferencesController.mm,v 1.1.1.2.2.1 2005/09/23 02:20:44 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -53,6 +53,7 @@ @"~/.skk-jisyo", @"dic.path.sub", [NSMutableArray array], @"dic.path.kotoeri", [NSArchiver archivedDataWithRootObject:color], @"dic.WindowColor.kotoeri", + [NSNumber numberWithInt:0], @"dic.FontSize.Window", @"0.7", @"dic.WindowAlpha.kotoeri", @"5", @"dic.showCandsWindowAfterNthCand", @"NO", @"dic.skk-egg-like-newline.kotoeri", @@ -73,6 +74,7 @@ dicPath = [[NSMutableArray alloc] initWithArray:[defaults arrayForKey:@"dic.path.kotoeri"]]; [winColor setColor:[NSUnarchiver unarchiveObjectWithData:[defaults objectForKey:@"dic.WindowColor.kotoeri"]]]; + [fontSizePopUp selectItemAtIndex:[fontSizePopUp indexOfItemWithTag:[[defaults objectForKey:@"dic.FontSize.Window"] intValue]]]; [winTransparent setDoubleValue:[defaults floatForKey:@"dic.WindowAlpha.kotoeri"]]; [skkEggLikeNewlineBtn setState:[defaults boolForKey:@"dic.skk-egg-like-newline.kotoeri"]]; @@ -95,7 +97,8 @@ [defaults setObject:[NSArchiver archivedDataWithRootObject:[winColor color]] forKey:@"dic.WindowColor.kotoeri"]; [defaults setFloat:[winTransparent doubleValue] forKey:@"dic.WindowAlpha.kotoeri"]; [defaults setBool:[skkEggLikeNewlineBtn state] forKey:@"dic.skk-egg-like-newline.kotoeri"]; - + [defaults setObject:[NSNumber numberWithInt:[[fontSizePopUp selectedItem] tag]] forKey:@"dic.FontSize.Window"]; + // skkserv [defaults setBool:[skkserv_enabled state] forKey:@"pref.skkserv.enabled"]; [defaults setInteger:[skkserv_port intValue] forKey:@"pref.skkserv.port"]; From t-suwa ＠ users.sourceforge.jp Fri Sep 23 11:20:44 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 11:20:44 +0900 Subject: [aquaskk-changes 41] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20050923022044.51A722AC048@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.1 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2 Tue Sep 6 10:25:12 2005 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Fri Sep 23 11:20:44 2005 @@ -1018,7 +1018,7 @@ SECTORDER_FLAGS = ""; WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = app; - ZERO_LINK = YES; + ZERO_LINK = NO; }; name = Development; }; From t-suwa ＠ users.sourceforge.jp Fri Sep 23 11:20:44 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 11:20:44 +0900 Subject: [aquaskk-changes 42] CVS update: AquaSKK/Japanese.lproj/Preferences.nib Message-ID: <20050923022044.75A1B2AC013@users.sourceforge.jp> Index: AquaSKK/Japanese.lproj/Preferences.nib/classes.nib diff -u AquaSKK/Japanese.lproj/Preferences.nib/classes.nib:1.1.1.1 AquaSKK/Japanese.lproj/Preferences.nib/classes.nib:1.1.1.1.2.1 --- AquaSKK/Japanese.lproj/Preferences.nib/classes.nib:1.1.1.1 Sun Jul 17 19:34:46 2005 +++ AquaSKK/Japanese.lproj/Preferences.nib/classes.nib Fri Sep 23 11:20:44 2005 @@ -14,6 +14,7 @@ LANGUAGE = ObjC; OUTLETS = { addKotoeriBtn = id; + fontSizePopUp = id; kotoeriDicTable = id; "maindic_path" = NSTextField; removeKotoeriBtn = id; Index: AquaSKK/Japanese.lproj/Preferences.nib/info.nib diff -u AquaSKK/Japanese.lproj/Preferences.nib/info.nib:1.1.1.1 AquaSKK/Japanese.lproj/Preferences.nib/info.nib:1.1.1.1.2.1 --- AquaSKK/Japanese.lproj/Preferences.nib/info.nib:1.1.1.1 Sun Jul 17 19:34:46 2005 +++ AquaSKK/Japanese.lproj/Preferences.nib/info.nib Fri Sep 23 11:20:44 2005 @@ -3,16 +3,11 @@ IBDocumentLocation - 137 178 356 240 0 0 1024 746 + 255 330 356 240 0 0 1600 1178 IBFramework Version - 291.0 + 439.0 IBGroupedObjects - 3 - - 60 - 50 - 4 59 @@ -28,14 +23,24 @@ 160 161 + 7 + + 50 + 60 + + 8 + + 167 + 168 + IBLastGroupID - 7 + 9 IBOpenObjects 5 IBSystem Version - 6L60 + 8C46 Index: AquaSKK/Japanese.lproj/Preferences.nib/keyedobjects.nib From t-suwa ＠ users.sourceforge.jp Fri Sep 23 11:20:44 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 11:20:44 +0900 Subject: [aquaskk-changes 43] CVS update: AquaSKK/Package Message-ID: <20050923022044.9C05E2AC048@users.sourceforge.jp> Index: AquaSKK/Package/AquaSKK.pmproj From t-suwa ＠ users.sourceforge.jp Fri Sep 23 11:27:44 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 11:27:44 +0900 Subject: [aquaskk-changes 44] CVS update: AquaSKK Message-ID: <20050923022744.73A7A2AC013@users.sourceforge.jp> Index: AquaSKK/PrivateRunLoop.cpp diff -u /dev/null AquaSKK/PrivateRunLoop.cpp:1.1.2.1 --- /dev/null Fri Sep 23 11:27:44 2005 +++ AquaSKK/PrivateRunLoop.cpp Fri Sep 23 11:27:44 2005 @@ -0,0 +1,84 @@ +/* + $Id: PrivateRunLoop.cpp,v 1.1.2.1 2005/09/23 02:27:44 t-suwa Exp $ + + MacOS X implementation of the SKK input method. + + Copyright (C) 2005 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include +#include +#include "PrivateRunLoop.h" + +PrivateRunLoop::PrivateRunLoop( + const CFStringRef mode, CFRunLoopSourceRef runLoopSource) + : mode_(mode), runLoop_(0) +{ + // ?? + runLoopSource_ = (CFRunLoopSourceRef)CFRetain(runLoopSource); + + // ???(=????)??????????????????? + MPCreateQueue(¬ifyQueue_); + + // ???????? + MPCreateTask(PrivateRunLoop::entryPoint, + this, + 0, + notifyQueue_, + NULL, + NULL, + 0, + &taskID_); +} + +PrivateRunLoop::~PrivateRunLoop() +{ + // ??????? + CFRunLoopStop(runLoop_); + + // ??????????? + MPWaitOnQueue(notifyQueue_, NULL, NULL, NULL, kDurationForever); + MPDeleteQueue(notifyQueue_); + + // ?? + CFRelease(runLoopSource_); +} + +// ????? +OSStatus PrivateRunLoop::entryPoint(void* param) +{ + PrivateRunLoop* self = (PrivateRunLoop*)param; + self->runLoop_ = CFRunLoopGetCurrent(); + + // ???????+ CFRunLoopAddSource(self->runLoop_, + self->runLoopSource_, + self->mode_); + + // CFRunLoopStop() ????????????????+ SInt32 result; + do { + result = CFRunLoopRunInMode(self->mode_, 1, true); + } while(result != kCFRunLoopRunStopped); + + // ??? + CFRunLoopRemoveSource(self->runLoop_, + self->runLoopSource_, + self->mode_); + + return 0; +} Index: AquaSKK/PrivateRunLoop.h diff -u /dev/null AquaSKK/PrivateRunLoop.h:1.1.2.1 --- /dev/null Fri Sep 23 11:27:44 2005 +++ AquaSKK/PrivateRunLoop.h Fri Sep 23 11:27:44 2005 @@ -0,0 +1,39 @@ +/* + $Id: PrivateRunLoop.h,v 1.1.2.1 2005/09/23 02:27:44 t-suwa Exp $ + + MacOS X implementation of the SKK input method. + + Copyright (C) 2005 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#pragma once + +// ?ｩ? RunLoop ???????? +class PrivateRunLoop { + const CFStringRef mode_; + CFRunLoopRef runLoop_; + CFRunLoopSourceRef runLoopSource_; + MPQueueID notifyQueue_; + MPTaskID taskID_; + + // ????? + static OSStatus entryPoint(void* param); + +public: + PrivateRunLoop(const CFStringRef mode, CFRunLoopSourceRef runLoopSource); + ~PrivateRunLoop(); +}; From t-suwa ＠ users.sourceforge.jp Fri Sep 23 22:29:11 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 22:29:11 +0900 Subject: [aquaskk-changes 45] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20050923132911.906E52AC04F@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.1 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.2 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.1 Fri Sep 23 11:20:44 2005 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Fri Sep 23 22:29:11 2005 @@ -15,10 +15,8 @@ 849E101E055022FF009C3C25 /* InputMode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5238B2802F2EFCC01CD4EB1 /* InputMode.h */; }; 849E101F055022FF009C3C25 /* HiraganaInputMode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5238B2C02F2F11C01CD4EB1 /* HiraganaInputMode.h */; }; 849E1020055022FF009C3C25 /* KanjiConversionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5066C4502F3CF1B01CD4EB1 /* KanjiConversionMode.h */; }; - 849E1021055022FF009C3C25 /* StringTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADAD802F4DB9C01CD4EB1 /* StringTokenizer.h */; }; 849E1022055022FF009C3C25 /* StringUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADADA02F4DB9C01CD4EB1 /* StringUtils.h */; }; 849E1023055022FF009C3C25 /* BIMInputEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A38B2A005639B61153986C /* BIMInputEvents.h */; }; - 849E1024055022FF009C3C25 /* CFObjectContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADC0E02F5405201CD4EB1 /* CFObjectContainer.h */; }; 849E1025055022FF009C3C25 /* CppCFString.h in Headers */ = {isa = PBXBuildFile; fileRef = F5D6B81402F64CF5011002E2 /* CppCFString.h */; }; 849E1026055022FF009C3C25 /* CppCFData.h in Headers */ = {isa = PBXBuildFile; fileRef = F554D11D03026A4301CD4EB1 /* CppCFData.h */; }; 849E1027055022FF009C3C25 /* WordRegisterMode.h in Headers */ = {isa = PBXBuildFile; fileRef = F50A6E4403038EA901CD4EB1 /* WordRegisterMode.h */; }; @@ -50,12 +48,9 @@ 849E1044055022FF009C3C25 /* BIM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01A38B190056394F1153986C /* BIM.cpp */; }; 849E1045055022FF009C3C25 /* BIMComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01A38B1A0056394F1153986C /* BIMComponent.cpp */; }; 849E1046055022FF009C3C25 /* BIMInputEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01A38B1B0056394F1153986C /* BIMInputEvents.cpp */; }; - 849E1047055022FF009C3C25 /* InputMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5238B2702F2EFCC01CD4EB1 /* InputMode.cpp */; }; 849E1048055022FF009C3C25 /* HiraganaInputMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5238B2B02F2F11C01CD4EB1 /* HiraganaInputMode.cpp */; }; 849E1049055022FF009C3C25 /* KanjiConversionMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5066C4402F3CF1B01CD4EB1 /* KanjiConversionMode.cpp */; }; - 849E104A055022FF009C3C25 /* StringTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAD702F4DB9C01CD4EB1 /* StringTokenizer.cpp */; }; 849E104B055022FF009C3C25 /* StringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAD902F4DB9C01CD4EB1 /* StringUtils.cpp */; }; - 849E104C055022FF009C3C25 /* CFObjectContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADC0D02F5405201CD4EB1 /* CFObjectContainer.cpp */; }; 849E104D055022FF009C3C25 /* CppCFString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D6B81302F64CF5011002E2 /* CppCFString.cpp */; }; 849E104E055022FF009C3C25 /* CppCFData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F554D11C03026A4301CD4EB1 /* CppCFData.cpp */; }; 849E104F055022FF009C3C25 /* WordRegisterMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F50A6E4303038EA901CD4EB1 /* WordRegisterMode.cpp */; }; @@ -64,7 +59,6 @@ 849E1052055022FF009C3C25 /* IMSessionInputMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F50A6E550303A31C01CD4EB1 /* IMSessionInputMode.cpp */; }; 849E1053055022FF009C3C25 /* ZenKataInputMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5351C0E03086FBB017A142D /* ZenKataInputMode.cpp */; }; 849E1054055022FF009C3C25 /* HanKataInputMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5869411030A30D101C90376 /* HanKataInputMode.cpp */; }; - 849E1056055022FF009C3C25 /* RegistrationStarter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F588B9DC030C00F6018478EA /* RegistrationStarter.cpp */; }; 849E1057055022FF009C3C25 /* HanAscInputMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F57A635803112E4301CD4EB1 /* HanAscInputMode.cpp */; }; 849E1058055022FF009C3C25 /* ZenAscInputMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F57A635E03113B5E01CD4EB1 /* ZenAscInputMode.cpp */; }; 849E1059055022FF009C3C25 /* KanaTreeElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F505D2EC0314909401CD4EB1 /* KanaTreeElement.cpp */; }; @@ -82,16 +76,13 @@ 849E106A055022FF009C3C25 /* skkicons.r in Rez */ = {isa = PBXBuildFile; fileRef = F551EB32030E3EA6012D3D1A /* skkicons.r */; }; 849E109E055023C8009C3C25 /* BIMClientServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A38B3600563A7B1153986C /* BIMClientServer.h */; }; 849E109F055023C8009C3C25 /* SKKDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADAD302F4D02501CD4EB1 /* SKKDictionary.h */; }; - 849E10A0055023C8009C3C25 /* StringTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADAD802F4DB9C01CD4EB1 /* StringTokenizer.h */; }; 849E10A1055023C8009C3C25 /* StringUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADADA02F4DB9C01CD4EB1 /* StringUtils.h */; }; 849E10A2055023C8009C3C25 /* SKKServer.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADAE602F508CF01CD4EB1 /* SKKServer.h */; }; 849E10A3055023C8009C3C25 /* CppCFString.h in Headers */ = {isa = PBXBuildFile; fileRef = F5D6B81402F64CF5011002E2 /* CppCFString.h */; }; 849E10A4055023C8009C3C25 /* OkuriganaEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = F522695402FB791D01CD4EB1 /* OkuriganaEntry.h */; }; 849E10A5055023C8009C3C25 /* Foundation.h in Headers */ = {isa = PBXBuildFile; fileRef = F5FDA61102FF7A1201CD4EB1 /* Foundation.h */; }; - 849E10A6055023C8009C3C25 /* TransparentWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = F5FDA61702FF7DA801CD4EB1 /* TransparentWindow.h */; }; 849E10A7055023C8009C3C25 /* CandidatesWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = F507431602FFB9DD01CD4EB1 /* CandidatesWindowController.h */; }; 849E10A8055023C8009C3C25 /* CandidatesView.h in Headers */ = {isa = PBXBuildFile; fileRef = F5B731C902FFCCDA01CD4EB1 /* CandidatesView.h */; }; - 849E10A9055023C8009C3C25 /* NSObjectContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = F53AE7E80300B66901CD4EB1 /* NSObjectContainer.h */; }; 849E10AA055023C8009C3C25 /* CandidatesManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F53AE7F60300BC3F01CD4EB1 /* CandidatesManager.h */; }; 849E10AB055023C8009C3C25 /* CppCFData.h in Headers */ = {isa = PBXBuildFile; fileRef = F554D11D03026A4301CD4EB1 /* CppCFData.h */; }; 849E10AC055023C8009C3C25 /* UserDicSaver.h in Headers */ = {isa = PBXBuildFile; fileRef = F588B9D3030BD10D018478EA /* UserDicSaver.h */; }; @@ -112,22 +103,18 @@ 849E10BC055023C8009C3C25 /* Candidates.nib in Resources */ = {isa = PBXBuildFile; fileRef = F551EE26030FF4B6012D3D1A /* Candidates.nib */; }; 849E10BE055023C8009C3C25 /* BS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0197B303009015467F000001 /* BS.mm */; }; 849E10BF055023C8009C3C25 /* SKKDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAD202F4D02501CD4EB1 /* SKKDictionary.cpp */; }; - 849E10C0055023C8009C3C25 /* StringTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAD702F4DB9C01CD4EB1 /* StringTokenizer.cpp */; }; 849E10C1055023C8009C3C25 /* StringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAD902F4DB9C01CD4EB1 /* StringUtils.cpp */; }; 849E10C2055023C8009C3C25 /* SKKServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAE502F508CF01CD4EB1 /* SKKServer.cpp */; }; 849E10C3055023C8009C3C25 /* CppCFString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D6B81302F64CF5011002E2 /* CppCFString.cpp */; }; 849E10C4055023C8009C3C25 /* OkuriganaEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F522695302FB791D01CD4EB1 /* OkuriganaEntry.cpp */; }; 849E10C5055023C8009C3C25 /* Foundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5FDA61202FF7A1201CD4EB1 /* Foundation.mm */; }; - 849E10C6055023C8009C3C25 /* TransparentWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FDA61802FF7DA801CD4EB1 /* TransparentWindow.m */; }; 849E10C7055023C8009C3C25 /* CandidatesWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F507431702FFB9DD01CD4EB1 /* CandidatesWindowController.mm */; }; 849E10C8055023C8009C3C25 /* CandidatesView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B731C802FFCCDA01CD4EB1 /* CandidatesView.mm */; }; - 849E10C9055023C8009C3C25 /* NSObjectContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = F53AE7E70300B66901CD4EB1 /* NSObjectContainer.mm */; }; 849E10CA055023C8009C3C25 /* CandidatesManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F53AE7F50300BC3F01CD4EB1 /* CandidatesManager.mm */; }; 849E10CB055023C8009C3C25 /* CppCFData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F554D11C03026A4301CD4EB1 /* CppCFData.cpp */; }; 849E10CC055023C8009C3C25 /* UserDicSaver.mm in Sources */ = {isa = PBXBuildFile; fileRef = F588B9D2030BD10D018478EA /* UserDicSaver.mm */; }; 849E10CD055023C8009C3C25 /* PreferencesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F551EE23030FED06012D3D1A /* PreferencesController.mm */; }; 849E10CE055023C8009C3C25 /* DMDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5C89DC503474AF201CD4EB1 /* DMDictionary.cpp */; }; - 849E10CF055023C8009C3C25 /* Dictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F50D1142034C4ED001CD4EB1 /* Dictionary.cpp */; }; 849E10D0055023C8009C3C25 /* CppMessagePortConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56B84A10355916201CD0AD3 /* CppMessagePortConnection.cpp */; }; 849E10D1055023C8009C3C25 /* ServerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56B84A70355BD3C01CD0AD3 /* ServerConnection.cpp */; }; 849E10D2055023C8009C3C25 /* CppMessagePortServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CC9DC90356A67F01D799AD /* CppMessagePortServer.cpp */; }; @@ -152,6 +139,10 @@ D3D0C6F8086EECA800319954 /* AsciiConversionMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3D0C6F6086EECA800319954 /* AsciiConversionMode.cpp */; }; D3D0C6F9086EECA800319954 /* AsciiConversionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = D3D0C6F7086EECA800319954 /* AsciiConversionMode.h */; }; D3D46F7B0872F755009707C1 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D3D46F790872F755009707C1 /* InfoPlist.strings */; }; + D3F94BA608E3A6F500496C35 /* PrivateRunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3F94BA408E3A6F500496C35 /* PrivateRunLoop.cpp */; }; + D3F94BA708E3A6F500496C35 /* PrivateRunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */; }; + D3F94BA808E3A6F500496C35 /* PrivateRunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3F94BA408E3A6F500496C35 /* PrivateRunLoop.cpp */; }; + D3F94BA908E3A6F500496C35 /* PrivateRunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */; }; /* End PBXBuildFile section */ /* Begin PBXBuildStyle section */ @@ -242,6 +233,8 @@ D3D0C6F6086EECA800319954 /* AsciiConversionMode.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = AsciiConversionMode.cpp; sourceTree = ""; }; D3D0C6F7086EECA800319954 /* AsciiConversionMode.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = AsciiConversionMode.h; sourceTree = ""; }; D3D46F7A0872F755009707C1 /* Japanese */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = Japanese; path = Japanese.lproj/InfoPlist.strings; sourceTree = ""; }; + D3F94BA408E3A6F500496C35 /* PrivateRunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = PrivateRunLoop.cpp; sourceTree = ""; }; + D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = PrivateRunLoop.h; sourceTree = ""; }; F500AE950356848401D799AD /* ClientConfiguration.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = ClientConfiguration.h; sourceTree = ""; }; F500AE960356848401D799AD /* ClientConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = ClientConfiguration.cpp; sourceTree = ""; }; F505D2EC0314909401CD4EB1 /* KanaTreeElement.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = KanaTreeElement.cpp; sourceTree = ""; }; @@ -263,10 +256,8 @@ F50A6E550303A31C01CD4EB1 /* IMSessionInputMode.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = IMSessionInputMode.cpp; sourceTree = ""; }; F50A6E560303A31C01CD4EB1 /* IMSessionInputMode.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = IMSessionInputMode.h; sourceTree = ""; }; F50D1141034C4ED001CD4EB1 /* Dictionary.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = Dictionary.h; sourceTree = ""; }; - F50D1142034C4ED001CD4EB1 /* Dictionary.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = Dictionary.cpp; sourceTree = ""; }; F522695302FB791D01CD4EB1 /* OkuriganaEntry.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = OkuriganaEntry.cpp; sourceTree = ""; }; F522695402FB791D01CD4EB1 /* OkuriganaEntry.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = OkuriganaEntry.h; sourceTree = ""; }; - F5238B2702F2EFCC01CD4EB1 /* InputMode.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = InputMode.cpp; sourceTree = ""; }; F5238B2802F2EFCC01CD4EB1 /* InputMode.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = InputMode.h; sourceTree = ""; }; F5238B2B02F2F11C01CD4EB1 /* HiraganaInputMode.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = HiraganaInputMode.cpp; sourceTree = ""; }; F5238B2C02F2F11C01CD4EB1 /* HiraganaInputMode.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = HiraganaInputMode.h; sourceTree = ""; }; @@ -277,8 +268,6 @@ F534041C0353CCC801CD0AD3 /* CharacterTranslator.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = CharacterTranslator.cpp; sourceTree = ""; }; F5351C0E03086FBB017A142D /* ZenKataInputMode.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = ZenKataInputMode.cpp; sourceTree = ""; }; F5351C0F03086FBB017A142D /* ZenKataInputMode.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = ZenKataInputMode.h; sourceTree = ""; }; - F53AE7E70300B66901CD4EB1 /* NSObjectContainer.mm */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.objcpp; name = NSObjectContainer.mm; path = util/NSObjectContainer.mm; sourceTree = ""; }; - F53AE7E80300B66901CD4EB1 /* NSObjectContainer.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; name = NSObjectContainer.h; path = util/NSObjectContainer.h; sourceTree = ""; }; F53AE7F50300BC3F01CD4EB1 /* CandidatesManager.mm */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.objcpp; path = CandidatesManager.mm; sourceTree = ""; }; F53AE7F60300BC3F01CD4EB1 /* CandidatesManager.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = CandidatesManager.h; sourceTree = ""; }; F54D049903B1F8E801CD0AD3 /* SkkConfig.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = SkkConfig.cpp; sourceTree = ""; }; @@ -306,20 +295,15 @@ F5869412030A30D101C90376 /* HanKataInputMode.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = HanKataInputMode.h; sourceTree = ""; }; F588B9D2030BD10D018478EA /* UserDicSaver.mm */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.objcpp; path = UserDicSaver.mm; sourceTree = ""; }; F588B9D3030BD10D018478EA /* UserDicSaver.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = UserDicSaver.h; sourceTree = ""; }; - F588B9DC030C00F6018478EA /* RegistrationStarter.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = RegistrationStarter.cpp; sourceTree = ""; }; F588B9DD030C00F6018478EA /* RegistrationStarter.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = RegistrationStarter.h; sourceTree = ""; }; F5B731C802FFCCDA01CD4EB1 /* CandidatesView.mm */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.objcpp; path = CandidatesView.mm; sourceTree = ""; }; F5B731C902FFCCDA01CD4EB1 /* CandidatesView.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = CandidatesView.h; sourceTree = ""; }; F5BADAD202F4D02501CD4EB1 /* SKKDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = SKKDictionary.cpp; sourceTree = ""; }; F5BADAD302F4D02501CD4EB1 /* SKKDictionary.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = SKKDictionary.h; sourceTree = ""; }; - F5BADAD702F4DB9C01CD4EB1 /* StringTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = StringTokenizer.cpp; sourceTree = ""; }; - F5BADAD802F4DB9C01CD4EB1 /* StringTokenizer.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = StringTokenizer.h; sourceTree = ""; }; F5BADAD902F4DB9C01CD4EB1 /* StringUtils.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = StringUtils.cpp; sourceTree = ""; }; F5BADADA02F4DB9C01CD4EB1 /* StringUtils.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = StringUtils.h; sourceTree = ""; }; F5BADAE502F508CF01CD4EB1 /* SKKServer.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = SKKServer.cpp; sourceTree = ""; }; F5BADAE602F508CF01CD4EB1 /* SKKServer.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = SKKServer.h; sourceTree = ""; }; - F5BADC0D02F5405201CD4EB1 /* CFObjectContainer.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = CFObjectContainer.cpp; sourceTree = ""; }; - F5BADC0E02F5405201CD4EB1 /* CFObjectContainer.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = CFObjectContainer.h; sourceTree = ""; }; F5C89DC503474AF201CD4EB1 /* DMDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = DMDictionary.cpp; sourceTree = ""; }; F5C89DC603474AF201CD4EB1 /* DMDictionary.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = DMDictionary.h; sourceTree = ""; }; F5CC9DC80356A67F01D799AD /* CppMessagePortServer.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = CppMessagePortServer.h; sourceTree = ""; }; @@ -334,8 +318,6 @@ F5DEF61A0357174401CD0AD3 /* ServerMessageReceiver.mm */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.objcpp; path = ServerMessageReceiver.mm; sourceTree = ""; }; F5FDA61102FF7A1201CD4EB1 /* Foundation.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = Foundation.h; sourceTree = ""; }; F5FDA61202FF7A1201CD4EB1 /* Foundation.mm */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.objcpp; path = Foundation.mm; sourceTree = ""; }; - F5FDA61702FF7DA801CD4EB1 /* TransparentWindow.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = TransparentWindow.h; sourceTree = ""; }; - F5FDA61802FF7DA801CD4EB1 /* TransparentWindow.m */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.objc; path = TransparentWindow.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -391,8 +373,6 @@ F5FDA61202FF7A1201CD4EB1 /* Foundation.mm */, F551EE22030FED06012D3D1A /* PreferencesController.h */, F551EE23030FED06012D3D1A /* PreferencesController.mm */, - F53AE7E80300B66901CD4EB1 /* NSObjectContainer.h */, - F53AE7E70300B66901CD4EB1 /* NSObjectContainer.mm */, F5DEF6190357174401CD0AD3 /* ServerMessageReceiver.h */, F5DEF61A0357174401CD0AD3 /* ServerMessageReceiver.mm */, F5DEF6150357002B01CD0AD3 /* ClientConnectionFactory.h */, @@ -404,7 +384,6 @@ F588B9D3030BD10D018478EA /* UserDicSaver.h */, F588B9D2030BD10D018478EA /* UserDicSaver.mm */, F50D1141034C4ED001CD4EB1 /* Dictionary.h */, - F50D1142034C4ED001CD4EB1 /* Dictionary.cpp */, F5BADAD302F4D02501CD4EB1 /* SKKDictionary.h */, F5BADAD202F4D02501CD4EB1 /* SKKDictionary.cpp */, F5C89DC603474AF201CD4EB1 /* DMDictionary.h */, @@ -504,11 +483,9 @@ F54D049B03B1FA5A01CD0AD3 /* SkkConfig.h */, F54D049903B1F8E801CD0AD3 /* SkkConfig.cpp */, F5238B2802F2EFCC01CD4EB1 /* InputMode.h */, - F5238B2702F2EFCC01CD4EB1 /* InputMode.cpp */, F50A6E4A03039A1D01CD4EB1 /* ParentInputMode.h */, F50A6E4903039A1D01CD4EB1 /* ParentInputMode.cpp */, F588B9DD030C00F6018478EA /* RegistrationStarter.h */, - F588B9DC030C00F6018478EA /* RegistrationStarter.cpp */, F50A6E500303A10701CD4EB1 /* ChildInputMode.h */, F50A6E4F0303A10701CD4EB1 /* ChildInputMode.cpp */, F50A6E560303A31C01CD4EB1 /* IMSessionInputMode.h */, @@ -527,8 +504,6 @@ F5066C4402F3CF1B01CD4EB1 /* KanjiConversionMode.cpp */, F50A6E4403038EA901CD4EB1 /* WordRegisterMode.h */, F50A6E4303038EA901CD4EB1 /* WordRegisterMode.cpp */, - F5BADC0E02F5405201CD4EB1 /* CFObjectContainer.h */, - F5BADC0D02F5405201CD4EB1 /* CFObjectContainer.cpp */, F505D2ED0314909401CD4EB1 /* KanaTreeElement.h */, F505D2EC0314909401CD4EB1 /* KanaTreeElement.cpp */, F505D2F4031499D001CD4EB1 /* KanaTreeController.h */, @@ -580,8 +555,6 @@ F507431702FFB9DD01CD4EB1 /* CandidatesWindowController.mm */, F5B731C902FFCCDA01CD4EB1 /* CandidatesView.h */, F5B731C802FFCCDA01CD4EB1 /* CandidatesView.mm */, - F5FDA61702FF7DA801CD4EB1 /* TransparentWindow.h */, - F5FDA61802FF7DA801CD4EB1 /* TransparentWindow.m */, ); name = "Candidates Window"; sourceTree = ""; @@ -589,8 +562,6 @@ F5BADAD602F4DB9C01CD4EB1 /* util */ = { isa = PBXGroup; children = ( - F5BADAD702F4DB9C01CD4EB1 /* StringTokenizer.cpp */, - F5BADAD802F4DB9C01CD4EB1 /* StringTokenizer.h */, F5BADAD902F4DB9C01CD4EB1 /* StringUtils.cpp */, F5BADADA02F4DB9C01CD4EB1 /* StringUtils.h */, ); @@ -612,6 +583,8 @@ F5CC9DC90356A67F01D799AD /* CppMessagePortServer.cpp */, 84C3016504720AAB008D3B10 /* CppScrap.h */, 84C3016604720AAB008D3B10 /* CppScrap.cpp */, + D3F94BA408E3A6F500496C35 /* PrivateRunLoop.cpp */, + D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */, ); name = "Shared Source"; sourceTree = ""; @@ -630,10 +603,8 @@ 849E101E055022FF009C3C25 /* InputMode.h in Headers */, 849E101F055022FF009C3C25 /* HiraganaInputMode.h in Headers */, 849E1020055022FF009C3C25 /* KanjiConversionMode.h in Headers */, - 849E1021055022FF009C3C25 /* StringTokenizer.h in Headers */, 849E1022055022FF009C3C25 /* StringUtils.h in Headers */, 849E1023055022FF009C3C25 /* BIMInputEvents.h in Headers */, - 849E1024055022FF009C3C25 /* CFObjectContainer.h in Headers */, 849E1025055022FF009C3C25 /* CppCFString.h in Headers */, 849E1026055022FF009C3C25 /* CppCFData.h in Headers */, 849E1027055022FF009C3C25 /* WordRegisterMode.h in Headers */, @@ -658,6 +629,7 @@ 849E103B055022FF009C3C25 /* AquaSKK_Prefix.h in Headers */, 849E103C055022FF009C3C25 /* CppScrap.h in Headers */, D3D0C6F9086EECA800319954 /* AsciiConversionMode.h in Headers */, + D3F94BA708E3A6F500496C35 /* PrivateRunLoop.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -667,16 +639,13 @@ files = ( 849E109E055023C8009C3C25 /* BIMClientServer.h in Headers */, 849E109F055023C8009C3C25 /* SKKDictionary.h in Headers */, - 849E10A0055023C8009C3C25 /* StringTokenizer.h in Headers */, 849E10A1055023C8009C3C25 /* StringUtils.h in Headers */, 849E10A2055023C8009C3C25 /* SKKServer.h in Headers */, 849E10A3055023C8009C3C25 /* CppCFString.h in Headers */, 849E10A4055023C8009C3C25 /* OkuriganaEntry.h in Headers */, 849E10A5055023C8009C3C25 /* Foundation.h in Headers */, - 849E10A6055023C8009C3C25 /* TransparentWindow.h in Headers */, 849E10A7055023C8009C3C25 /* CandidatesWindowController.h in Headers */, 849E10A8055023C8009C3C25 /* CandidatesView.h in Headers */, - 849E10A9055023C8009C3C25 /* NSObjectContainer.h in Headers */, 849E10AA055023C8009C3C25 /* CandidatesManager.h in Headers */, 849E10AB055023C8009C3C25 /* CppCFData.h in Headers */, 849E10AC055023C8009C3C25 /* UserDicSaver.h in Headers */, @@ -692,6 +661,7 @@ 849E10B6055023C8009C3C25 /* Socket.h in Headers */, 849E10B7055023C8009C3C25 /* Skkserv.h in Headers */, D3332B36086DA9FE001C607D /* CandidatesFrame.h in Headers */, + D3F94BA908E3A6F500496C35 /* PrivateRunLoop.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -856,12 +826,9 @@ 849E1044055022FF009C3C25 /* BIM.cpp in Sources */, 849E1045055022FF009C3C25 /* BIMComponent.cpp in Sources */, 849E1046055022FF009C3C25 /* BIMInputEvents.cpp in Sources */, - 849E1047055022FF009C3C25 /* InputMode.cpp in Sources */, 849E1048055022FF009C3C25 /* HiraganaInputMode.cpp in Sources */, 849E1049055022FF009C3C25 /* KanjiConversionMode.cpp in Sources */, - 849E104A055022FF009C3C25 /* StringTokenizer.cpp in Sources */, 849E104B055022FF009C3C25 /* StringUtils.cpp in Sources */, - 849E104C055022FF009C3C25 /* CFObjectContainer.cpp in Sources */, 849E104D055022FF009C3C25 /* CppCFString.cpp in Sources */, 849E104E055022FF009C3C25 /* CppCFData.cpp in Sources */, 849E104F055022FF009C3C25 /* WordRegisterMode.cpp in Sources */, @@ -870,7 +837,6 @@ 849E1052055022FF009C3C25 /* IMSessionInputMode.cpp in Sources */, 849E1053055022FF009C3C25 /* ZenKataInputMode.cpp in Sources */, 849E1054055022FF009C3C25 /* HanKataInputMode.cpp in Sources */, - 849E1056055022FF009C3C25 /* RegistrationStarter.cpp in Sources */, 849E1057055022FF009C3C25 /* HanAscInputMode.cpp in Sources */, 849E1058055022FF009C3C25 /* ZenAscInputMode.cpp in Sources */, 849E1059055022FF009C3C25 /* KanaTreeElement.cpp in Sources */, @@ -885,6 +851,7 @@ 849E1062055022FF009C3C25 /* SkkConfig.cpp in Sources */, 849E1063055022FF009C3C25 /* CppScrap.cpp in Sources */, D3D0C6F8086EECA800319954 /* AsciiConversionMode.cpp in Sources */, + D3F94BA608E3A6F500496C35 /* PrivateRunLoop.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -894,22 +861,18 @@ files = ( 849E10BE055023C8009C3C25 /* BS.mm in Sources */, 849E10BF055023C8009C3C25 /* SKKDictionary.cpp in Sources */, - 849E10C0055023C8009C3C25 /* StringTokenizer.cpp in Sources */, 849E10C1055023C8009C3C25 /* StringUtils.cpp in Sources */, 849E10C2055023C8009C3C25 /* SKKServer.cpp in Sources */, 849E10C3055023C8009C3C25 /* CppCFString.cpp in Sources */, 849E10C4055023C8009C3C25 /* OkuriganaEntry.cpp in Sources */, 849E10C5055023C8009C3C25 /* Foundation.mm in Sources */, - 849E10C6055023C8009C3C25 /* TransparentWindow.m in Sources */, 849E10C7055023C8009C3C25 /* CandidatesWindowController.mm in Sources */, 849E10C8055023C8009C3C25 /* CandidatesView.mm in Sources */, - 849E10C9055023C8009C3C25 /* NSObjectContainer.mm in Sources */, 849E10CA055023C8009C3C25 /* CandidatesManager.mm in Sources */, 849E10CB055023C8009C3C25 /* CppCFData.cpp in Sources */, 849E10CC055023C8009C3C25 /* UserDicSaver.mm in Sources */, 849E10CD055023C8009C3C25 /* PreferencesController.mm in Sources */, 849E10CE055023C8009C3C25 /* DMDictionary.cpp in Sources */, - 849E10CF055023C8009C3C25 /* Dictionary.cpp in Sources */, 849E10D0055023C8009C3C25 /* CppMessagePortConnection.cpp in Sources */, 849E10D1055023C8009C3C25 /* ServerConnection.cpp in Sources */, 849E10D2055023C8009C3C25 /* CppMessagePortServer.cpp in Sources */, @@ -918,6 +881,7 @@ 849E10D5055023C8009C3C25 /* Socket.cpp in Sources */, 849E10D6055023C8009C3C25 /* Skkserv.cpp in Sources */, D3332B37086DA9FE001C607D /* CandidatesFrame.m in Sources */, + D3F94BA808E3A6F500496C35 /* PrivateRunLoop.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From t-suwa ＠ users.sourceforge.jp Fri Sep 23 22:29:11 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 22:29:11 +0900 Subject: [aquaskk-changes 46] CVS update: AquaSKK/net Message-ID: <20050923132911.B47DC2AC078@users.sourceforge.jp> Index: AquaSKK/net/Socket.cpp diff -u AquaSKK/net/Socket.cpp:1.1.1.2 AquaSKK/net/Socket.cpp:1.1.1.2.2.1 --- AquaSKK/net/Socket.cpp:1.1.1.2 Sun Jul 17 19:50:32 2005 +++ AquaSKK/net/Socket.cpp Fri Sep 23 22:29:11 2005 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: Socket.cpp,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $ + $Id: Socket.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:11 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Socket.h" + #include #include #include @@ -29,6 +29,7 @@ #include #include #include +#include "Socket.h" using namespace net; using namespace std; Index: AquaSKK/net/Socket.h diff -u AquaSKK/net/Socket.h:1.1.1.2 AquaSKK/net/Socket.h:1.1.1.2.2.1 --- AquaSKK/net/Socket.h:1.1.1.2 Sun Jul 17 19:50:32 2005 +++ AquaSKK/net/Socket.h Fri Sep 23 22:29:11 2005 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: Socket.h,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $ + $Id: Socket.h,v 1.1.1.2.2.1 2005/09/23 13:29:11 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,9 +18,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #pragma once -#include -#include + namespace net { class Socket; } From t-suwa ＠ users.sourceforge.jp Fri Sep 23 22:29:11 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 22:29:11 +0900 Subject: [aquaskk-changes 47] CVS update: AquaSKK/util Message-ID: <20050923132911.DA8522AC04F@users.sourceforge.jp> Index: AquaSKK/util/StringUtils.cpp diff -u AquaSKK/util/StringUtils.cpp:1.1.1.2 AquaSKK/util/StringUtils.cpp:1.1.1.2.2.1 --- AquaSKK/util/StringUtils.cpp:1.1.1.2 Sun Jul 17 19:50:32 2005 +++ AquaSKK/util/StringUtils.cpp Fri Sep 23 22:29:11 2005 @@ -1,5 +1,5 @@ /* - $Id: StringUtils.cpp,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $ + $Id: StringUtils.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:11 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -19,8 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include +#include #include "StringUtils.h" -#include using namespace std; string util::toLower(const string& src) Index: AquaSKK/util/StringUtils.h diff -u AquaSKK/util/StringUtils.h:1.1.1.2 AquaSKK/util/StringUtils.h:1.1.1.2.2.1 --- AquaSKK/util/StringUtils.h:1.1.1.2 Sun Jul 17 19:50:32 2005 +++ AquaSKK/util/StringUtils.h Fri Sep 23 22:29:11 2005 @@ -1,5 +1,5 @@ /* - $Id: StringUtils.h,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $ + $Id: StringUtils.h,v 1.1.1.2.2.1 2005/09/23 13:29:11 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -21,12 +21,9 @@ */ #pragma once -#include -#include using namespace std; namespace util { string toLower(const string& src); string join(const char delimitor,const vector& vec); } - From t-suwa ＠ users.sourceforge.jp Fri Sep 23 22:33:15 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 22:33:15 +0900 Subject: [aquaskk-changes 48] CVS update: AquaSKK/Package/scripts Message-ID: <20050923133315.F3EC32AC016@users.sourceforge.jp> Index: AquaSKK/Package/scripts/preflight diff -u /dev/null AquaSKK/Package/scripts/preflight:1.1.2.1 --- /dev/null Fri Sep 23 22:33:15 2005 +++ AquaSKK/Package/scripts/preflight Fri Sep 23 22:33:15 2005 @@ -0,0 +1,4 @@ +#!/bin/sh + +# remove previous version +rm -fr /Library/Components/AquaSKKInputMethod.component From t-suwa ＠ users.sourceforge.jp Fri Sep 23 23:08:45 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 23:08:45 +0900 Subject: [aquaskk-changes 49] CVS update: AquaSKK/util Message-ID: <20050923140845.9DBFA2AC016@users.sourceforge.jp> Index: AquaSKK/util/StringUtils.cpp diff -u AquaSKK/util/StringUtils.cpp:1.1.1.2.2.1 AquaSKK/util/StringUtils.cpp:1.1.1.2 --- AquaSKK/util/StringUtils.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:11 2005 +++ AquaSKK/util/StringUtils.cpp Sun Jul 17 19:50:32 2005 @@ -1,5 +1,5 @@ /* - $Id: StringUtils.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:11 t-suwa Exp $ + $Id: StringUtils.cpp,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -19,10 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#include -#include #include "StringUtils.h" +#include using namespace std; string util::toLower(const string& src) Index: AquaSKK/util/StringUtils.h diff -u AquaSKK/util/StringUtils.h:1.1.1.2.2.1 AquaSKK/util/StringUtils.h:1.1.1.2 --- AquaSKK/util/StringUtils.h:1.1.1.2.2.1 Fri Sep 23 22:29:11 2005 +++ AquaSKK/util/StringUtils.h Sun Jul 17 19:50:32 2005 @@ -1,5 +1,5 @@ /* - $Id: StringUtils.h,v 1.1.1.2.2.1 2005/09/23 13:29:11 t-suwa Exp $ + $Id: StringUtils.h,v 1.1.1.2 2005/07/17 10:50:32 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -21,9 +21,12 @@ */ #pragma once +#include +#include using namespace std; namespace util { string toLower(const string& src); string join(const char delimitor,const vector& vec); } + From t-suwa ＠ users.sourceforge.jp Fri Sep 23 23:09:49 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 23:09:49 +0900 Subject: [aquaskk-changes 50] CVS update: AquaSKK Message-ID: <20050923140949.938AA2AC016@users.sourceforge.jp> Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.4.2.2 AquaSKK/ChangeLog:1.4.2.3 --- AquaSKK/ChangeLog:1.4.2.2 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ChangeLog Fri Sep 23 23:09:49 2005 @@ -1,5 +1,7 @@ 2005-09-23 Tomotaka SUWA + * util/StringUtils.*: ??B + * InputMode.cpp, RegistrationStarter.cpp, Dictionary.cpp, CFObjectContainer.*, TransparentWindow.*, util/StringTokenizer.*, util/NSObjectContainer.*: ??B Index: AquaSKK/SKKServer.cpp diff -u AquaSKK/SKKServer.cpp:1.1.1.2.2.1 AquaSKK/SKKServer.cpp:1.1.1.2.2.2 --- AquaSKK/SKKServer.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/SKKServer.cpp Fri Sep 23 23:09:49 2005 @@ -1,4 +1,4 @@ -/* $Id: SKKServer.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: SKKServer.cpp,v 1.1.1.2.2.2 2005/09/23 14:09:49 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -28,8 +28,6 @@ #include "DMDictionary.h" #include "SKKDictionary.h" #include "SKKServer.h" -#include "StringUtils.h" -using namespace util; #if 0 # define D_PRINTF printf From t-suwa ＠ users.sourceforge.jp Fri Sep 23 23:09:49 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Fri, 23 Sep 2005 23:09:49 +0900 Subject: [aquaskk-changes 51] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20050923140949.B3C272AC081@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.2 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.3 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.2 Fri Sep 23 22:29:11 2005 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Fri Sep 23 23:09:49 2005 @@ -15,7 +15,6 @@ 849E101E055022FF009C3C25 /* InputMode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5238B2802F2EFCC01CD4EB1 /* InputMode.h */; }; 849E101F055022FF009C3C25 /* HiraganaInputMode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5238B2C02F2F11C01CD4EB1 /* HiraganaInputMode.h */; }; 849E1020055022FF009C3C25 /* KanjiConversionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5066C4502F3CF1B01CD4EB1 /* KanjiConversionMode.h */; }; - 849E1022055022FF009C3C25 /* StringUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADADA02F4DB9C01CD4EB1 /* StringUtils.h */; }; 849E1023055022FF009C3C25 /* BIMInputEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A38B2A005639B61153986C /* BIMInputEvents.h */; }; 849E1025055022FF009C3C25 /* CppCFString.h in Headers */ = {isa = PBXBuildFile; fileRef = F5D6B81402F64CF5011002E2 /* CppCFString.h */; }; 849E1026055022FF009C3C25 /* CppCFData.h in Headers */ = {isa = PBXBuildFile; fileRef = F554D11D03026A4301CD4EB1 /* CppCFData.h */; }; @@ -50,7 +49,6 @@ 849E1046055022FF009C3C25 /* BIMInputEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01A38B1B0056394F1153986C /* BIMInputEvents.cpp */; }; 849E1048055022FF009C3C25 /* HiraganaInputMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5238B2B02F2F11C01CD4EB1 /* HiraganaInputMode.cpp */; }; 849E1049055022FF009C3C25 /* KanjiConversionMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5066C4402F3CF1B01CD4EB1 /* KanjiConversionMode.cpp */; }; - 849E104B055022FF009C3C25 /* StringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAD902F4DB9C01CD4EB1 /* StringUtils.cpp */; }; 849E104D055022FF009C3C25 /* CppCFString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D6B81302F64CF5011002E2 /* CppCFString.cpp */; }; 849E104E055022FF009C3C25 /* CppCFData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F554D11C03026A4301CD4EB1 /* CppCFData.cpp */; }; 849E104F055022FF009C3C25 /* WordRegisterMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F50A6E4303038EA901CD4EB1 /* WordRegisterMode.cpp */; }; @@ -76,7 +74,6 @@ 849E106A055022FF009C3C25 /* skkicons.r in Rez */ = {isa = PBXBuildFile; fileRef = F551EB32030E3EA6012D3D1A /* skkicons.r */; }; 849E109E055023C8009C3C25 /* BIMClientServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A38B3600563A7B1153986C /* BIMClientServer.h */; }; 849E109F055023C8009C3C25 /* SKKDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADAD302F4D02501CD4EB1 /* SKKDictionary.h */; }; - 849E10A1055023C8009C3C25 /* StringUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADADA02F4DB9C01CD4EB1 /* StringUtils.h */; }; 849E10A2055023C8009C3C25 /* SKKServer.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BADAE602F508CF01CD4EB1 /* SKKServer.h */; }; 849E10A3055023C8009C3C25 /* CppCFString.h in Headers */ = {isa = PBXBuildFile; fileRef = F5D6B81402F64CF5011002E2 /* CppCFString.h */; }; 849E10A4055023C8009C3C25 /* OkuriganaEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = F522695402FB791D01CD4EB1 /* OkuriganaEntry.h */; }; @@ -103,7 +100,6 @@ 849E10BC055023C8009C3C25 /* Candidates.nib in Resources */ = {isa = PBXBuildFile; fileRef = F551EE26030FF4B6012D3D1A /* Candidates.nib */; }; 849E10BE055023C8009C3C25 /* BS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0197B303009015467F000001 /* BS.mm */; }; 849E10BF055023C8009C3C25 /* SKKDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAD202F4D02501CD4EB1 /* SKKDictionary.cpp */; }; - 849E10C1055023C8009C3C25 /* StringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAD902F4DB9C01CD4EB1 /* StringUtils.cpp */; }; 849E10C2055023C8009C3C25 /* SKKServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BADAE502F508CF01CD4EB1 /* SKKServer.cpp */; }; 849E10C3055023C8009C3C25 /* CppCFString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D6B81302F64CF5011002E2 /* CppCFString.cpp */; }; 849E10C4055023C8009C3C25 /* OkuriganaEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F522695302FB791D01CD4EB1 /* OkuriganaEntry.cpp */; }; @@ -300,8 +296,6 @@ F5B731C902FFCCDA01CD4EB1 /* CandidatesView.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = CandidatesView.h; sourceTree = ""; }; F5BADAD202F4D02501CD4EB1 /* SKKDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = SKKDictionary.cpp; sourceTree = ""; }; F5BADAD302F4D02501CD4EB1 /* SKKDictionary.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = SKKDictionary.h; sourceTree = ""; }; - F5BADAD902F4DB9C01CD4EB1 /* StringUtils.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = StringUtils.cpp; sourceTree = ""; }; - F5BADADA02F4DB9C01CD4EB1 /* StringUtils.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = StringUtils.h; sourceTree = ""; }; F5BADAE502F508CF01CD4EB1 /* SKKServer.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = SKKServer.cpp; sourceTree = ""; }; F5BADAE602F508CF01CD4EB1 /* SKKServer.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = SKKServer.h; sourceTree = ""; }; F5C89DC503474AF201CD4EB1 /* DMDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = DMDictionary.cpp; sourceTree = ""; }; @@ -562,8 +556,6 @@ F5BADAD602F4DB9C01CD4EB1 /* util */ = { isa = PBXGroup; children = ( - F5BADAD902F4DB9C01CD4EB1 /* StringUtils.cpp */, - F5BADADA02F4DB9C01CD4EB1 /* StringUtils.h */, ); path = util; sourceTree = ""; @@ -603,7 +595,6 @@ 849E101E055022FF009C3C25 /* InputMode.h in Headers */, 849E101F055022FF009C3C25 /* HiraganaInputMode.h in Headers */, 849E1020055022FF009C3C25 /* KanjiConversionMode.h in Headers */, - 849E1022055022FF009C3C25 /* StringUtils.h in Headers */, 849E1023055022FF009C3C25 /* BIMInputEvents.h in Headers */, 849E1025055022FF009C3C25 /* CppCFString.h in Headers */, 849E1026055022FF009C3C25 /* CppCFData.h in Headers */, @@ -639,7 +630,6 @@ files = ( 849E109E055023C8009C3C25 /* BIMClientServer.h in Headers */, 849E109F055023C8009C3C25 /* SKKDictionary.h in Headers */, - 849E10A1055023C8009C3C25 /* StringUtils.h in Headers */, 849E10A2055023C8009C3C25 /* SKKServer.h in Headers */, 849E10A3055023C8009C3C25 /* CppCFString.h in Headers */, 849E10A4055023C8009C3C25 /* OkuriganaEntry.h in Headers */, @@ -828,7 +818,6 @@ 849E1046055022FF009C3C25 /* BIMInputEvents.cpp in Sources */, 849E1048055022FF009C3C25 /* HiraganaInputMode.cpp in Sources */, 849E1049055022FF009C3C25 /* KanjiConversionMode.cpp in Sources */, - 849E104B055022FF009C3C25 /* StringUtils.cpp in Sources */, 849E104D055022FF009C3C25 /* CppCFString.cpp in Sources */, 849E104E055022FF009C3C25 /* CppCFData.cpp in Sources */, 849E104F055022FF009C3C25 /* WordRegisterMode.cpp in Sources */, @@ -861,7 +850,6 @@ files = ( 849E10BE055023C8009C3C25 /* BS.mm in Sources */, 849E10BF055023C8009C3C25 /* SKKDictionary.cpp in Sources */, - 849E10C1055023C8009C3C25 /* StringUtils.cpp in Sources */, 849E10C2055023C8009C3C25 /* SKKServer.cpp in Sources */, 849E10C3055023C8009C3C25 /* CppCFString.cpp in Sources */, 849E10C4055023C8009C3C25 /* OkuriganaEntry.cpp in Sources */, From t-suwa ＠ users.sourceforge.jp Sat Sep 24 09:29:34 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 09:29:34 +0900 Subject: [aquaskk-changes 52] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20050924002934.854502AC081@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.3 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.4 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.3 Fri Sep 23 23:09:49 2005 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Sat Sep 24 09:29:34 2005 @@ -118,6 +118,8 @@ 849E10D4055023C8009C3C25 /* ServerMessageReceiver.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5DEF61A0357174401CD0AD3 /* ServerMessageReceiver.mm */; }; 849E10D5055023C8009C3C25 /* Socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 847A147D04A2F8E9008925B0 /* Socket.cpp */; }; 849E10D6055023C8009C3C25 /* Skkserv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 847A148204A31366008925B0 /* Skkserv.cpp */; }; + D311227D08E45154003A91E1 /* TransparentWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = D311227B08E45154003A91E1 /* TransparentWindow.h */; }; + D311227E08E45154003A91E1 /* TransparentWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = D311227C08E45154003A91E1 /* TransparentWindow.m */; }; D316D8160876D38C0056B612 /* AquaSKK-FullRoman.tif in Resources */ = {isa = PBXBuildFile; fileRef = D316D8110876D38B0056B612 /* AquaSKK-FullRoman.tif */; }; D316D8170876D38C0056B612 /* AquaSKK-HalfKatakana.tif in Resources */ = {isa = PBXBuildFile; fileRef = D316D8120876D38B0056B612 /* AquaSKK-HalfKatakana.tif */; }; D316D8180876D38C0056B612 /* AquaSKK-Hirakana.tif in Resources */ = {isa = PBXBuildFile; fileRef = D316D8130876D38B0056B612 /* AquaSKK-Hirakana.tif */; }; @@ -132,12 +134,12 @@ D3332EFA086DB18B001C607D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3332EF8086DB18B001C607D /* Cocoa.framework */; }; D3332EFE086DB196001C607D /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3332EFD086DB196001C607D /* CoreServices.framework */; }; D3332EFF086DB196001C607D /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3332EFD086DB196001C607D /* CoreServices.framework */; }; + D365BB1908E4B86B000B9512 /* PrivateRunLoop.mm in Sources */ = {isa = PBXBuildFile; fileRef = D365BB1808E4B86B000B9512 /* PrivateRunLoop.mm */; }; + D365BB1A08E4B86B000B9512 /* PrivateRunLoop.mm in Sources */ = {isa = PBXBuildFile; fileRef = D365BB1808E4B86B000B9512 /* PrivateRunLoop.mm */; }; D3D0C6F8086EECA800319954 /* AsciiConversionMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3D0C6F6086EECA800319954 /* AsciiConversionMode.cpp */; }; D3D0C6F9086EECA800319954 /* AsciiConversionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = D3D0C6F7086EECA800319954 /* AsciiConversionMode.h */; }; D3D46F7B0872F755009707C1 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D3D46F790872F755009707C1 /* InfoPlist.strings */; }; - D3F94BA608E3A6F500496C35 /* PrivateRunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3F94BA408E3A6F500496C35 /* PrivateRunLoop.cpp */; }; D3F94BA708E3A6F500496C35 /* PrivateRunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */; }; - D3F94BA808E3A6F500496C35 /* PrivateRunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3F94BA408E3A6F500496C35 /* PrivateRunLoop.cpp */; }; D3F94BA908E3A6F500496C35 /* PrivateRunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */; }; /* End PBXBuildFile section */ @@ -215,6 +217,8 @@ 84C301620471FED8008D3B10 /* AquaSKK_Prefix.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = AquaSKK_Prefix.h; sourceTree = ""; }; 84C3016504720AAB008D3B10 /* CppScrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CppScrap.h; sourceTree = ""; }; 84C3016604720AAB008D3B10 /* CppScrap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CppScrap.cpp; sourceTree = ""; }; + D311227B08E45154003A91E1 /* TransparentWindow.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = TransparentWindow.h; sourceTree = ""; }; + D311227C08E45154003A91E1 /* TransparentWindow.m */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.objc; path = TransparentWindow.m; sourceTree = ""; }; D316D8110876D38B0056B612 /* AquaSKK-FullRoman.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "AquaSKK-FullRoman.tif"; path = "Icons/AquaSKK-FullRoman.tif"; sourceTree = ""; }; D316D8120876D38B0056B612 /* AquaSKK-HalfKatakana.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "AquaSKK-HalfKatakana.tif"; path = "Icons/AquaSKK-HalfKatakana.tif"; sourceTree = ""; }; D316D8130876D38B0056B612 /* AquaSKK-Hirakana.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "AquaSKK-Hirakana.tif"; path = "Icons/AquaSKK-Hirakana.tif"; sourceTree = ""; }; @@ -226,10 +230,10 @@ D3332EF2086DB180001C607D /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; D3332EF8086DB18B001C607D /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; D3332EFD086DB196001C607D /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; + D365BB1808E4B86B000B9512 /* PrivateRunLoop.mm */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.objcpp; path = PrivateRunLoop.mm; sourceTree = ""; }; D3D0C6F6086EECA800319954 /* AsciiConversionMode.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = AsciiConversionMode.cpp; sourceTree = ""; }; D3D0C6F7086EECA800319954 /* AsciiConversionMode.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = AsciiConversionMode.h; sourceTree = ""; }; D3D46F7A0872F755009707C1 /* Japanese */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = Japanese; path = Japanese.lproj/InfoPlist.strings; sourceTree = ""; }; - D3F94BA408E3A6F500496C35 /* PrivateRunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = PrivateRunLoop.cpp; sourceTree = ""; }; D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = PrivateRunLoop.h; sourceTree = ""; }; F500AE950356848401D799AD /* ClientConfiguration.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = ClientConfiguration.h; sourceTree = ""; }; F500AE960356848401D799AD /* ClientConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = ClientConfiguration.cpp; sourceTree = ""; }; @@ -361,6 +365,8 @@ 0197B302009015467F000001 /* Source */ = { isa = PBXGroup; children = ( + D311227B08E45154003A91E1 /* TransparentWindow.h */, + D311227C08E45154003A91E1 /* TransparentWindow.m */, F51C27800319F9CD01CD4EB1 /* Candidates Window */, 0197B303009015467F000001 /* BS.mm */, F5FDA61102FF7A1201CD4EB1 /* Foundation.h */, @@ -553,17 +559,9 @@ name = "Candidates Window"; sourceTree = ""; }; - F5BADAD602F4DB9C01CD4EB1 /* util */ = { - isa = PBXGroup; - children = ( - ); - path = util; - sourceTree = ""; - }; F5E6AE7C02F8CD5901CD4EB1 /* Shared Source */ = { isa = PBXGroup; children = ( - F5BADAD602F4DB9C01CD4EB1 /* util */, 847A147C04A2F8E9008925B0 /* net */, F5D6B81402F64CF5011002E2 /* CppCFString.h */, F5D6B81302F64CF5011002E2 /* CppCFString.cpp */, @@ -575,8 +573,8 @@ F5CC9DC90356A67F01D799AD /* CppMessagePortServer.cpp */, 84C3016504720AAB008D3B10 /* CppScrap.h */, 84C3016604720AAB008D3B10 /* CppScrap.cpp */, - D3F94BA408E3A6F500496C35 /* PrivateRunLoop.cpp */, D3F94BA508E3A6F500496C35 /* PrivateRunLoop.h */, + D365BB1808E4B86B000B9512 /* PrivateRunLoop.mm */, ); name = "Shared Source"; sourceTree = ""; @@ -652,6 +650,7 @@ 849E10B7055023C8009C3C25 /* Skkserv.h in Headers */, D3332B36086DA9FE001C607D /* CandidatesFrame.h in Headers */, D3F94BA908E3A6F500496C35 /* PrivateRunLoop.h in Headers */, + D311227D08E45154003A91E1 /* TransparentWindow.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -840,7 +839,7 @@ 849E1062055022FF009C3C25 /* SkkConfig.cpp in Sources */, 849E1063055022FF009C3C25 /* CppScrap.cpp in Sources */, D3D0C6F8086EECA800319954 /* AsciiConversionMode.cpp in Sources */, - D3F94BA608E3A6F500496C35 /* PrivateRunLoop.cpp in Sources */, + D365BB1A08E4B86B000B9512 /* PrivateRunLoop.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -869,7 +868,8 @@ 849E10D5055023C8009C3C25 /* Socket.cpp in Sources */, 849E10D6055023C8009C3C25 /* Skkserv.cpp in Sources */, D3332B37086DA9FE001C607D /* CandidatesFrame.m in Sources */, - D3F94BA808E3A6F500496C35 /* PrivateRunLoop.cpp in Sources */, + D311227E08E45154003A91E1 /* TransparentWindow.m in Sources */, + D365BB1908E4B86B000B9512 /* PrivateRunLoop.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From t-suwa ＠ users.sourceforge.jp Sat Sep 24 09:29:34 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 09:29:34 +0900 Subject: [aquaskk-changes 53] CVS update: AquaSKK/Japanese.lproj/Candidates.nib Message-ID: <20050924002934.A77B12AC01A@users.sourceforge.jp> Index: AquaSKK/Japanese.lproj/Candidates.nib/classes.nib diff -u AquaSKK/Japanese.lproj/Candidates.nib/classes.nib:1.1.1.1 AquaSKK/Japanese.lproj/Candidates.nib/classes.nib:1.1.1.1.2.1 --- AquaSKK/Japanese.lproj/Candidates.nib/classes.nib:1.1.1.1 Sun Jul 17 19:34:46 2005 +++ AquaSKK/Japanese.lproj/Candidates.nib/classes.nib Sat Sep 24 09:29:34 2005 @@ -3,7 +3,6 @@ { CLASS = CandidatesWindowController; LANGUAGE = ObjC; - OUTLETS = {}; SUPERCLASS = NSWindowController; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, Index: AquaSKK/Japanese.lproj/Candidates.nib/info.nib diff -u AquaSKK/Japanese.lproj/Candidates.nib/info.nib:1.1.1.1 AquaSKK/Japanese.lproj/Candidates.nib/info.nib:1.1.1.1.2.1 --- AquaSKK/Japanese.lproj/Candidates.nib/info.nib:1.1.1.1 Sun Jul 17 19:34:46 2005 +++ AquaSKK/Japanese.lproj/Candidates.nib/info.nib Sat Sep 24 09:29:34 2005 @@ -1,16 +1,14 @@ - - + + IBDocumentLocation - 132 288 356 240 0 0 1024 746 + 604 491 356 240 0 0 1280 1002 IBFramework Version - 263.2 - IBOpenObjects - - 5 - + 439.0 + IBOldestOS + 3 IBSystem Version - 5S66 + 8C46 Index: AquaSKK/Japanese.lproj/Candidates.nib/keyedobjects.nib From t-suwa ＠ users.sourceforge.jp Sat Sep 24 09:32:40 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 09:32:40 +0900 Subject: [aquaskk-changes 54] CVS update: AquaSKK/Japanese.lproj/Candidates.nib Message-ID: <20050924003240.980782AC01A@users.sourceforge.jp> From t-suwa ＠ users.sourceforge.jp Sat Sep 24 09:29:34 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 09:29:34 +0900 Subject: [aquaskk-changes 55] CVS update: AquaSKK Message-ID: <20050924002934.599412AC01A@users.sourceforge.jp> Index: AquaSKK/AsciiConversionMode.cpp diff -u AquaSKK/AsciiConversionMode.cpp:1.1.1.1.2.1 AquaSKK/AsciiConversionMode.cpp:1.1.1.1.2.2 --- AquaSKK/AsciiConversionMode.cpp:1.1.1.1.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/AsciiConversionMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: AsciiConversionMode.cpp,v 1.1.1.1.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: AsciiConversionMode.cpp,v 1.1.1.1.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include "BIM.h" Index: AquaSKK/BIMComponent.cpp diff -u AquaSKK/BIMComponent.cpp:1.2.2.1 AquaSKK/BIMComponent.cpp:1.2.2.2 --- AquaSKK/BIMComponent.cpp:1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/BIMComponent.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: BIMComponent.cpp,v 1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: BIMComponent.cpp,v 1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -21,6 +21,7 @@ */ #define TARGET_API_MAC_CARBON 1 +#include #include #include "BIM.h" #include "BIMClientServer.h" Index: AquaSKK/BS.mm diff -u AquaSKK/BS.mm:1.1.1.2 AquaSKK/BS.mm:1.1.1.2.2.1 --- AquaSKK/BS.mm:1.1.1.2 Sun Jul 17 19:50:26 2005 +++ AquaSKK/BS.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ -/* - $Id: BS.mm,v 1.1.1.2 2005/07/17 10:50:26 t-suwa Exp $ +/* -*- objc -*- + $Id: BS.mm,v 1.1.1.2.2.1 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -19,9 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #import -int main( int argc, const char *argv[] ) +int main(int argc, const char *argv[]) { - return NSApplicationMain(argc, argv); + return NSApplicationMain(argc, argv); } Index: AquaSKK/CandidatesFrame.m diff -u AquaSKK/CandidatesFrame.m:1.1.1.1.2.1 AquaSKK/CandidatesFrame.m:1.1.1.1.2.2 --- AquaSKK/CandidatesFrame.m:1.1.1.1.2.1 Fri Sep 23 11:20:44 2005 +++ AquaSKK/CandidatesFrame.m Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: CandidatesFrame.m,v 1.1.1.1.2.1 2005/09/23 02:20:44 t-suwa Exp $ +/* $Id: CandidatesFrame.m,v 1.1.1.1.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import #import "CandidatesFrame.h" @implementation CandidatesFrame Index: AquaSKK/CandidatesManager.mm diff -u AquaSKK/CandidatesManager.mm:1.1.1.2.2.1 AquaSKK/CandidatesManager.mm:1.1.1.2.2.2 --- AquaSKK/CandidatesManager.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CandidatesManager.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: CandidatesManager.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: CandidatesManager.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#import #import #import "CandidatesView.h" #import "CandidatesWindowController.h" Index: AquaSKK/CandidatesView.mm diff -u AquaSKK/CandidatesView.mm:1.1.1.2 AquaSKK/CandidatesView.mm:1.1.1.2.2.1 --- AquaSKK/CandidatesView.mm:1.1.1.2 Sun Jul 17 19:50:26 2005 +++ AquaSKK/CandidatesView.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ -/* - $Id: CandidatesView.mm,v 1.1.1.2 2005/07/17 10:50:26 t-suwa Exp $ +/* -*- objc -*- + $Id: CandidatesView.mm,v 1.1.1.2.2.1 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -19,9 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#import "CandidatesView.h" -#import "CandidatesWindowController.h" + +#import #import "CandidatesFrame.h" +#import "CandidatesView.h" @implementation CandidatesView Index: AquaSKK/CandidatesWindowController.mm diff -u AquaSKK/CandidatesWindowController.mm:1.1.1.2.2.1 AquaSKK/CandidatesWindowController.mm:1.1.1.2.2.2 --- AquaSKK/CandidatesWindowController.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CandidatesWindowController.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: CandidatesWindowController.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: CandidatesWindowController.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import #import "CandidatesView.h" #import "CandidatesWindowController.h" #import "PreferencesController.h" Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.4.2.3 AquaSKK/ChangeLog:1.4.2.4 --- AquaSKK/ChangeLog:1.4.2.3 Fri Sep 23 23:09:49 2005 +++ AquaSKK/ChangeLog Sat Sep 24 09:29:33 2005 @@ -1,3 +1,9 @@ +2005-09-24 Tomotaka SUWA + + * TransparentWindow.*: ?????????????????? + + * PrivateRunLoop.mm: autoreleasepool ???????B + 2005-09-23 Tomotaka SUWA * util/StringUtils.*: ??B Index: AquaSKK/CharacterTranslator.cpp diff -u AquaSKK/CharacterTranslator.cpp:1.1.1.2.2.1 AquaSKK/CharacterTranslator.cpp:1.1.1.2.2.2 --- AquaSKK/CharacterTranslator.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CharacterTranslator.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: CharacterTranslator.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: CharacterTranslator.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/ChildInputMode.cpp diff -u AquaSKK/ChildInputMode.cpp:1.1.1.2.2.1 AquaSKK/ChildInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/ChildInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ChildInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ChildInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ChildInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include "CppCFString.h" #include "CppCFData.h" Index: AquaSKK/ClientConfiguration.cpp diff -u AquaSKK/ClientConfiguration.cpp:1.1.1.2.2.1 AquaSKK/ClientConfiguration.cpp:1.1.1.2.2.2 --- AquaSKK/ClientConfiguration.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ClientConfiguration.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ClientConfiguration.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ClientConfiguration.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include "BIMClientServer.h" #include "CppCFString.h" @@ -53,11 +54,12 @@ CppCFData result = ServerConnectionFactory::theInstance().newConnection().send( - kBasicMessageIsSkkEggLikeNewline); + kBasicMessageIsSkkEggLikeNewline, + kAquaSKKServerRunLoopMode); if(result.getLength() == sizeof(bool)) { // ??????????????? - result.copyData(0,sizeof(bool),&skkEggLikeNewline); + result.copyData(0, sizeof(bool), &skkEggLikeNewline); } else { skkEggLikeNewline = false; } Index: AquaSKK/ClientMessageReceiver.cpp diff -u AquaSKK/ClientMessageReceiver.cpp:1.1.1.2.2.1 AquaSKK/ClientMessageReceiver.cpp:1.1.1.2.2.2 --- AquaSKK/ClientMessageReceiver.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ClientMessageReceiver.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ClientMessageReceiver.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ClientMessageReceiver.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include "BIMClientServer.h" #include "CppCFString.h" Index: AquaSKK/CppCFData.cpp diff -u AquaSKK/CppCFData.cpp:1.1.1.2 AquaSKK/CppCFData.cpp:1.1.1.2.2.1 --- AquaSKK/CppCFData.cpp:1.1.1.2 Sun Jul 17 19:50:27 2005 +++ AquaSKK/CppCFData.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: CppCFData.cpp,v 1.1.1.2 2005/07/17 10:50:27 t-suwa Exp $ +/* $Id: CppCFData.cpp,v 1.1.1.2.2.1 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include #include "CppCFData.h" CppCFData::CppCFData() Index: AquaSKK/CppCFString.cpp diff -u AquaSKK/CppCFString.cpp:1.1.1.2.2.1 AquaSKK/CppCFString.cpp:1.1.1.2.2.2 --- AquaSKK/CppCFString.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CppCFString.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: CppCFString.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: CppCFString.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include "CppCFString.h" Index: AquaSKK/CppMessagePortServer.cpp diff -u AquaSKK/CppMessagePortServer.cpp:1.1.1.2.2.1 AquaSKK/CppMessagePortServer.cpp:1.1.1.2.2.2 --- AquaSKK/CppMessagePortServer.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CppMessagePortServer.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: CppMessagePortServer.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: CppMessagePortServer.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -21,6 +21,7 @@ */ #include +#include #include #include #include "CppCFString.h" Index: AquaSKK/CppScrap.cpp diff -u AquaSKK/CppScrap.cpp:1.1.1.1.2.1 AquaSKK/CppScrap.cpp:1.1.1.1.2.2 --- AquaSKK/CppScrap.cpp:1.1.1.1.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CppScrap.cpp Sat Sep 24 09:29:33 2005 @@ -7,6 +7,7 @@ * */ +#include #include #include "CppCFData.h" #include "CppScrap.h" Index: AquaSKK/DMDictionary.cpp diff -u AquaSKK/DMDictionary.cpp:1.1.1.2.2.1 AquaSKK/DMDictionary.cpp:1.1.1.2.2.2 --- AquaSKK/DMDictionary.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/DMDictionary.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: DMDictionary.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: DMDictionary.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -23,6 +23,7 @@ Directory Maneger???2002.09.25 Shin_ichi Abe. */ +#include #include #include #include "CppCFString.h" Index: AquaSKK/Foundation.mm diff -u AquaSKK/Foundation.mm:1.1.1.2.2.1 AquaSKK/Foundation.mm:1.1.1.2.2.2 --- AquaSKK/Foundation.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/Foundation.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: Foundation.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: Foundation.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,12 +20,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import #import "Foundation.h" #import "CandidatesView.h" #import "CandidatesWindowController.h" #import "UserDicSaver.h" #import "PreferencesController.h" +#include #include #include #include Index: AquaSKK/HanAscInputMode.cpp diff -u AquaSKK/HanAscInputMode.cpp:1.1.1.2.2.1 AquaSKK/HanAscInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/HanAscInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/HanAscInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: HanAscInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: HanAscInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/HanKataInputMode.cpp diff -u AquaSKK/HanKataInputMode.cpp:1.1.1.2.2.1 AquaSKK/HanKataInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/HanKataInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/HanKataInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: HanKataInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: HanKataInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/HiraganaInputMode.cpp diff -u AquaSKK/HiraganaInputMode.cpp:1.1.1.2.2.1 AquaSKK/HiraganaInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/HiraganaInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/HiraganaInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: HiraganaInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: HiraganaInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,10 +18,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include -#include "BIM.h" #include "CppCFString.h" #include "CppCFData.h" #include "InputMode.h" Index: AquaSKK/IMSessionInputMode.cpp diff -u AquaSKK/IMSessionInputMode.cpp:1.1.1.2.2.1 AquaSKK/IMSessionInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/IMSessionInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/IMSessionInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: IMSessionInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: IMSessionInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include "BIM.h" #include "BIMInputEvents.h" Index: AquaSKK/KanaTreeController.cpp diff -u AquaSKK/KanaTreeController.cpp:1.1.1.2.2.1 AquaSKK/KanaTreeController.cpp:1.1.1.2.2.2 --- AquaSKK/KanaTreeController.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/KanaTreeController.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: KanaTreeController.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: KanaTreeController.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/KanaTreeElement.cpp diff -u AquaSKK/KanaTreeElement.cpp:1.1.1.2.2.1 AquaSKK/KanaTreeElement.cpp:1.1.1.2.2.2 --- AquaSKK/KanaTreeElement.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/KanaTreeElement.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: KanaTreeElement.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: KanaTreeElement.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include "CppCFString.h" #include "KanaTreeElement.h" Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.1.1.2.2.1 AquaSKK/KanjiConversionMode.cpp:1.1.1.2.2.2 --- AquaSKK/KanjiConversionMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/KanjiConversionMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: KanjiConversionMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: KanjiConversionMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include "BIM.h" Index: AquaSKK/OkuriganaEntry.cpp diff -u AquaSKK/OkuriganaEntry.cpp:1.1.1.2.2.1 AquaSKK/OkuriganaEntry.cpp:1.1.1.2.2.2 --- AquaSKK/OkuriganaEntry.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/OkuriganaEntry.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: OkuriganaEntry.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ +/* $Id: OkuriganaEntry.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include "CppCFString.h" #include "OkuriganaEntry.h" Index: AquaSKK/ParentInputMode.cpp diff -u AquaSKK/ParentInputMode.cpp:1.1.1.2.2.1 AquaSKK/ParentInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/ParentInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ParentInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ParentInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ParentInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/PreferencesController.mm diff -u AquaSKK/PreferencesController.mm:1.1.1.2.2.2 AquaSKK/PreferencesController.mm:1.1.1.2.2.3 --- AquaSKK/PreferencesController.mm:1.1.1.2.2.2 Fri Sep 23 22:29:10 2005 +++ AquaSKK/PreferencesController.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.mm,v 1.1.1.2.2.2 2005/09/23 13:29:10 t-suwa Exp $ + $Id: PreferencesController.mm,v 1.1.1.2.2.3 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,8 +20,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import #import "PreferencesController.h" +#include #include #include #include @@ -140,7 +142,7 @@ CppCFData data(&skkegglikenewline, sizeof(bool)); ClientConnectionFactory::theInstance().newConnection().send( - kBasicMessageIsSkkEggLikeNewline, data, kAquaSKKClientRunLoopMode); + kBasicMessageIsSkkEggLikeNewline, data); [self saveUserDefault:self]; } Index: AquaSKK/PrivateRunLoop.cpp diff -u AquaSKK/PrivateRunLoop.cpp:1.1.2.1 AquaSKK/PrivateRunLoop.cpp:removed --- AquaSKK/PrivateRunLoop.cpp:1.1.2.1 Fri Sep 23 11:27:44 2005 +++ AquaSKK/PrivateRunLoop.cpp Sat Sep 24 09:29:34 2005 @@ -1,84 +0,0 @@ -/* - $Id: PrivateRunLoop.cpp,v 1.1.2.1 2005/09/23 02:27:44 t-suwa Exp $ - - MacOS X implementation of the SKK input method. - - Copyright (C) 2005 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 - the Free Software Foundation; either version 2 of the License, or - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include -#include -#include "PrivateRunLoop.h" - -PrivateRunLoop::PrivateRunLoop( - const CFStringRef mode, CFRunLoopSourceRef runLoopSource) - : mode_(mode), runLoop_(0) -{ - // ?? - runLoopSource_ = (CFRunLoopSourceRef)CFRetain(runLoopSource); - - // ???(=????)??????????????????? - MPCreateQueue(¬ifyQueue_); - - // ???????? - MPCreateTask(PrivateRunLoop::entryPoint, - this, - 0, - notifyQueue_, - NULL, - NULL, - 0, - &taskID_); -} - -PrivateRunLoop::~PrivateRunLoop() -{ - // ??????? - CFRunLoopStop(runLoop_); - - // ??????????? - MPWaitOnQueue(notifyQueue_, NULL, NULL, NULL, kDurationForever); - MPDeleteQueue(notifyQueue_); - - // ?? - CFRelease(runLoopSource_); -} - -// ????? -OSStatus PrivateRunLoop::entryPoint(void* param) -{ - PrivateRunLoop* self = (PrivateRunLoop*)param; - self->runLoop_ = CFRunLoopGetCurrent(); - - // ???????- CFRunLoopAddSource(self->runLoop_, - self->runLoopSource_, - self->mode_); - - // CFRunLoopStop() ????????????????- SInt32 result; - do { - result = CFRunLoopRunInMode(self->mode_, 1, true); - } while(result != kCFRunLoopRunStopped); - - // ??? - CFRunLoopRemoveSource(self->runLoop_, - self->runLoopSource_, - self->mode_); - - return 0; -} Index: AquaSKK/PrivateRunLoop.mm diff -u /dev/null AquaSKK/PrivateRunLoop.mm:1.1.2.1 --- /dev/null Sat Sep 24 09:29:34 2005 +++ AquaSKK/PrivateRunLoop.mm Sat Sep 24 09:29:33 2005 @@ -0,0 +1,91 @@ +/* -*- objc -*- + $Id: PrivateRunLoop.mm,v 1.1.2.1 2005/09/24 00:29:33 t-suwa Exp $ + + MacOS X implementation of the SKK input method. + + Copyright (C) 2005 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#import + +#include +#include +#include "PrivateRunLoop.h" + +PrivateRunLoop::PrivateRunLoop( + const CFStringRef mode, CFRunLoopSourceRef runLoopSource) + : mode_(mode), runLoop_(0) +{ + // ?? + runLoopSource_ = (CFRunLoopSourceRef)CFRetain(runLoopSource); + + // ???(=????)??????????????????? + MPCreateQueue(¬ifyQueue_); + + // ???????? + MPCreateTask(PrivateRunLoop::entryPoint, + this, + 0, + notifyQueue_, + NULL, + NULL, + 0, + &taskID_); +} + +PrivateRunLoop::~PrivateRunLoop() +{ + // ??????? + CFRunLoopStop(runLoop_); + + // ??????????? + MPWaitOnQueue(notifyQueue_, NULL, NULL, NULL, kDurationForever); + MPDeleteQueue(notifyQueue_); + + // ?? + CFRelease(runLoopSource_); +} + +// ????? +OSStatus PrivateRunLoop::entryPoint(void* param) +{ + // autorelease pool ????????A??????????? + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + PrivateRunLoop* self = (PrivateRunLoop*)param; + self->runLoop_ = CFRunLoopGetCurrent(); + + // ???????+ CFRunLoopAddSource(self->runLoop_, + self->runLoopSource_, + self->mode_); + + // CFRunLoopStop() ????????????????+ SInt32 result; + do { + result = CFRunLoopRunInMode(self->mode_, 1, true); + } while(result != kCFRunLoopRunStopped); + + // ??? + CFRunLoopRemoveSource(self->runLoop_, + self->runLoopSource_, + self->mode_); + + [pool release]; + + return 0; +} Index: AquaSKK/SKKDictionary.cpp diff -u AquaSKK/SKKDictionary.cpp:1.1.1.2.2.1 AquaSKK/SKKDictionary.cpp:1.1.1.2.2.2 --- AquaSKK/SKKDictionary.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/SKKDictionary.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: SKKDictionary.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: SKKDictionary.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/SKKServer.cpp diff -u AquaSKK/SKKServer.cpp:1.1.1.2.2.2 AquaSKK/SKKServer.cpp:1.1.1.2.2.3 --- AquaSKK/SKKServer.cpp:1.1.1.2.2.2 Fri Sep 23 23:09:49 2005 +++ AquaSKK/SKKServer.cpp Sat Sep 24 09:29:33 2005 @@ -1,4 +1,4 @@ -/* $Id: SKKServer.cpp,v 1.1.1.2.2.2 2005/09/23 14:09:49 t-suwa Exp $ +/* $Id: SKKServer.cpp,v 1.1.1.2.2.3 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/ServerConnection.cpp diff -u AquaSKK/ServerConnection.cpp:1.1.1.2.2.1 AquaSKK/ServerConnection.cpp:1.1.1.2.2.2 --- AquaSKK/ServerConnection.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ServerConnection.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ServerConnection.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ServerConnection.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,12 +20,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include +#include "BIMClientServer.h" #include "CppCFString.h" #include "CppCFData.h" #include "CppMessagePortConnection.h" #include "ServerConnection.h" -#include "BIMClientServer.h" ServerConnection::ServerConnection(const CppCFString& port) throw(std::exception) Index: AquaSKK/ServerConnectionFactory.cpp diff -u AquaSKK/ServerConnectionFactory.cpp:1.1.1.2.2.1 AquaSKK/ServerConnectionFactory.cpp:1.1.1.2.2.2 --- AquaSKK/ServerConnectionFactory.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ServerConnectionFactory.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ServerConnectionFactory.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ServerConnectionFactory.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include "BIMClientServer.h" #include "CppCFString.h" Index: AquaSKK/ServerMessageReceiver.mm diff -u AquaSKK/ServerMessageReceiver.mm:1.1.1.2.2.1 AquaSKK/ServerMessageReceiver.mm:1.1.1.2.2.2 --- AquaSKK/ServerMessageReceiver.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ServerMessageReceiver.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: ServerMessageReceiver.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ServerMessageReceiver.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -26,6 +26,7 @@ #import "PreferencesController.h" #import "UserDicSaver.h" +#include #include #include #include @@ -236,7 +237,7 @@ bool isSkkEggLikeNewline = [[PreferencesController sharedController] isSkkEggLikeNewline] ? true : false; - return CppCFData(&isSkkEggLikeNewline,sizeof(bool)); + return CppCFData(&isSkkEggLikeNewline, sizeof(bool)); } CppCFData ServerMessageReceiver::fetchCompletions(const CppCFData& attachment) Index: AquaSKK/SkkConfig.cpp diff -u AquaSKK/SkkConfig.cpp:1.1.1.2.2.1 AquaSKK/SkkConfig.cpp:1.1.1.2.2.2 --- AquaSKK/SkkConfig.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/SkkConfig.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - * $Id: SkkConfig.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + * $Id: SkkConfig.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ * * KeymapConfig.cpp * AquaSKK @@ -9,6 +9,7 @@ * */ +#include #include #include #include Index: AquaSKK/Skkserv.cpp diff -u AquaSKK/Skkserv.cpp:1.1.1.2.2.1 AquaSKK/Skkserv.cpp:1.1.1.2.2.2 --- AquaSKK/Skkserv.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/Skkserv.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: Skkserv.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: Skkserv.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/TransparentWindow.h diff -u /dev/null AquaSKK/TransparentWindow.h:1.1.1.2.2.2 --- /dev/null Sat Sep 24 09:29:34 2005 +++ AquaSKK/TransparentWindow.h Sat Sep 24 09:29:33 2005 @@ -0,0 +1,26 @@ +/* -*- objc -*- + $Id: TransparentWindow.h,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ + --------- + + MacOS X implementation of the SKK input method. + Copyright (C) 2002 phonohawk + + 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + + ＠ interface TransparentWindow : NSWindow +{ +} + ＠ end Index: AquaSKK/TransparentWindow.m diff -u /dev/null AquaSKK/TransparentWindow.m:1.1.1.2.2.2 --- /dev/null Sat Sep 24 09:29:34 2005 +++ AquaSKK/TransparentWindow.m Sat Sep 24 09:29:33 2005 @@ -0,0 +1,38 @@ +/* + $Id: TransparentWindow.m,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ + --------- + + MacOS X implementation of the SKK input method. + Copyright (C) 2002 phonohawk + + 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 + the Free Software Foundation; either version 2 of the License, or + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#import +#import "TransparentWindow.h" + + ＠ implementation TransparentWindow + +- (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag +{ + NSWindow *obj = [super initWithContentRect:contentRect + styleMask:NSBorderlessWindowMask + backing:backingType + defer:flag]; + [obj setOpaque:NO]; + return obj; +} + + ＠ end Index: AquaSKK/UserDicSaver.mm diff -u AquaSKK/UserDicSaver.mm:1.1.1.2.2.1 AquaSKK/UserDicSaver.mm:1.1.1.2.2.2 --- AquaSKK/UserDicSaver.mm:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/UserDicSaver.mm Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: UserDicSaver.mm,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: UserDicSaver.mm,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#import #import "UserDicSaver.h" #include Index: AquaSKK/WordRegisterMode.cpp diff -u AquaSKK/WordRegisterMode.cpp:1.1.1.2.2.1 AquaSKK/WordRegisterMode.cpp:1.1.1.2.2.2 --- AquaSKK/WordRegisterMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/WordRegisterMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: WordRegisterMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: WordRegisterMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/ZenAscInputMode.cpp diff -u AquaSKK/ZenAscInputMode.cpp:1.1.1.2.2.1 AquaSKK/ZenAscInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/ZenAscInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ZenAscInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ZenAscInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ZenAscInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include Index: AquaSKK/ZenKataInputMode.cpp diff -u AquaSKK/ZenKataInputMode.cpp:1.1.1.2.2.1 AquaSKK/ZenKataInputMode.cpp:1.1.1.2.2.2 --- AquaSKK/ZenKataInputMode.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/ZenKataInputMode.cpp Sat Sep 24 09:29:33 2005 @@ -1,5 +1,5 @@ /* - $Id: ZenKataInputMode.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: ZenKataInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include From t-suwa ＠ users.sourceforge.jp Sat Sep 24 11:49:20 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 11:49:20 +0900 Subject: [aquaskk-changes 56] CVS update: AquaSKK Message-ID: <20050924024920.BDDAC2AC012@users.sourceforge.jp> Index: AquaSKK/AquaSKK_Prefix.h diff -u AquaSKK/AquaSKK_Prefix.h:1.1.1.1 AquaSKK/AquaSKK_Prefix.h:1.1.1.1.2.1 --- AquaSKK/AquaSKK_Prefix.h:1.1.1.1 Sun Jul 17 19:34:40 2005 +++ AquaSKK/AquaSKK_Prefix.h Sat Sep 24 11:49:20 2005 @@ -3,9 +3,7 @@ // #ifdef __OBJC__ - #import +#import #endif #include -#include -#include \ No newline at end of file From t-suwa ＠ users.sourceforge.jp Sat Sep 24 11:49:20 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 11:49:20 +0900 Subject: [aquaskk-changes 57] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20050924024920.E7E472AC01A@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.4 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.5 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.4 Sat Sep 24 09:29:34 2005 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Sat Sep 24 11:49:20 2005 @@ -208,8 +208,8 @@ 01A38B34005639D21153986C /* BIM.r */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.rez; path = BIM.r; sourceTree = ""; }; 01A38B3600563A7B1153986C /* BIMClientServer.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = BIMClientServer.h; sourceTree = ""; }; 09BC2ADF005C85D41153986C /* BIMScript.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = BIMScript.h; sourceTree = ""; }; - 847A147D04A2F8E9008925B0 /* Socket.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; path = Socket.cpp; sourceTree = ""; }; - 847A147E04A2F8E9008925B0 /* Socket.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = Socket.h; sourceTree = ""; }; + 847A147D04A2F8E9008925B0 /* Socket.cpp */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.cpp.cpp; name = Socket.cpp; path = net/Socket.cpp; sourceTree = ""; }; + 847A147E04A2F8E9008925B0 /* Socket.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; name = Socket.h; path = net/Socket.h; sourceTree = ""; }; 847A148104A31366008925B0 /* Skkserv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Skkserv.h; sourceTree = ""; }; 847A148204A31366008925B0 /* Skkserv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Skkserv.cpp; sourceTree = ""; }; 849E106F055022FF009C3C25 /* AquaSKKInputMethod.component */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AquaSKKInputMethod.component; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -365,8 +365,6 @@ 0197B302009015467F000001 /* Source */ = { isa = PBXGroup; children = ( - D311227B08E45154003A91E1 /* TransparentWindow.h */, - D311227C08E45154003A91E1 /* TransparentWindow.m */, F51C27800319F9CD01CD4EB1 /* Candidates Window */, 0197B303009015467F000001 /* BS.mm */, F5FDA61102FF7A1201CD4EB1 /* Foundation.h */, @@ -390,6 +388,10 @@ F5C89DC503474AF201CD4EB1 /* DMDictionary.cpp */, 847A148104A31366008925B0 /* Skkserv.h */, 847A148204A31366008925B0 /* Skkserv.cpp */, + 847A147D04A2F8E9008925B0 /* Socket.cpp */, + 847A147E04A2F8E9008925B0 /* Socket.h */, + D311227B08E45154003A91E1 /* TransparentWindow.h */, + D311227C08E45154003A91E1 /* TransparentWindow.m */, ); name = Source; sourceTree = ""; @@ -526,8 +528,6 @@ 847A147C04A2F8E9008925B0 /* net */ = { isa = PBXGroup; children = ( - 847A147E04A2F8E9008925B0 /* Socket.h */, - 847A147D04A2F8E9008925B0 /* Socket.cpp */, ); path = net; sourceTree = ""; @@ -943,7 +943,8 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 2; + GCC_PFE_FILE_C_DIALECTS = "objective-c c++ objective-c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -961,6 +962,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Info-AquaSKKServer.plist"; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.3; OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; @@ -980,7 +982,8 @@ COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 2; + GCC_PFE_FILE_C_DIALECTS = "objective-c c++ objective-c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -999,7 +1002,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Info-AquaSKKServer.plist"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = ""; + MACOSX_DEPLOYMENT_TARGET = 10.3; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; @@ -1016,7 +1019,8 @@ isa = XCBuildConfiguration; buildSettings = { FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 2; + GCC_PFE_FILE_C_DIALECTS = "objective-c c++ objective-c++"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -1034,6 +1038,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Info-AquaSKKServer.plist"; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; @@ -1048,12 +1053,17 @@ D30C5460086B0F720046BC02 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; 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_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -1073,6 +1083,7 @@ INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.3; OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; @@ -1088,10 +1099,15 @@ D30C5461086B0F720046BC02 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; 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_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -1112,7 +1128,7 @@ INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = ""; + MACOSX_DEPLOYMENT_TARGET = 10.3; OPTIMIZATION_CFLAGS = "-O2"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; @@ -1127,8 +1143,13 @@ D30C5462086B0F720046BC02 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; 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_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -1148,6 +1169,7 @@ INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; From t-suwa ＠ users.sourceforge.jp Sat Sep 24 14:05:56 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 14:05:56 +0900 Subject: [aquaskk-changes 58] CVS update: AquaSKK/AquaSKK.pbproj Message-ID: <20050924050556.17F0E2AC01A@users.sourceforge.jp> Index: AquaSKK/AquaSKK.pbproj/project.pbxproj diff -u AquaSKK/AquaSKK.pbproj/project.pbxproj:1.3 AquaSKK/AquaSKK.pbproj/project.pbxproj:1.3.2.1 --- AquaSKK/AquaSKK.pbproj/project.pbxproj:1.3 Tue Sep 6 10:25:12 2005 +++ AquaSKK/AquaSKK.pbproj/project.pbxproj Sat Sep 24 14:05:55 2005 @@ -35,8 +35,6 @@ F5FDA61202FF7A1201CD4EB1, F551EE22030FED06012D3D1A, F551EE23030FED06012D3D1A, - F53AE7E80300B66901CD4EB1, - F53AE7E70300B66901CD4EB1, F5DEF6190357174401CD0AD3, F5DEF61A0357174401CD0AD3, F5DEF6150357002B01CD0AD3, @@ -48,13 +46,14 @@ F588B9D3030BD10D018478EA, F588B9D2030BD10D018478EA, F50D1141034C4ED001CD4EB1, - F50D1142034C4ED001CD4EB1, F5BADAD302F4D02501CD4EB1, F5BADAD202F4D02501CD4EB1, F5C89DC603474AF201CD4EB1, F5C89DC503474AF201CD4EB1, 847A148104A31366008925B0, 847A148204A31366008925B0, + 847A147D04A2F8E9008925B0, + 847A147E04A2F8E9008925B0, ); isa = PBXGroup; name = Source; @@ -323,11 +322,9 @@ F54D049B03B1FA5A01CD0AD3, F54D049903B1F8E801CD0AD3, F5238B2802F2EFCC01CD4EB1, - F5238B2702F2EFCC01CD4EB1, F50A6E4A03039A1D01CD4EB1, F50A6E4903039A1D01CD4EB1, F588B9DD030C00F6018478EA, - F588B9DC030C00F6018478EA, F50A6E500303A10701CD4EB1, F50A6E4F0303A10701CD4EB1, F50A6E560303A31C01CD4EB1, @@ -346,8 +343,6 @@ F5066C4402F3CF1B01CD4EB1, F50A6E4403038EA901CD4EB1, F50A6E4303038EA901CD4EB1, - F5BADC0E02F5405201CD4EB1, - F5BADC0D02F5405201CD4EB1, F505D2ED0314909401CD4EB1, F505D2EC0314909401CD4EB1, F505D2F4031499D001CD4EB1, @@ -425,21 +420,12 @@ settings = { }; }; - 847A147C04A2F8E9008925B0 = { - children = ( - 847A147E04A2F8E9008925B0, - 847A147D04A2F8E9008925B0, - ); - isa = PBXGroup; - path = net; - refType = 4; - sourceTree = ""; - }; 847A147D04A2F8E9008925B0 = { fileEncoding = "-2147483647"; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; - path = Socket.cpp; + name = Socket.cpp; + path = net/Socket.cpp; refType = 4; sourceTree = ""; }; @@ -447,7 +433,8 @@ fileEncoding = "-2147483647"; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; - path = Socket.h; + name = Socket.h; + path = net/Socket.h; refType = 4; sourceTree = ""; }; @@ -487,7 +474,7 @@ ); buildSettings = { FRAMEWORK_SEARCH_PATHS = ""; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 2; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; @@ -496,6 +483,7 @@ INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/default; + MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; @@ -529,10 +517,7 @@ 849E101E055022FF009C3C25, 849E101F055022FF009C3C25, 849E1020055022FF009C3C25, - 849E1021055022FF009C3C25, - 849E1022055022FF009C3C25, 849E1023055022FF009C3C25, - 849E1024055022FF009C3C25, 849E1025055022FF009C3C25, 849E1026055022FF009C3C25, 849E1027055022FF009C3C25, @@ -557,6 +542,7 @@ 849E103B055022FF009C3C25, 849E103C055022FF009C3C25, D3787C1F08ADBF280058EFCE, + D3143F5908E50E40004A51AE, ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -603,30 +589,12 @@ settings = { }; }; - 849E1021055022FF009C3C25 = { - fileRef = F5BADAD802F4DB9C01CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; - 849E1022055022FF009C3C25 = { - fileRef = F5BADADA02F4DB9C01CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; 849E1023055022FF009C3C25 = { fileRef = 01A38B2A005639B61153986C; isa = PBXBuildFile; settings = { }; }; - 849E1024055022FF009C3C25 = { - fileRef = F5BADC0E02F5405201CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; 849E1025055022FF009C3C25 = { fileRef = F5D6B81402F64CF5011002E2; isa = PBXBuildFile; @@ -820,12 +788,8 @@ 849E1044055022FF009C3C25, 849E1045055022FF009C3C25, 849E1046055022FF009C3C25, - 849E1047055022FF009C3C25, 849E1048055022FF009C3C25, 849E1049055022FF009C3C25, - 849E104A055022FF009C3C25, - 849E104B055022FF009C3C25, - 849E104C055022FF009C3C25, 849E104D055022FF009C3C25, 849E104E055022FF009C3C25, 849E104F055022FF009C3C25, @@ -834,7 +798,6 @@ 849E1052055022FF009C3C25, 849E1053055022FF009C3C25, 849E1054055022FF009C3C25, - 849E1056055022FF009C3C25, 849E1057055022FF009C3C25, 849E1058055022FF009C3C25, 849E1059055022FF009C3C25, @@ -849,6 +812,7 @@ 849E1062055022FF009C3C25, 849E1063055022FF009C3C25, D3787C1E08ADBF280058EFCE, + D3143F5A08E50E40004A51AE, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -871,12 +835,6 @@ settings = { }; }; - 849E1047055022FF009C3C25 = { - fileRef = F5238B2702F2EFCC01CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; 849E1048055022FF009C3C25 = { fileRef = F5238B2B02F2F11C01CD4EB1; isa = PBXBuildFile; @@ -889,24 +847,6 @@ settings = { }; }; - 849E104A055022FF009C3C25 = { - fileRef = F5BADAD702F4DB9C01CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; - 849E104B055022FF009C3C25 = { - fileRef = F5BADAD902F4DB9C01CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; - 849E104C055022FF009C3C25 = { - fileRef = F5BADC0D02F5405201CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; 849E104D055022FF009C3C25 = { fileRef = F5D6B81302F64CF5011002E2; isa = PBXBuildFile; @@ -955,12 +895,6 @@ settings = { }; }; - 849E1056055022FF009C3C25 = { - fileRef = F588B9DC030C00F6018478EA; - isa = PBXBuildFile; - settings = { - }; - }; 849E1057055022FF009C3C25 = { fileRef = F57A635803112E4301CD4EB1; isa = PBXBuildFile; @@ -1042,6 +976,7 @@ 849E1064055022FF009C3C25 = { buildActionMask = 2147483647; files = ( + D3143F7A08E51064004A51AE, 849E1065055022FF009C3C25, 849E1066055022FF009C3C25, 849E1067055022FF009C3C25, @@ -1107,13 +1042,14 @@ buildRules = ( ); buildSettings = { - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 2; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = AquaSKK_Prefix.h; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = "Info-AquaSKKServer.plist"; LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/default; + MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; @@ -1135,8 +1071,6 @@ files = ( 849E109E055023C8009C3C25, 849E109F055023C8009C3C25, - 849E10A0055023C8009C3C25, - 849E10A1055023C8009C3C25, 849E10A2055023C8009C3C25, 849E10A3055023C8009C3C25, 849E10A4055023C8009C3C25, @@ -1144,7 +1078,6 @@ 849E10A6055023C8009C3C25, 849E10A7055023C8009C3C25, 849E10A8055023C8009C3C25, - 849E10A9055023C8009C3C25, 849E10AA055023C8009C3C25, 849E10AB055023C8009C3C25, 849E10AC055023C8009C3C25, @@ -1160,6 +1093,7 @@ 849E10B6055023C8009C3C25, 849E10B7055023C8009C3C25, D3787C3C08ADC0110058EFCE, + D3143F5B08E50E40004A51AE, ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -1176,18 +1110,6 @@ settings = { }; }; - 849E10A0055023C8009C3C25 = { - fileRef = F5BADAD802F4DB9C01CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; - 849E10A1055023C8009C3C25 = { - fileRef = F5BADADA02F4DB9C01CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; 849E10A2055023C8009C3C25 = { fileRef = F5BADAE602F508CF01CD4EB1; isa = PBXBuildFile; @@ -1230,12 +1152,6 @@ settings = { }; }; - 849E10A9055023C8009C3C25 = { - fileRef = F53AE7E80300B66901CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; 849E10AA055023C8009C3C25 = { fileRef = F53AE7F60300BC3F01CD4EB1; isa = PBXBuildFile; @@ -1360,8 +1276,6 @@ files = ( 849E10BE055023C8009C3C25, 849E10BF055023C8009C3C25, - 849E10C0055023C8009C3C25, - 849E10C1055023C8009C3C25, 849E10C2055023C8009C3C25, 849E10C3055023C8009C3C25, 849E10C4055023C8009C3C25, @@ -1369,13 +1283,11 @@ 849E10C6055023C8009C3C25, 849E10C7055023C8009C3C25, 849E10C8055023C8009C3C25, - 849E10C9055023C8009C3C25, 849E10CA055023C8009C3C25, 849E10CB055023C8009C3C25, 849E10CC055023C8009C3C25, 849E10CD055023C8009C3C25, 849E10CE055023C8009C3C25, - 849E10CF055023C8009C3C25, 849E10D0055023C8009C3C25, 849E10D1055023C8009C3C25, 849E10D2055023C8009C3C25, @@ -1384,6 +1296,7 @@ 849E10D5055023C8009C3C25, 849E10D6055023C8009C3C25, D3787C3D08ADC0110058EFCE, + D3143F5C08E50E40004A51AE, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -1400,18 +1313,6 @@ settings = { }; }; - 849E10C0055023C8009C3C25 = { - fileRef = F5BADAD702F4DB9C01CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; - 849E10C1055023C8009C3C25 = { - fileRef = F5BADAD902F4DB9C01CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; 849E10C2055023C8009C3C25 = { fileRef = F5BADAE502F508CF01CD4EB1; isa = PBXBuildFile; @@ -1454,12 +1355,6 @@ settings = { }; }; - 849E10C9055023C8009C3C25 = { - fileRef = F53AE7E70300B66901CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; 849E10CA055023C8009C3C25 = { fileRef = F53AE7F50300BC3F01CD4EB1; isa = PBXBuildFile; @@ -1490,12 +1385,6 @@ settings = { }; }; - 849E10CF055023C8009C3C25 = { - fileRef = F50D1142034C4ED001CD4EB1; - isa = PBXBuildFile; - settings = { - }; - }; 849E10D0055023C8009C3C25 = { fileRef = F56B84A10355916201CD0AD3; isa = PBXBuildFile; @@ -1615,6 +1504,52 @@ //D32 //D33 //D34 + D3143F5708E50E40004A51AE = { + fileEncoding = "-2147483647"; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = PrivateRunLoop.h; + refType = 4; + sourceTree = ""; + }; + D3143F5808E50E40004A51AE = { + fileEncoding = "-2147483647"; + isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.objcpp; + path = PrivateRunLoop.mm; + refType = 4; + sourceTree = ""; + }; + D3143F5908E50E40004A51AE = { + fileRef = D3143F5708E50E40004A51AE; + isa = PBXBuildFile; + settings = { + }; + }; + D3143F5A08E50E40004A51AE = { + fileRef = D3143F5808E50E40004A51AE; + isa = PBXBuildFile; + settings = { + }; + }; + D3143F5B08E50E40004A51AE = { + fileRef = D3143F5708E50E40004A51AE; + isa = PBXBuildFile; + settings = { + }; + }; + D3143F5C08E50E40004A51AE = { + fileRef = D3143F5808E50E40004A51AE; + isa = PBXBuildFile; + settings = { + }; + }; + D3143F7A08E51064004A51AE = { + fileRef = F5FDA5F502FF6D8F01CD4EB1; + isa = PBXBuildFile; + settings = { + }; + }; D3787C1C08ADBF280058EFCE = { fileEncoding = "-2147483647"; isa = PBXFileReference; @@ -1991,14 +1926,6 @@ refType = 4; sourceTree = ""; }; - F50D1142034C4ED001CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = Dictionary.cpp; - refType = 4; - sourceTree = ""; - }; F51C27800319F9CD01CD4EB1 = { children = ( D3787C3A08ADC0110058EFCE, @@ -2033,14 +1960,6 @@ refType = 4; sourceTree = ""; }; - F5238B2702F2EFCC01CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = InputMode.cpp; - refType = 4; - sourceTree = ""; - }; F5238B2802F2EFCC01CD4EB1 = { fileEncoding = "-2147483647"; isa = PBXFileReference; @@ -2121,24 +2040,6 @@ refType = 4; sourceTree = ""; }; - F53AE7E70300B66901CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.objcpp; - name = NSObjectContainer.mm; - path = util/NSObjectContainer.mm; - refType = 4; - sourceTree = ""; - }; - F53AE7E80300B66901CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = NSObjectContainer.h; - path = util/NSObjectContainer.h; - refType = 4; - sourceTree = ""; - }; F53AE7F50300BC3F01CD4EB1 = { fileEncoding = "-2147483647"; isa = PBXFileReference; @@ -2385,14 +2286,6 @@ refType = 4; sourceTree = ""; }; - F588B9DC030C00F6018478EA = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = RegistrationStarter.cpp; - refType = 4; - sourceTree = ""; - }; F588B9DD030C00F6018478EA = { fileEncoding = "-2147483647"; isa = PBXFileReference; @@ -2433,50 +2326,6 @@ refType = 4; sourceTree = ""; }; - F5BADAD602F4DB9C01CD4EB1 = { - children = ( - F5BADAD702F4DB9C01CD4EB1, - F5BADAD802F4DB9C01CD4EB1, - F5BADAD902F4DB9C01CD4EB1, - F5BADADA02F4DB9C01CD4EB1, - ); - isa = PBXGroup; - path = util; - refType = 4; - sourceTree = ""; - }; - F5BADAD702F4DB9C01CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = StringTokenizer.cpp; - refType = 4; - sourceTree = ""; - }; - F5BADAD802F4DB9C01CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - path = StringTokenizer.h; - refType = 4; - sourceTree = ""; - }; - F5BADAD902F4DB9C01CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = StringUtils.cpp; - refType = 4; - sourceTree = ""; - }; - F5BADADA02F4DB9C01CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - path = StringUtils.h; - refType = 4; - sourceTree = ""; - }; F5BADAE502F508CF01CD4EB1 = { fileEncoding = "-2147483647"; isa = PBXFileReference; @@ -2493,22 +2342,6 @@ refType = 4; sourceTree = ""; }; - F5BADC0D02F5405201CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = CFObjectContainer.cpp; - refType = 4; - sourceTree = ""; - }; - F5BADC0E02F5405201CD4EB1 = { - fileEncoding = "-2147483647"; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - path = CFObjectContainer.h; - refType = 4; - sourceTree = ""; - }; F5C89DC503474AF201CD4EB1 = { fileEncoding = "-2147483647"; isa = PBXFileReference; @@ -2607,8 +2440,6 @@ }; F5E6AE7C02F8CD5901CD4EB1 = { children = ( - F5BADAD602F4DB9C01CD4EB1, - 847A147C04A2F8E9008925B0, F5D6B81402F64CF5011002E2, F5D6B81302F64CF5011002E2, F554D11D03026A4301CD4EB1, @@ -2619,6 +2450,8 @@ F5CC9DC90356A67F01D799AD, 84C3016504720AAB008D3B10, 84C3016604720AAB008D3B10, + D3143F5708E50E40004A51AE, + D3143F5808E50E40004A51AE, ); isa = PBXGroup; name = "Shared Source"; From t-suwa ＠ users.sourceforge.jp Sat Sep 24 14:05:56 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 14:05:56 +0900 Subject: [aquaskk-changes 59] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20050924050556.3B8EC2AC021@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.5 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.6 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.2.2.5 Sat Sep 24 11:49:20 2005 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Sat Sep 24 14:05:56 2005 @@ -390,8 +390,6 @@ 847A148204A31366008925B0 /* Skkserv.cpp */, 847A147D04A2F8E9008925B0 /* Socket.cpp */, 847A147E04A2F8E9008925B0 /* Socket.h */, - D311227B08E45154003A91E1 /* TransparentWindow.h */, - D311227C08E45154003A91E1 /* TransparentWindow.m */, ); name = Source; sourceTree = ""; @@ -525,13 +523,6 @@ name = Products; sourceTree = ""; }; - 847A147C04A2F8E9008925B0 /* net */ = { - isa = PBXGroup; - children = ( - ); - path = net; - sourceTree = ""; - }; D32DF1A10872107300486B0C /* Icons */ = { isa = PBXGroup; children = ( @@ -555,6 +546,8 @@ F507431702FFB9DD01CD4EB1 /* CandidatesWindowController.mm */, F5B731C902FFCCDA01CD4EB1 /* CandidatesView.h */, F5B731C802FFCCDA01CD4EB1 /* CandidatesView.mm */, + D311227B08E45154003A91E1 /* TransparentWindow.h */, + D311227C08E45154003A91E1 /* TransparentWindow.m */, ); name = "Candidates Window"; sourceTree = ""; @@ -562,7 +555,6 @@ F5E6AE7C02F8CD5901CD4EB1 /* Shared Source */ = { isa = PBXGroup; children = ( - 847A147C04A2F8E9008925B0 /* net */, F5D6B81402F64CF5011002E2 /* CppCFString.h */, F5D6B81302F64CF5011002E2 /* CppCFString.cpp */, F554D11D03026A4301CD4EB1 /* CppCFData.h */, From t-suwa ＠ users.sourceforge.jp Sat Sep 24 14:39:12 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 14:39:12 +0900 Subject: [aquaskk-changes 60] CVS update: AquaSKK Message-ID: <20050924053912.2E92D2AC01A@users.sourceforge.jp> Index: AquaSKK/AsciiConversionMode.h diff -u AquaSKK/AsciiConversionMode.h:1.1.1.1 AquaSKK/AsciiConversionMode.h:1.1.1.1.2.1 --- AquaSKK/AsciiConversionMode.h:1.1.1.1 Sun Jul 17 19:50:26 2005 +++ AquaSKK/AsciiConversionMode.h Sat Sep 24 14:39:12 2005 @@ -1,5 +1,5 @@ /* - $Id: AsciiConversionMode.h,v 1.1.1.1 2005/07/17 10:50:26 t-suwa Exp $ + $Id: AsciiConversionMode.h,v 1.1.1.1.2.1 2005/09/24 05:39:12 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -19,14 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #pragma once -#include -#include -#include "CppCFString.h" -#include "BIM.h" -#include "InputMode.h" -#include "ChildInputMode.h" -#include "RegistrationStarter.h" + using namespace std; class AsciiConversionMode : public ChildInputMode , public RegistrationStarter Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.4.2.4 AquaSKK/ChangeLog:1.4.2.5 --- AquaSKK/ChangeLog:1.4.2.4 Sat Sep 24 09:29:33 2005 +++ AquaSKK/ChangeLog Sat Sep 24 14:39:12 2005 @@ -1,5 +1,7 @@ 2005-09-24 Tomotaka SUWA + * AquaSKK.pbproj: Panther ????????????????? + * TransparentWindow.*: ?????????????????? * PrivateRunLoop.mm: autoreleasepool ???????B Index: AquaSKK/Dictionary.h diff -u AquaSKK/Dictionary.h:1.1.1.2.2.1 AquaSKK/Dictionary.h:1.1.1.2.2.2 --- AquaSKK/Dictionary.h:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/Dictionary.h Sat Sep 24 14:39:12 2005 @@ -1,5 +1,5 @@ /* - $Id: Dictionary.h,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: Dictionary.h,v 1.1.1.2.2.2 2005/09/24 05:39:12 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -21,12 +21,6 @@ */ #pragma once -#if 0 -#include -#include -#include "CppCFString.h" -#include "OkuriganaEntry.h" -#endif using namespace std; /* Index: AquaSKK/ParentInputMode.cpp diff -u AquaSKK/ParentInputMode.cpp:1.1.1.2.2.2 AquaSKK/ParentInputMode.cpp:1.1.1.2.2.3 --- AquaSKK/ParentInputMode.cpp:1.1.1.2.2.2 Sat Sep 24 09:29:33 2005 +++ AquaSKK/ParentInputMode.cpp Sat Sep 24 14:39:12 2005 @@ -1,5 +1,5 @@ /* - $Id: ParentInputMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ + $Id: ParentInputMode.cpp,v 1.1.1.2.2.3 2005/09/24 05:39:12 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,10 +20,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include +#include #include #include #include +#include "BIM.h" #include "CppCFString.h" #include "CppCFData.h" #include "InputMode.h" Index: AquaSKK/WordRegisterMode.cpp diff -u AquaSKK/WordRegisterMode.cpp:1.1.1.2.2.2 AquaSKK/WordRegisterMode.cpp:1.1.1.2.2.3 --- AquaSKK/WordRegisterMode.cpp:1.1.1.2.2.2 Sat Sep 24 09:29:33 2005 +++ AquaSKK/WordRegisterMode.cpp Sat Sep 24 14:39:12 2005 @@ -1,5 +1,5 @@ /* - $Id: WordRegisterMode.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ + $Id: WordRegisterMode.cpp,v 1.1.1.2.2.3 2005/09/24 05:39:12 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -20,10 +20,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include +#include #include #include #include +#include "BIM.h" #include "CppCFString.h" #include "CppCFData.h" #include "InputMode.h" From t-suwa ＠ users.sourceforge.jp Sat Sep 24 16:28:18 2005 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 24 Sep 2005 16:28:18 +0900 Subject: [aquaskk-changes 61] CVS update: AquaSKK Message-ID: <20050924072818.178D22AC016@users.sourceforge.jp> Index: AquaSKK/CppMessagePortConnection.cpp diff -u AquaSKK/CppMessagePortConnection.cpp:1.1.1.2.2.1 AquaSKK/CppMessagePortConnection.cpp:1.1.1.2.2.2 --- AquaSKK/CppMessagePortConnection.cpp:1.1.1.2.2.1 Fri Sep 23 22:29:10 2005 +++ AquaSKK/CppMessagePortConnection.cpp Sat Sep 24 16:28:17 2005 @@ -1,5 +1,5 @@ /* - $Id: CppMessagePortConnection.cpp,v 1.1.1.2.2.1 2005/09/23 13:29:10 t-suwa Exp $ + $Id: CppMessagePortConnection.cpp,v 1.1.1.2.2.2 2005/09/24 07:28:17 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -27,12 +27,24 @@ #include "CppCFData.h" #include "CppMessagePortConnection.h" +struct exception_CFMessagePortCreateRemote : public std::exception { + const char* what() const throw() { + return "AquaSKK: CFMessagePortCreateRemote() failed"; + } +}; + +struct exception_CFMessagePortSendRequest : public std::exception { + const char* what() const throw() { + return "AquaSKK: CFMessagePortSendRequest() failed"; + } +}; + CppMessagePortConnection::CppMessagePortConnection(const CppCFString& port) throw(std::exception) { port_ = CFMessagePortCreateRemote(NULL, port.getString()); if(port_ == NULL) { - throw std::exception(); + throw exception_CFMessagePortCreateRemote(); } } @@ -72,7 +84,7 @@ 10, // recv timeout replyMode, &replyData) != kCFMessagePortSuccess) { - throw std::exception(); + throw exception_CFMessagePortSendRequest(); } if(replyData != NULL) { @@ -89,7 +101,7 @@ 0, NULL, NULL) != kCFMessagePortSuccess) { - throw std::exception(); + throw exception_CFMessagePortSendRequest(); } } Index: AquaSKK/CppMessagePortServer.cpp diff -u AquaSKK/CppMessagePortServer.cpp:1.1.1.2.2.2 AquaSKK/CppMessagePortServer.cpp:1.1.1.2.2.3 --- AquaSKK/CppMessagePortServer.cpp:1.1.1.2.2.2 Sat Sep 24 09:29:33 2005 +++ AquaSKK/CppMessagePortServer.cpp Sat Sep 24 16:28:17 2005 @@ -1,5 +1,5 @@ /* - $Id: CppMessagePortServer.cpp,v 1.1.1.2.2.2 2005/09/24 00:29:33 t-suwa Exp $ + $Id: CppMessagePortServer.cpp,v 1.1.1.2.2.3 2005/09/24 07:28:17 t-suwa Exp $ --------- MacOS X implementation of the SKK input method. @@ -29,6 +29,12 @@ #include "PrivateRunLoop.h" #include "CppMessagePortServer.h" +struct exception_CFMessagePortCreateLocal : public std::exception { + const char* what() const throw() { + return "AquaSKK: CFMessagePortCreateLocal() failed"; + } +}; + CppMessagePortServer::CppMessagePortServer( const CppCFString& portName, const CFStringRef loopMode) throw(std::exception) @@ -48,7 +54,7 @@ &context, NULL); if(port == NULL) { - throw std::exception(); + throw exception_CFMessagePortCreateLocal(); } // RunLoop ????? Index: AquaSKK/CppScrap.cpp diff -u AquaSKK/CppScrap.cpp:1.1.1.1.2.2 AquaSKK/CppScrap.cpp:1.1.1.1.2.3 --- AquaSKK/CppScrap.cpp:1.1.1.1.2.2 Sat Sep 24 09:29:33 2005 +++ AquaSKK/CppScrap.cpp Sat Sep 24 16:28:17 2005 @@ -55,6 +55,12 @@ } } +struct exception_CppScrapFlavor_content : public std::exception { + const char* what() const throw() { + return "AquaSKK: CppScrapFlavor::content() failed"; + } +}; + CppCFData CppScrapFlavor::content() const throw(std::exception) { if (exists()) { Size size = this->size(); @@ -66,6 +72,6 @@ return data; } else { - throw std::exception(); + throw exception_CppScrapFlavor_content(); } } From xdd ＠ users.sourceforge.jp Sat Sep 24 20:55:39 2005 From: xdd ＠ users.sourceforge.jp (S.Abe) Date: Sat, 24 Sep 2005 20:55:39 +0900 Subject: [aquaskk-changes 62] CVS update: AquaSKK Message-ID: <20050924115539.003E22AC01A@users.sourceforge.jp> Index: AquaSKK/CandidatesFrame.m diff -u AquaSKK/CandidatesFrame.m:1.2 AquaSKK/CandidatesFrame.m:1.3 --- AquaSKK/CandidatesFrame.m:1.2 Mon Sep 19 17:28:32 2005 +++ AquaSKK/CandidatesFrame.m Sat Sep 24 20:55:39 2005 @@ -1,4 +1,4 @@ -/* $Id: CandidatesFrame.m,v 1.2 2005/09/19 08:28:32 xdd Exp $ +/* $Id: CandidatesFrame.m,v 1.3 2005/09/24 11:55:39 xdd Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk @@ -24,10 +24,12 @@ - (id)init { if(self = [super init]) { - float fontSize = [[[NSUserDefaults standardUserDefaults] objectForKey:@"dic.FontSize.Window"] floatValue]; + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSFont *font = [NSFont fontWithName:[defaults objectForKey:@"dic.FontName.Window"] + size:[[defaults objectForKey:@"dic.FontSize.Window"] floatValue]]; labels_ = @"ASDFJKL"; attributes_ = [NSDictionary - dictionaryWithObject:[NSFont systemFontOfSize:fontSize] + dictionaryWithObject:font forKey:NSFontAttributeName]; candidates_ = [[NSMutableArray alloc] init]; Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.5 AquaSKK/ChangeLog:1.6 --- AquaSKK/ChangeLog:1.5 Wed Sep 21 01:45:40 2005 +++ AquaSKK/ChangeLog Sat Sep 24 20:55:39 2005 @@ -1,3 +1,10 @@ +2005-09-24 Shin_ichi Abe + + * PreferencesController.*: ?????????? + AquaSKK????????????????????????? + + * Preferences.nib: ???????????????? + 2005-09-19 Shin_ichi Abe * PreferencesController.*: ????????????? Index: AquaSKK/PreferencesController.h diff -u AquaSKK/PreferencesController.h:1.2 AquaSKK/PreferencesController.h:1.3 --- AquaSKK/PreferencesController.h:1.2 Mon Sep 19 17:28:32 2005 +++ AquaSKK/PreferencesController.h Sat Sep 24 20:55:39 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.h,v 1.2 2005/09/19 08:28:32 xdd Exp $ + $Id: PreferencesController.h,v 1.3 2005/09/24 11:55:39 xdd Exp $ --------- MacOS X implementation of the SKK input method. @@ -27,6 +27,7 @@ @interface PreferencesController : NSWindowController { IBOutlet id skkEggLikeNewlineBtn; + IBOutlet id fontBtn; IBOutlet id fontSizePopUp; IBOutlet id winColor; IBOutlet id winTransparent; @@ -46,6 +47,9 @@ NSString* path_to_sub_dic; NSMutableArray *dicPath; + + NSFont *font; + NSFontPanel* fontPanel; } + (PreferencesController*)sharedController; - (NSString*)getPathToMainDic; @@ -54,6 +58,8 @@ - init; +- (IBAction)showFontPanel:(id)sender; + - (NSColor *)windowColor; - (float)windowAlpha; - (BOOL)isSkkEggLikeNewline; Index: AquaSKK/PreferencesController.mm diff -u AquaSKK/PreferencesController.mm:1.2 AquaSKK/PreferencesController.mm:1.3 --- AquaSKK/PreferencesController.mm:1.2 Mon Sep 19 17:28:32 2005 +++ AquaSKK/PreferencesController.mm Sat Sep 24 20:55:39 2005 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.mm,v 1.2 2005/09/19 08:28:32 xdd Exp $ + $Id: PreferencesController.mm,v 1.3 2005/09/24 11:55:39 xdd Exp $ --------- MacOS X implementation of the SKK input method. @@ -54,6 +54,7 @@ [NSMutableArray array], @"dic.path.kotoeri", [NSArchiver archivedDataWithRootObject:color], @"dic.WindowColor.kotoeri", [NSNumber numberWithInt:0], @"dic.FontSize.Window", + [[NSFont systemFontOfSize:0] fontName], @"dic.FontName.Window", @"0.7", @"dic.WindowAlpha.kotoeri", @"5", @"dic.showCandsWindowAfterNthCand", @"NO", @"dic.skk-egg-like-newline.kotoeri", @@ -74,7 +75,11 @@ dicPath = [[NSMutableArray alloc] initWithArray:[defaults arrayForKey:@"dic.path.kotoeri"]]; [winColor setColor:[NSUnarchiver unarchiveObjectWithData:[defaults objectForKey:@"dic.WindowColor.kotoeri"]]]; - [fontSizePopUp selectItemAtIndex:[fontSizePopUp indexOfItemWithTag:[[defaults objectForKey:@"dic.FontSize.Window"] intValue]]]; + font = [[NSFont fontWithName:[defaults objectForKey:@"dic.FontName.Window"] + size:[[defaults objectForKey:@"dic.FontSize.Window"] floatValue]] retain]; + + [self setFontButtonTitle:font]; + [winTransparent setDoubleValue:[defaults floatForKey:@"dic.WindowAlpha.kotoeri"]]; [skkEggLikeNewlineBtn setState:[defaults boolForKey:@"dic.skk-egg-like-newline.kotoeri"]]; @@ -97,7 +102,9 @@ [defaults setObject:[NSArchiver archivedDataWithRootObject:[winColor color]] forKey:@"dic.WindowColor.kotoeri"]; [defaults setFloat:[winTransparent doubleValue] forKey:@"dic.WindowAlpha.kotoeri"]; [defaults setBool:[skkEggLikeNewlineBtn state] forKey:@"dic.skk-egg-like-newline.kotoeri"]; - [defaults setObject:[NSNumber numberWithInt:[[fontSizePopUp selectedItem] tag]] forKey:@"dic.FontSize.Window"]; + + [defaults setObject:[NSNumber numberWithFloat:[font pointSize]] forKey:@"dic.FontSize.Window"]; + [defaults setObject:[font fontName] forKey:@"dic.FontName.Window"]; // skkserv [defaults setBool:[skkserv_enabled state] forKey:@"pref.skkserv.enabled"]; @@ -108,6 +115,29 @@ } +- (IBAction)showFontPanel:(id)sender +{ + [fontPanel release]; + fontPanel = [[[NSFontManager sharedFontManager] fontPanel:YES] retain]; + [fontPanel makeKeyAndOrderFront:self]; +} + +- (void)changeFont:(id)fontManager +{ + [font release]; + font = [[fontManager convertFont:[NSFont systemFontOfSize:14]] retain]; + + [self setFontButtonTitle:font]; + + [self saveUserDefault:self]; +} + +- (void)setFontButtonTitle:(NSFont *)aFont +{ + [[fontBtn cell] setFont:[NSFont fontWithName:[aFont fontName] size:0]]; + [fontBtn setTitle:[NSString stringWithFormat:@"%@ - %2.1f",[aFont displayName],[aFont pointSize]]]; +} + - (NSColor *)windowColor { return [winColor color]; @@ -206,6 +236,8 @@ } } + [fontPanel close]; + [self saveUserDefault:self]; return TRUE; } From xdd ＠ users.sourceforge.jp Sat Sep 24 20:55:40 2005 From: xdd ＠ users.sourceforge.jp (S.Abe) Date: Sat, 24 Sep 2005 20:55:40 +0900 Subject: [aquaskk-changes 63] CVS update: AquaSKK/Japanese.lproj/Preferences.nib Message-ID: <20050924115540.25B342AC01E@users.sourceforge.jp> Index: AquaSKK/Japanese.lproj/Preferences.nib/classes.nib diff -u AquaSKK/Japanese.lproj/Preferences.nib/classes.nib:1.2 AquaSKK/Japanese.lproj/Preferences.nib/classes.nib:1.3 --- AquaSKK/Japanese.lproj/Preferences.nib/classes.nib:1.2 Mon Sep 19 17:28:32 2005 +++ AquaSKK/Japanese.lproj/Preferences.nib/classes.nib Sat Sep 24 20:55:40 2005 @@ -1,6 +1,7 @@ { IBClasses = ( {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; }, { ACTIONS = { addKotoeriDic = id; @@ -8,13 +9,14 @@ saveUserDefault = id; selectMainDic = id; selectSubDic = id; + showFontPanel = id; skkEggLikeNewline = id; }; CLASS = PreferencesController; LANGUAGE = ObjC; OUTLETS = { addKotoeriBtn = id; - fontSizePopUp = id; + fontBtn = id; kotoeriDicTable = id; "maindic_path" = NSTextField; removeKotoeriBtn = id; Index: AquaSKK/Japanese.lproj/Preferences.nib/info.nib diff -u AquaSKK/Japanese.lproj/Preferences.nib/info.nib:1.2 AquaSKK/Japanese.lproj/Preferences.nib/info.nib:1.3 --- AquaSKK/Japanese.lproj/Preferences.nib/info.nib:1.2 Mon Sep 19 17:28:32 2005 +++ AquaSKK/Japanese.lproj/Preferences.nib/info.nib Sat Sep 24 20:55:40 2005 @@ -13,11 +13,6 @@ 59 51 - 5 - - 62 - 61 - 6 160 @@ -28,11 +23,6 @@ 50 60 - 8 - - 167 - 168 - IBLastGroupID 9 Index: AquaSKK/Japanese.lproj/Preferences.nib/keyedobjects.nib