Tomotaka SUWA
t-suw****@users*****
2006年 1月 9日 (月) 11:11:06 JST
Index: AquaSKK/BIM.r diff -u AquaSKK/BIM.r:1.3.4.1 AquaSKK/BIM.r:1.3.4.2 --- AquaSKK/BIM.r:1.3.4.1 Sun Jan 8 16:15:30 2006 +++ AquaSKK/BIM.r Mon Jan 9 11:11:05 2006 @@ -1,5 +1,5 @@ /* - $Id: BIM.r,v 1.3.4.1 2006/01/08 07:15:30 t-suwa Exp $ + $Id: BIM.r,v 1.3.4.2 2006/01/09 02:11:05 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -48,7 +48,7 @@ #endif #if TARGET_REZ_MAC_PPC && TARGET_REZ_MAC_X86 - #define TARGET_REZ_UNIVERSAL_COMPONENTS 1 + #define TARGET_REZ_UNIVERSAL_COMPONENTS #define Target_PlatformType platformPowerPCNativeEntryPoint #define Target_SecondPlatformType platformIA32NativeEntryPoint #elif TARGET_REZ_MAC_X86 @@ -89,7 +89,7 @@ 'dlle', kAquaSKKBaseResouceID, Target_PlatformType, -#if TARGET_REZ_UNIVERSAL_COMPONENTS +#ifdef TARGET_REZ_UNIVERSAL_COMPONENTS kAquaSKKComponentFlags, 'dlle', kAquaSKKBaseResouceID, Index: AquaSKK/BS.mm diff -u AquaSKK/BS.mm:1.2 AquaSKK/BS.mm:1.2.2.1 --- AquaSKK/BS.mm:1.2 Sat Oct 8 00:08:36 2005 +++ AquaSKK/BS.mm Mon Jan 9 11:11:05 2006 @@ -1,28 +1,29 @@ -/* -*- objc -*- - $Id: BS.mm,v 1.2 2005/10/07 15:08:36 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 +/* + $Id: BS.mm,v 1.2.2.1 2006/01/09 02:11:05 t-suwa Exp $ + + MacOS X implementation of the SKK input method. + + Copyright (C) 2002 phonohawk + Copyright (C) 2006 Tomotaka SUWA <t.suw****@mac*****> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + 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 <Cocoa/Cocoa.h> -int main(int argc, const char *argv[]) -{ +// AquaSKKServer のエントリポイント +int main(int argc, const char *argv[]) { return NSApplicationMain(argc, argv); } Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.20.2.2 AquaSKK/ChangeLog:1.20.2.3 --- AquaSKK/ChangeLog:1.20.2.2 Sun Jan 8 16:15:30 2006 +++ AquaSKK/ChangeLog Mon Jan 9 11:11:05 2006 @@ -1,3 +1,14 @@ +2006-01-09 Tomotaka SUWA <t.suw****@mac*****> + + * SKKServer.cpp (SKKServer::searchCompletions): ¤ó‘Ԃł̕⊮‚É‘Î + ‰ž + + * PreferencesController.mm: Panther ‚ɑΉžB + + * Makefile: tar ƒ^[ƒQƒbƒg‚̒ljÁB + + * BIM.r: Panther ƒrƒ‹ƒh‚ɑΉžB + 2006-01-08 Tomotaka SUWA <t.suw****@mac*****> * BIMScript.h, skkicons.r: íœB Index: AquaSKK/Makefile diff -u AquaSKK/Makefile:1.2 AquaSKK/Makefile:1.2.4.1 --- AquaSKK/Makefile:1.2 Sat Aug 13 15:15:06 2005 +++ AquaSKK/Makefile Mon Jan 9 11:11:05 2006 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2005/08/13 06:15:06 t-suwa Exp $ +# $Id: Makefile,v 1.2.4.1 2006/01/09 02:11:05 t-suwa Exp $ DARWIN = $(firstword $(subst ., ,$(shell uname -r))) TARGET = AquaSKKInputMethod.component @@ -25,3 +25,6 @@ sudo rm -rf $(DEST)/$(TARGET) sudo mkdir -p $(DEST) sudo cp -r $(BUILD)/$(TARGET) $(DEST) + +tar: + tar zcf ../AquaSKK.tar.gz . --exclude="./build" --exclude="./Package/contents" Index: AquaSKK/PreferencesController.mm diff -u AquaSKK/PreferencesController.mm:1.6.2.2 AquaSKK/PreferencesController.mm:1.6.2.3 --- AquaSKK/PreferencesController.mm:1.6.2.2 Sun Jan 8 16:15:30 2006 +++ AquaSKK/PreferencesController.mm Mon Jan 9 11:11:05 2006 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.mm,v 1.6.2.2 2006/01/08 07:15:30 t-suwa Exp $ + $Id: PreferencesController.mm,v 1.6.2.3 2006/01/09 02:11:05 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -84,7 +84,7 @@ IconFamilyHandle iconFamily; NSData* iconData; - IconRefToIconFamily(icon, kSelectorAllAvailableData, &iconFamily); + IconRefToIconFamily(icon, kSelectorAllSmallData, &iconFamily); iconData = [NSData dataWithBytes: *iconFamily length: iconFamily[0]->resourceSize]; image = [[[NSImage alloc] initWithData:iconData] autorelease]; } @@ -190,7 +190,7 @@ [NumericKeypad_HalfWidthBtn setState:[defaults boolForKey:KeypadHalfWidthKey]]; [AsciiModeStartupButton setState:[defaults boolForKey:AsciiStartupKey]]; [self initKbdLayoutPopUp]; - [kbdLayoutPopUp selectItemWithTag:[defaults integerForKey:KbdLayoutKey]]; + [kbdLayoutPopUp selectItemAtIndex:[kbdLayoutPopUp indexOfItemWithTag:[defaults integerForKey:KbdLayoutKey]]]; // Œó•âƒEƒBƒ“ƒhƒE font = [[NSFont fontWithName:[defaults objectForKey:FontNameKey] size:[defaults floatForKey:FontSizeKey]] retain]; Index: AquaSKK/SKKServer.cpp diff -u AquaSKK/SKKServer.cpp:1.4 AquaSKK/SKKServer.cpp:1.4.2.1 --- AquaSKK/SKKServer.cpp:1.4 Wed Nov 9 00:02:24 2005 +++ AquaSKK/SKKServer.cpp Mon Jan 9 11:11:05 2006 @@ -1,10 +1,10 @@ /* - $Id: SKKServer.cpp,v 1.4 2005/11/08 15:02:24 t-suwa Exp $ + $Id: SKKServer.cpp,v 1.4.2.1 2006/01/09 02:11:05 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002-2004 phonohawk - Copyright (C) 2005 Tomotaka SUWA <t.suw****@mac*****> + Copyright (C) 2005-2006 Tomotaka SUWA <t.suw****@mac*****> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -359,11 +359,6 @@ } CppCFString SKKServer::searchCompletions(const CppCFString& query) { - // Žb’è‘Ήž(#7387) - if(query.length() < 1) { - return CppCFString(); - } - CppCFString space(" "); CppCFString nbsp("[20]");
Fork