@@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9D25</string> - <string key="IBDocument.InterfaceBuilderVersion">655</string> - <string key="IBDocument.AppKitVersion">949.32</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.SystemVersion">9J3050</string> + <string key="IBDocument.InterfaceBuilderVersion">677</string> + <string key="IBDocument.AppKitVersion">949.46</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="57"/> @@ -15,6 +15,15 @@ <string>com.apple.InterfaceBuilderKit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="1048"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSCustomObject" id="1021"> @@ -51,7 +60,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="238522557"> <reference key="NSMenu" ref="110575045"/> - <string key="NSTitle">About NewApplication</string> + <string key="NSTitle">About Neuro</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1033313550"/> @@ -2701,6 +2710,7 @@ <string>416.IBPluginDependency</string> <string>417.IBPluginDependency</string> <string>418.IBPluginDependency</string> + <string>419.IBPluginDependency</string> <string>5.IBPluginDependency</string> <string>5.ImportedFromIB2</string> <string>56.IBPluginDependency</string> @@ -2849,7 +2859,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{525, 802}, {197, 73}}</string> - <string>{{316, 791}, {478, 20}}</string> + <string>{{316, 736}, {478, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{74, 862}</string> @@ -2918,10 +2928,11 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{328, 608}, {245, 183}}</string> + <string>{{328, 553}, {235, 183}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{23, 794}, {245, 183}}</string> @@ -2979,7 +2990,7 @@ </object> <object class="IBClassDescriber" key="IBDocument.Classes"/> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.LastKnownRelativeProjectPath">../../CocoaDocApp.xcodeproj</string> + <string key="IBDocument.LastKnownRelativeProjectPath">../Neuro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> </data> </archive> English.lproj/MainMenu.xib @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9F33</string> - <string key="IBDocument.InterfaceBuilderVersion">670</string> - <string key="IBDocument.AppKitVersion">949.34</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.SystemVersion">9J3050</string> + <string key="IBDocument.InterfaceBuilderVersion">677</string> + <string key="IBDocument.AppKitVersion">949.46</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="6"/> @@ -14,6 +14,15 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="580458321"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSCustomObject" id="512844837"> @@ -75,6 +84,14 @@ </object> <int key="connectionID">18</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">_textView</string> + <reference key="source" ref="512844837"/> + <reference key="destination" ref="1023546181"/> + </object> + <int key="connectionID">100022</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -137,9 +154,9 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>-1.IBPluginDependency</string> <string>-2.IBPluginDependency</string> + <string>-3.IBPluginDependency</string> <string>100021.IBPluginDependency</string> <string>5.IBEditorWindowLastContentRect</string> - <string>5.IBPluginDependency</string> <string>5.IBWindowTemplateEditedContentRect</string> <string>5.ImportedFromIB2</string> <string>5.editorWindowContentRectSynchronizationRect</string> @@ -154,9 +171,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{91, 319}, {507, 413}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{91, 319}, {507, 413}}</string> + <string>{{91, 319}, {507, 413}}</string> <integer value="1" id="5"/> <string>{{201, 387}, {507, 413}}</string> <reference ref="5"/> @@ -186,7 +203,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">100021</int> + <int key="maxID">100022</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -194,6 +211,10 @@ <object class="IBPartialClassDescription"> <string key="className">NeoDocument</string> <string key="superclassName">NSDocument</string> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">_textView</string> + <string key="NS.object.0">NeoTextView</string> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">src/NeoDocument.h</string> English.lproj/NeoDocument.xib @@ -9,18 +9,24 @@ <dict> <key>CFBundleTypeExtensions</key> <array> - <string>????</string> + <string>rtf</string> </array> <key>CFBundleTypeIconFile</key> <string></string> + <key>CFBundleTypeMIMETypes</key> + <array> + <string>application/rtf</string> + </array> <key>CFBundleTypeName</key> - <string>DocumentType</string> + <string>NSRTFPboardType</string> <key>CFBundleTypeOSTypes</key> <array> - <string>????</string> + <string>RTF </string> </array> <key>CFBundleTypeRole</key> <string>Editor</string> + <key>LSTypeIsPackage</key> + <false/> <key>NSDocumentClass</key> <string>NeoDocument</string> </dict> @@ -30,7 +36,7 @@ <key>CFBundleIconFile</key> <string></string> <key>CFBundleIdentifier</key> - <string>com.yourcompany.${PRODUCT_NAME:identifier}</string> + <string>org.metareal.${PRODUCT_NAME:identifier}</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> Info.plist @@ -1,6 +1,10 @@ #import <Cocoa/Cocoa.h> +@class NeoTextView; + @interface NeoDocument : NSDocument { + NSAttributedString *_contents; + IBOutlet NeoTextView *_textView; } @end src/NeoDocument.h @@ -1,4 +1,5 @@ #import "NeoDocument.h" +#import "NeoTextView.h" @implementation NeoDocument @@ -8,20 +9,32 @@ - (void) windowControllerDidLoadNib: (NSWindowController *) aController { [super windowControllerDidLoadNib:aController]; + + if (_contents != nil) { + [_textView insertText: _contents]; + [_textView invalidateLayout]; + } } - (NSData *) dataOfType: (NSString *) typeName error: (NSError **) outError { - if (outError != NULL) { - *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; - } - return nil; + NSAttributedString *contents = [_textView attributedString]; + NSData *data = [contents RTFFromRange:NSMakeRange(0, [contents length]) + documentAttributes:nil]; + return data; } - (BOOL) readFromData: (NSData *) data ofType: (NSString *) typeName error: (NSError **) outError { - if ( outError != NULL ) { - *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; - } - return YES; + NSAttributedString *contents = + [[NSAttributedString alloc] initWithData:data + options:[NSDictionary dictionaryWithObjectsAndKeys: + NSDocumentTypeDocumentOption, NSRTFTextDocumentType, + nil] + documentAttributes:NULL + error:outError]; + [_contents release]; + _contents = contents; + + return contents != nil; } @end src/NeoDocument.m @@ -1,7 +1,7 @@ #import <Cocoa/Cocoa.h> -#define NEO_TEXT_VIEW_VERTICAL_FORMS YES -//#define NEO_DEBUG_TEXT_VIEW +#define NEO_TEXT_VIEW_VERTICAL_FORMS YES +#define NEO_DEBUG_TEXT_VIEW 0 @interface NeoTextView : NSView <NSTextInput, NSTextInputClient> { NSTextStorage *_text; @@ -13,7 +13,7 @@ NSRange _markedRange; NSUInteger _caretPosition; -#ifdef NEO_DEBUG_TEXT_VIEW +#if NEO_DEBUG_TEXT_VIEW NSRect _rectForMarkedText; #endif @@ -31,7 +31,7 @@ * Returns a Boolean value that indicates whether * a specified position is in a given range. */ -NS_INLINE Boolean StkLocationInCFRange(CFIndex loc, CFRange range) { +NS_INLINE Boolean NeoLocationInCFRange(CFIndex loc, CFRange range) { const CFIndex t = loc - range.location; return t >= 0 && t < range.length; } @@ -39,11 +39,11 @@ NS_INLINE Boolean StkLocationInCFRange(CFIndex loc, CFRange range) { /** * Returns an NSRange from a CFRange */ -NS_INLINE NSRange StkNSRangeFromCFRange(CFRange range) { +NS_INLINE NSRange NeoNSRangeFromCFRange(CFRange range) { return NSMakeRange(range.location, range.length); } -NS_INLINE BOOL StkNSUIntegerCanAdvance(NSUInteger index, NSUInteger exclusiveLimit, NSInteger advance) { +NS_INLINE BOOL NeoNSUIntegerCanAdvance(NSUInteger index, NSUInteger exclusiveLimit, NSInteger advance) { return !(index == NSNotFound || advance == 0) && !(advance < 0 && (advance + index) >= index) && src/NeoTextView.h @@ -130,7 +130,7 @@ static NSArray *kNeoTextViewValidAttributesForMarkedText = nil; for (id element in _textFrames) { const CTFrameRef frame = (const CTFrameRef) element; const CFRange textRange = CTFrameGetVisibleStringRange(frame); - if (StkLocationInCFRange(location, textRange)) return frame; + if (NeoLocationInCFRange(location, textRange)) return frame; } } return NULL; @@ -185,7 +185,7 @@ static NSArray *kNeoTextViewValidAttributesForMarkedText = nil; _text = [[NSTextStorage alloc] init]; [self invalidateLayout]; -#ifdef NEO_DEBUG_TEXT_VIEW +#if NEO_DEBUG_TEXT_VIEW _rectForMarkedText = NSZeroRect; #endif @@ -311,7 +311,7 @@ static NSArray *kNeoTextViewValidAttributesForMarkedText = nil; [[NSColor grayColor] set]; NSFrameRect(bounds); -#ifdef NEO_DEBUG_TEXT_VIEW +#if NEO_DEBUG_TEXT_VIEW // bounding box const CTFrameRef frame = (const CTFrameRef)[_textFrames objectAtIndex: 0]; const NSRect boundingBox = NSRectFromCGRect(MTFrameGetBoundingBox(frame)); @@ -569,7 +569,7 @@ static NSArray *kNeoTextViewValidAttributesForMarkedText = nil; @"The position of insertion point is invalid: %u in %u", _caretPosition, length); - if (!StkNSUIntegerCanAdvance(_caretPosition, length + 1, advance)) return NO; + if (!NeoNSUIntegerCanAdvance(_caretPosition, length + 1, advance)) return NO; _caretPosition += advance; [self setNeedsDisplay: YES]; return YES; @@ -596,7 +596,7 @@ static NSArray *kNeoTextViewValidAttributesForMarkedText = nil; const CFArrayRef lines = CTFrameGetLines(frame); const CFIndex numberOfLines = CFArrayGetCount(lines); - if (!StkNSUIntegerCanAdvance(lineIndex, numberOfLines, advance)) return NO; + if (!NeoNSUIntegerCanAdvance(lineIndex, numberOfLines, advance)) return NO; const CFIndex nextLineIndex = lineIndex + advance; const CTLineRef nextLine = CFArrayGetValueAtIndex(lines, nextLineIndex); @@ -868,7 +868,7 @@ static NSArray *kNeoTextViewValidAttributesForMarkedText = nil; NSRect firstRect = NSRectFromCGRect(rect); -#ifdef NEO_DEBUG_TEXT_VIEW +#if NEO_DEBUG_TEXT_VIEW _rectForMarkedText = firstRect; #endif src/NeoTextView.m @@ -10,34 +10,34 @@ - (void) test_StkNSUIntegerCanAdvance { // NSNotFound - STAssertFalse(StkNSUIntegerCanAdvance(NSNotFound, 0, 1), nil); - STAssertFalse(StkNSUIntegerCanAdvance(NSNotFound, 0, -1), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(NSNotFound, 0, 1), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(NSNotFound, 0, -1), nil); // Advance - STAssertFalse(StkNSUIntegerCanAdvance(0, 1, 1), nil); - STAssertTrue(StkNSUIntegerCanAdvance(0, 2, 1), nil); - STAssertFalse(StkNSUIntegerCanAdvance(0, 2, 2), nil); - STAssertTrue(StkNSUIntegerCanAdvance(1, 30, 20), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(0, 1, 1), nil); + STAssertTrue(NeoNSUIntegerCanAdvance(0, 2, 1), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(0, 2, 2), nil); + STAssertTrue(NeoNSUIntegerCanAdvance(1, 30, 20), nil); // Advance++ - STAssertFalse(StkNSUIntegerCanAdvance(999, 3, 1), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(999, 3, 1), nil); // Minus - STAssertTrue(StkNSUIntegerCanAdvance(1, 2, -1), nil); - STAssertFalse(StkNSUIntegerCanAdvance(0, 2, -1), nil); - STAssertTrue(StkNSUIntegerCanAdvance(999, 999, -1), nil); + STAssertTrue(NeoNSUIntegerCanAdvance(1, 2, -1), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(0, 2, -1), nil); + STAssertTrue(NeoNSUIntegerCanAdvance(999, 999, -1), nil); // Zero - STAssertFalse(StkNSUIntegerCanAdvance(0, 0, 0), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(0, 0, 0), nil); // MIN, MAX - STAssertFalse(StkNSUIntegerCanAdvance(NSUIntegerMax, NSUIntegerMax, 1), nil); - STAssertFalse(StkNSUIntegerCanAdvance(NSUIntegerMax - 1, NSUIntegerMax, 1), nil); - STAssertTrue(StkNSUIntegerCanAdvance(NSUIntegerMax - 1, NSUIntegerMax, -1), nil); - STAssertTrue(StkNSUIntegerCanAdvance(NSUIntegerMax - 2, NSUIntegerMax, 1), nil); - STAssertFalse(StkNSUIntegerCanAdvance(0, NSIntegerMax, NSIntegerMax), nil); - STAssertTrue(StkNSUIntegerCanAdvance(0, NSIntegerMax, NSIntegerMax - 1), nil); - STAssertTrue(StkNSUIntegerCanAdvance((NSUInteger)NSIntegerMax + 1, NSUIntegerMax, NSIntegerMin), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(NSUIntegerMax, NSUIntegerMax, 1), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(NSUIntegerMax - 1, NSUIntegerMax, 1), nil); + STAssertTrue(NeoNSUIntegerCanAdvance(NSUIntegerMax - 1, NSUIntegerMax, -1), nil); + STAssertTrue(NeoNSUIntegerCanAdvance(NSUIntegerMax - 2, NSUIntegerMax, 1), nil); + STAssertFalse(NeoNSUIntegerCanAdvance(0, NSIntegerMax, NSIntegerMax), nil); + STAssertTrue(NeoNSUIntegerCanAdvance(0, NSIntegerMax, NSIntegerMax - 1), nil); + STAssertTrue(NeoNSUIntegerCanAdvance((NSUInteger)NSIntegerMax + 1, NSUIntegerMax, NSIntegerMin), nil); } @@ -47,23 +47,23 @@ @implementation NeoTextViewTest(RangeUtilities) - (void) test_StkNSRangeFromCFRange { - const NSRange r0 = StkNSRangeFromCFRange(CFRangeMake(0, 0)); + const NSRange r0 = NeoNSRangeFromCFRange(CFRangeMake(0, 0)); STAssertEquals((NSUInteger) 0, r0.location, nil); STAssertEquals((NSUInteger) 0, r0.length, nil); - const NSRange r1 = StkNSRangeFromCFRange(CFRangeMake(123, 456)); + const NSRange r1 = NeoNSRangeFromCFRange(CFRangeMake(123, 456)); STAssertEquals((NSUInteger) 123, r1.location, nil); STAssertEquals((NSUInteger) 456, r1.length, nil); } - (void) test_StkLocationInCFRange { - STAssertFalse(StkLocationInCFRange(0, CFRangeMake(0, 0)), nil); - STAssertTrue(StkLocationInCFRange(0, CFRangeMake(0, 1)), nil); - STAssertFalse(StkLocationInCFRange(1, CFRangeMake(0, 1)), nil); + STAssertFalse(NeoLocationInCFRange(0, CFRangeMake(0, 0)), nil); + STAssertTrue(NeoLocationInCFRange(0, CFRangeMake(0, 1)), nil); + STAssertFalse(NeoLocationInCFRange(1, CFRangeMake(0, 1)), nil); - STAssertFalse(StkLocationInCFRange(0, CFRangeMake(1, 1)), nil); - STAssertFalse(StkLocationInCFRange(2, CFRangeMake(1, 1)), nil); - STAssertTrue(StkLocationInCFRange(2, CFRangeMake(1, 2)), nil); + STAssertFalse(NeoLocationInCFRange(0, CFRangeMake(1, 1)), nil); + STAssertFalse(NeoLocationInCFRange(2, CFRangeMake(1, 1)), nil); + STAssertTrue(NeoLocationInCFRange(2, CFRangeMake(1, 2)), nil); } @end @@ -90,8 +90,8 @@ for (CFIndex i = 0; i < n; i++) { const CTLineRef v = CFArrayGetValueAtIndex(lines, i); const CFRange r = CTLineGetStringRange(v); - if (StkLocationInCFRange(index, r)) { - STAssertEquals(i, lineIndex, @"range:%@", NSStringFromRange(StkNSRangeFromCFRange(r))); + if (NeoLocationInCFRange(index, r)) { + STAssertEquals(i, lineIndex, @"range:%@", NSStringFromRange(NeoNSRangeFromCFRange(r))); STAssertEquals(r.location, range.location, nil); STAssertEquals(r.length, range.length, nil); return; tests/NeoTextViewTest.m 2af5c7352f289cf89bedaca5c142d49ec66a4169 Takanori Ishikawa takanori.ishikawa@gmail.com http://github.com/ishikawa/neuro/commit/6b2ca0a89622cb6e719a74b6782fac4e1e7fe442 6b2ca0a89622cb6e719a74b6782fac4e1e7fe442 2009-08-01T05:11:16-07:00 2009-08-01T05:11:16-07:00 Implemented open/save RTF file f7754629bd12e9fe1b0a0b5793adce5f8b9497dd Takanori Ishikawa takanori.ishikawa@gmail.com