mirror of
https://github.com/darlinghq/darling-cocotron.git
synced 2024-11-23 20:19:40 +00:00
Temporary attributes not being found when drawing glyphs
This commit is contained in:
Robert Grant
parent
956d2124b9
commit
ca6c6d1960
@ -30,6 +30,8 @@ NSString * const NSTextCheckingDocumentURLKey=@"NSTextCheckingDocumentURLKey";
|
||||
NSString * const NSTextCheckingDocumentTitleKey=@"NSTextCheckingDocumentTitleKey";
|
||||
NSString * const NSTextCheckingDocumentAuthorKey=@"NSTextCheckingDocumentAuthorKey";
|
||||
|
||||
#define SPELLCHECK_DEBUG 0
|
||||
|
||||
@implementation NSSpellChecker
|
||||
|
||||
-init
|
||||
@ -212,6 +214,7 @@ static NSSpellChecker *shared=nil;
|
||||
}
|
||||
|
||||
-(NSRange)checkSpellingOfString:(NSString *)string startingAt:(NSInteger)offset language:(NSString *)language wrap:(BOOL)wrap inSpellDocumentWithTag:(NSInteger)tag wordCount:(NSInteger *)wordCount {
|
||||
|
||||
NSMutableDictionary *options=[NSMutableDictionary dictionary];
|
||||
|
||||
if(language==nil){
|
||||
@ -224,9 +227,9 @@ static NSSpellChecker *shared=nil;
|
||||
|
||||
[options setObject:orthography forKey:NSTextCheckingOrthographyKey];
|
||||
}
|
||||
|
||||
|
||||
NSArray *checking=[self checkString:string range:NSMakeRange(offset,[string length]-offset) types:NSTextCheckingTypeSpelling options:options inSpellDocumentWithTag:tag orthography:NULL wordCount:wordCount];
|
||||
|
||||
|
||||
if([checking count]==0)
|
||||
return NSMakeRange(0,0);
|
||||
|
||||
@ -246,10 +249,25 @@ static NSSpellChecker *shared=nil;
|
||||
/* NSSpellChecker and NSSpellServer have inconsistent API, we accept a range but the server only takes an offset. */
|
||||
/* NSSpellChecker returns by ref an orthography, yet NSSpellServer accepts one as argument. */
|
||||
/* I guess this isn't one to one and there is some extra work being done in NSSpellChecker. */
|
||||
|
||||
|
||||
#if SPELLCHECK_DEBUG
|
||||
NSLog(@"checkString: %@ range: %@ types: %d options: %@", string, NSStringFromRange(range), types, options);
|
||||
#define DEBUG_CHECKSTRING 0
|
||||
#endif
|
||||
|
||||
NSString *substring=[string substringToIndex:NSMaxRange(range)];
|
||||
|
||||
return [spellEngine checkString:substring offset:range.location types:types options:options orthography:[options objectForKey:NSTextCheckingOrthographyKey] wordCount:wordCount];
|
||||
|
||||
NSArray *results = [spellEngine checkString:substring offset:range.location types:types options:options orthography:[options objectForKey:NSTextCheckingOrthographyKey] wordCount:wordCount];
|
||||
|
||||
#if DEBUG_CHECKSTRING
|
||||
NSLog(@" substring: %@", substring);
|
||||
NSLog(@" results: %@", results);
|
||||
if (wordCount) {
|
||||
NSLog(@" wordCount: %d", *wordCount);
|
||||
}
|
||||
#endif
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
#ifdef NS_BLOCKS
|
||||
|
||||
@ -947,7 +947,15 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
CGContextShowGlyphsWithAdvances(context, cgGlyphs, advances, cgGlyphsLength);
|
||||
}
|
||||
|
||||
#define DEBUG_LM_DRAWING 0
|
||||
|
||||
-(void)drawSelectionAtPoint:(NSPoint)origin {
|
||||
|
||||
#if DEBUG_LM_DRAWING
|
||||
NSLog(@"drawSelectionAtPoint: %@", NSStringFromPoint(origin));
|
||||
#define DEBUG_LM_DRAWSELECTIONATPOINT 0
|
||||
#endif
|
||||
|
||||
NSTextView *textView=[self textViewForBeginningOfSelection];
|
||||
NSColor *selectedColor=[[textView selectedTextAttributes] objectForKey:NSBackgroundColorAttributeName];
|
||||
NSRange range;
|
||||
@ -963,6 +971,10 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
|
||||
rectArray=[self rectArrayForGlyphRange:range withinSelectedGlyphRange:range inTextContainer:[textView textContainer] rectCount:&rectCount];
|
||||
|
||||
#if DEBUG_LM_DRAWSELECTIONATPOINT
|
||||
NSLog(@" rectArray: %@", rectArray);
|
||||
#endif
|
||||
|
||||
if(selectedColor==nil)
|
||||
selectedColor=[NSColor selectedTextBackgroundColor];
|
||||
|
||||
@ -976,7 +988,13 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
}
|
||||
|
||||
-(void)drawBackgroundForGlyphRange:(NSRange)glyphRange atPoint:(NSPoint)origin {
|
||||
glyphRange=[self validateGlyphsAndLayoutForGlyphRange:glyphRange];
|
||||
|
||||
#if DEBUG_LM_DRAWING
|
||||
NSLog(@"drawBackgroundForGlyphRange: %@ atPoint: %@", NSStringFromRange(glyphRange), NSStringFromPoint(origin));
|
||||
#define DEBUG_LM_DRAWBACKGROUNDFORGLYPHRANGE 0
|
||||
#endif
|
||||
|
||||
glyphRange=[self validateGlyphsAndLayoutForGlyphRange:glyphRange];
|
||||
{
|
||||
NSTextContainer *container=[self textContainerForGlyphAtIndex:glyphRange.location effectiveRange:&glyphRange];
|
||||
if (container == nil) {
|
||||
@ -1035,6 +1053,17 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
|
||||
- (void)drawUnderlineForGlyphRange:(NSRange)glyphRange underlineType:(NSInteger)underlineVal baselineOffset:(CGFloat)baselineOffset lineFragmentRect:(NSRect)lineRect lineFragmentGlyphRange:(NSRange)lineGlyphRange containerOrigin:(NSPoint)containerOrigin
|
||||
{
|
||||
#if DEBUG_LM_DRAWING
|
||||
NSLog(@"drawUnderlineForGlyphRange: %@ underlineType: %@ baselineOffset: %f lineFragmentRect: %@ lineFragmentGlyphRange: %@ containerOrigin: %@",
|
||||
NSStringFromRange(glyphRange),
|
||||
underlineVal,
|
||||
baselineOffset,
|
||||
NSStringFromRect(lineRect),
|
||||
NSStringFromRange(lineGlyphRange),
|
||||
NSStringFromPoint(containerOrigin));
|
||||
#define DEBUG_LM_DRAWUNDERLINEFORGLYPHRANGE 0
|
||||
#endif
|
||||
|
||||
unsigned i,rectCount;
|
||||
NSRange characterRange = [self characterRangeForGlyphRange: glyphRange actualGlyphRange:NULL];
|
||||
BOOL isFlipped = [[NSGraphicsContext currentContext] isFlipped];
|
||||
@ -1105,6 +1134,17 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
|
||||
- (void)drawStrikethroughForGlyphRange:(NSRange)glyphRange strikethroughType:(NSInteger)strikethroughVal baselineOffset:(CGFloat)baselineOffset lineFragmentRect:(NSRect)lineRect lineFragmentGlyphRange:(NSRange)lineGlyphRange containerOrigin:(NSPoint)containerOrigin
|
||||
{
|
||||
#if DEBUG_LM_DRAWING
|
||||
NSLog(@"drawStrikethroughForGlyphRange: %@ strikethroughType: %@ baselineOffset: %f lineFragmentRect: %@ lineFragmentGlyphRange: %@ containerOrigin: %@",
|
||||
NSStringFromRange(glyphRange),
|
||||
strikethroughVal,
|
||||
baselineOffset,
|
||||
NSStringFromRect(lineRect),
|
||||
NSStringFromRange(lineGlyphRange),
|
||||
NSStringFromPoint(containerOrigin));
|
||||
#define DEBUG_LM_DRAWSTRIKETHROUGHFORGLYPHRANGE 0
|
||||
#endif
|
||||
|
||||
unsigned i,rectCount;
|
||||
NSRange characterRange = [self characterRangeForGlyphRange: glyphRange actualGlyphRange:NULL];
|
||||
BOOL isFlipped=[[NSGraphicsContext currentContext] isFlipped];
|
||||
@ -1151,6 +1191,14 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
}
|
||||
|
||||
-(void)drawSpellingState:(NSNumber *)spellingState glyphRange:(NSRange)glyphRange container:(NSTextContainer *)container origin:(NSPoint)origin {
|
||||
#if DEBUG_LM_DRAWING
|
||||
NSLog(@"drawSpellingState: %@ glyphRange: %@ container: %p origin: %@",
|
||||
spellingState,
|
||||
NSStringFromRange(glyphRange),
|
||||
container,
|
||||
NSStringFromPoint(origin));
|
||||
#define DEBUG_LM_DRAWSPELLINGSTATE 0
|
||||
#endif
|
||||
if ([container textView] == nil) {
|
||||
// Don't draw anything if we aren't editing
|
||||
return;
|
||||
@ -1202,6 +1250,18 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
withAttributes: (NSDictionary*)attributes
|
||||
origin: (NSPoint)origin
|
||||
{
|
||||
#if DEBUG_LM_DRAWING
|
||||
NSLog(@"_drawGlyphs: %p length: %d range: %@ atPoint: %@ inContainer: %p withAttributes: %@ origin: %@",
|
||||
glyphs,
|
||||
length,
|
||||
NSStringFromRange(range),
|
||||
NSStringFromPoint(point),
|
||||
container,
|
||||
attributes,
|
||||
NSStringFromPoint(origin));
|
||||
#define DEBUG_LM_DRAWGLYPHS 0
|
||||
#endif
|
||||
|
||||
NSColor *color=NSForegroundColorAttributeInDictionary(attributes);
|
||||
NSFont *font=NSFontAttributeInDictionary(attributes);
|
||||
|
||||
@ -1242,6 +1302,13 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
|
||||
- (void)_drawAttachment:(NSTextAttachment*)attachment atCharacterIndex:(unsigned)index atPoint:(NSPoint)point
|
||||
{
|
||||
#if DEBUG_LM_DRAWING
|
||||
NSLog(@"_drawAttachment: %@ atCharacterIndex: %d atPoint: %@",
|
||||
attachment,
|
||||
index,
|
||||
NSStringFromPoint(point));
|
||||
#define DEBUG_LM_DRAWATTACHMENT 0
|
||||
#endif
|
||||
id <NSTextAttachmentCell> cell=[attachment attachmentCell];
|
||||
NSRect frame;
|
||||
|
||||
@ -1261,6 +1328,17 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
withAttributes: (NSDictionary*)attributes
|
||||
usedHeight: (float)usedHeight
|
||||
{
|
||||
#if DEBUG_LM_DRAWING
|
||||
NSLog(@"_drawGlyphsForSubGlyphRange: %@ forFragment: atPoint: %@ subRangeXOffset: %f inContainer: %P withAttributes: %P usedHeight: %f",
|
||||
NSStringFromRange(range),
|
||||
// fragment, // Trying to log fragment results in seg-fault.
|
||||
NSStringFromPoint(origin),
|
||||
xOffset,
|
||||
container,
|
||||
attributes,
|
||||
usedHeight);
|
||||
#define DEBUG_LM_DRAWGLYPHSFORSUBGLYPHRANGE 0
|
||||
#endif
|
||||
|
||||
NSTextView *textView = [self textViewForBeginningOfSelection];
|
||||
|
||||
@ -1427,6 +1505,14 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
|
||||
- (void)drawGlyphsForGlyphRange:(NSRange)glyphRange atPoint:(NSPoint)origin
|
||||
{
|
||||
|
||||
#if DEBUG_LM_DRAWING
|
||||
NSLog(@"drawGlyphsForGlyphRange: %@ atPoint: %@",
|
||||
NSStringFromRange(glyphRange),
|
||||
NSStringFromPoint(origin));
|
||||
#define DEBUG_LM_DRAWGLYPHSFORGLYPHRANGE 0
|
||||
#endif
|
||||
|
||||
NSTextView *textView = [self textViewForBeginningOfSelection];
|
||||
NSRange selectedRange = (textView == nil) ? NSMakeRange(0,0) : [textView selectedRange];
|
||||
|
||||
@ -1450,6 +1536,9 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
// Iterate over the glyph fragments (which identify runs of common attributes)
|
||||
while (NSNextRangeEnumeratorEntry(&state,&range,(void **)&fragment)) {
|
||||
|
||||
#if DEBUG_LM_DRAWGLYPHSFORGLYPHRANGE
|
||||
NSLog(@" looking at range: %@", NSStringFromRange(range));
|
||||
#endif
|
||||
// Reset the offset for this fragment
|
||||
float glyphXOffset = 0;
|
||||
|
||||
@ -1463,17 +1552,39 @@ static inline void _appendRectToCache(NSLayoutManager *self,NSRect rect){
|
||||
NSRange characterRange = [self characterRangeForGlyphRange: intersect actualGlyphRange: NULL];
|
||||
|
||||
NSDictionary *attributes = [_textStorage attributesAtIndex: characterRange.location effectiveRange: NULL];
|
||||
|
||||
|
||||
#if DEBUG_LM_DRAWGLYPHSFORGLYPHRANGE
|
||||
NSLog(@" characterRange: %@", NSStringFromRange(characterRange));
|
||||
NSLog(@" attributes: %@", attributes);
|
||||
#endif
|
||||
|
||||
BOOL tempAttributesInRange = NO;
|
||||
NSUInteger tempAttributesIndex = NSNotFound;
|
||||
|
||||
if (NSCountRangeEntries(_rangeToTemporaryAttributes) > 0) {
|
||||
// But we do have to worry about the temporary attributes so let's do a quick check with the character range and find out
|
||||
// if we have any temp attributes to be concerned about
|
||||
NSRange tempRange;
|
||||
NSDictionary *tmpAttrs = [self temporaryAttributesAtCharacterIndex:characterRange.location effectiveRange:&tempRange];
|
||||
if (tmpAttrs.count > 0 && NSIntersectionRange(characterRange, tempRange).length > 0) {
|
||||
tempAttributesInRange = YES;
|
||||
}
|
||||
NSUInteger index = characterRange.location;
|
||||
NSRange tempRange = NSMakeRange(0, 0);
|
||||
while (tempAttributesInRange == NO && index < NSMaxRange(characterRange)) {
|
||||
if (NSRangeEntryAtIndex(_rangeToTemporaryAttributes, index, &tempRange) != nil) {
|
||||
tempAttributesInRange = YES;
|
||||
tempAttributesIndex = index;
|
||||
} else {
|
||||
index++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#if DEBUG_LM_DRAWGLYPHSFORGLYPHRANGE
|
||||
NSLog(@" temporaryAttributesInRange: %@", tempAttributesInRange ? @"YES" : @"NO");
|
||||
if (tempAttributesInRange) {
|
||||
NSRange tempRange;
|
||||
NSDictionary *tmpAttrs = [self temporaryAttributesAtCharacterIndex:tempAttributesIndex effectiveRange:&tempRange];
|
||||
NSLog(@" temporaryAttributes: %@", tmpAttrs);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (tempAttributesInRange) {
|
||||
|
||||
// Ok - so we've got to proceed with caution - there are temp attributes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user