Tomotaka SUWA
t-suw****@users*****
2006年 7月 15日 (土) 09:49:00 JST
Index: AquaSKK/CandidatesManager.h diff -u AquaSKK/CandidatesManager.h:1.3 AquaSKK/CandidatesManager.h:1.4 --- AquaSKK/CandidatesManager.h:1.3 Wed Nov 9 00:02:24 2005 +++ AquaSKK/CandidatesManager.h Sat Jul 15 09:49:00 2006 @@ -1,10 +1,10 @@ /* - $Id: CandidatesManager.h,v 1.3 2005/11/08 15:02:24 t-suwa Exp $ + $Id: CandidatesManager.h,v 1.4 2006/07/15 00:49:00 t-suwa Exp $ MacOS X implementation of the SKK input method. Copyright (C) 2002 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 @@ -36,9 +36,7 @@ public: static CandidatesManager& sharedManager(); - unsigned createAndShow(int qd_x, int qd_y, - const CppCFString& candidates_string, - bool showLast = false); + unsigned createAndShow(SInt16 qd_x, SInt16 qd_y, const CppCFString& candidates, bool showLast = false); void windowNext(unsigned int window_id); void windowPrev(unsigned int window_id); void closeWindow(unsigned int window_id); Index: AquaSKK/CandidatesManager.mm diff -u AquaSKK/CandidatesManager.mm:1.5 AquaSKK/CandidatesManager.mm:1.6 --- AquaSKK/CandidatesManager.mm:1.5 Fri May 5 00:27:02 2006 +++ AquaSKK/CandidatesManager.mm Sat Jul 15 09:49:00 2006 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: CandidatesManager.mm,v 1.5 2006/05/04 15:27:02 t-suwa Exp $ + $Id: CandidatesManager.mm,v 1.6 2006/07/15 00:49:00 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -42,9 +42,9 @@ // empty } -unsigned CandidatesManager::createAndShow(int qd_x, int qd_y, const CppCFString& candidates_string, bool showLast) { +unsigned CandidatesManager::createAndShow(SInt16 qd_x, SInt16 qd_y, const CppCFString& candidates, bool showLast) { // NSArray ‚ÌŒó•âƒŠƒXƒg‚ðì¬ - std::vector<CppCFString> cands_vec = candidates_string.split(SKK_MSG_DELIMITER); + std::vector<CppCFString> cands_vec = candidates.split(SKK_MSG_DELIMITER); NSMutableArray* cands_array = [[NSMutableArray alloc] init]; for(std::vector<CppCFString>::const_iterator ite = cands_vec.begin(); ite != cands_vec.end(); ++ ite) { [cands_array addObject:(NSString*)ite->decode().getString()]; @@ -66,12 +66,13 @@ CGRect screen = CGDisplayBounds(disp[0]); screen.size.width += screen.origin.x; - // QuickDrawÀ•W‚ðCoreGraphicsÀ•W‚Ö•ÏŠ· - NSSize mainscreen_size = [[NSScreen mainScreen] frame].size; + + // QuickDraw À•W(¶ãŒ´“_)‚ð CoreGraphics À•W(‰E‰ºŒ´“_)‚Ö•ÏŠ· + CGRect mainscreen = CGDisplayBounds(CGMainDisplayID()); float cg_x = qd_x; - float cg_y = mainscreen_size.height - qd_y; + float cg_y = mainscreen.size.height - qd_y; - // CWC‚ð쬂µA + // CWC ‚ð쬂µA CandidatesWindowController* cwc = [[CandidatesWindowController alloc] initWithCandidates:cands_array]; NSSize cwc_size = [[cwc window] frame].size; Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.32 AquaSKK/ChangeLog:1.33 --- AquaSKK/ChangeLog:1.32 Sat Jul 1 09:19:42 2006 +++ AquaSKK/ChangeLog Sat Jul 15 09:49:00 2006 @@ -1,3 +1,12 @@ +2006-07-15 Tomotaka SUWA <t.suw****@mac*****> + + * CandidatesManager.* (CandidatesManager::createAndShow): À•Wˆø” + ‚ð int ¨ SInt16 ‚ÉC³Bƒfƒ…ƒAƒ‹ƒfƒBƒXƒvƒŒƒCŽg—pŽž‚Ì•s‹ï‡‚ɑΉžB + + * ServerMessageReceiver.mm (ServerMessageReceiver::createCandidatesWindow): + À•W—p‚Ì•Ï”‚ð int ¨ SInt16 ‚ÉC³Bƒfƒ…ƒAƒ‹ƒfƒBƒXƒvƒŒƒCŽg—pŽž‚Ì•s + ‹ï‡‚ɑΉžB + 2006-07-01 Tomotaka SUWA <t.suw****@mac*****> * SKKDictionary.cpp: SKK-JISYO.jinmei ‚ªƒ_ƒEƒ“ƒ[ƒh‚Å‚«‚È‚¢•s‹ï‡ Index: AquaSKK/ServerMessageReceiver.mm diff -u AquaSKK/ServerMessageReceiver.mm:1.6 AquaSKK/ServerMessageReceiver.mm:1.7 --- AquaSKK/ServerMessageReceiver.mm:1.6 Sat Jun 3 10:23:18 2006 +++ AquaSKK/ServerMessageReceiver.mm Sat Jul 15 09:49:00 2006 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: ServerMessageReceiver.mm,v 1.6 2006/06/03 01:23:18 t-suwa Exp $ + $Id: ServerMessageReceiver.mm,v 1.7 2006/07/15 00:49:00 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -145,13 +145,13 @@ CppCFData ServerMessageReceiver::createCandidatesWindow(const CppCFData& attachment) { // ’ljÁƒf[ƒ^‚Æ‚µ‚ÄQuickDrawÀ•W‚ÆUniChar‚Ì”z—ñ‚ðŽæ‚éB - int qd_x = CFSwapInt16BigToHost(attachment.getSInt16(0)); - int qd_y = CFSwapInt16BigToHost(attachment.getSInt16(2)); + SInt16 qd_x = CFSwapInt16BigToHost(attachment.getSInt16(0)); + SInt16 qd_y = CFSwapInt16BigToHost(attachment.getSInt16(2)); int showLast = CFSwapInt16BigToHost(attachment.getSInt16(4)); CppCFString candidates(attachment.subdata(6).getData()); CandidatesManager& cm = CandidatesManager::sharedManager(); - unsigned window_id = cm.createAndShow(qd_x,qd_y,candidates, showLast); + unsigned window_id = cm.createAndShow(qd_x, qd_y, candidates, showLast); CandidatesWindowController* cwc = cm.getWindowController(window_id); unsigned cands_per_frame = [cwc getCandidatesPerFrame];
Fork