interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrated attrstr.m. This file needs to be cleaned up...

This commit is contained in:
Pietro Gagliardi 2018-03-04 20:01:52 -05:00
parent 1fc9f137bc
commit 232b14ccde
3 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
darwin/OLD_attrstr.h
View File

@ -1,7 +0,0 @@
// 4 march 2018
// attrstr.m
extern void initUnderlineColors(void);
extern void uninitUnderlineColors(void);
typedef void (^backgroundBlock)(uiDrawContext *c, uiDrawTextLayout *layout, double x, double y);
extern CFAttributedStringRef attrstrToCoreFoundation(uiDrawTextLayoutParams *p, NSArray **backgroundBlocks);

6
darwin/attrstr.h
View File

@ -70,3 +70,9 @@ extern void uiprivProcessFontTraits(uiprivFontStyleData *d, uiDrawFontDescriptor
// fontvariation.m // fontvariation.m
extern NSDictionary *uiprivMakeVariationAxisDict(CFArrayRef axes, CFDataRef avarTable); extern NSDictionary *uiprivMakeVariationAxisDict(CFArrayRef axes, CFDataRef avarTable);
extern void uiprivProcessFontVariation(uiprivFontStyleData *d, NSDictionary *axisDict, uiDrawFontDescriptor *out); extern void uiprivProcessFontVariation(uiprivFontStyleData *d, NSDictionary *axisDict, uiDrawFontDescriptor *out);
// attrstr.m
extern void uiprivInitUnderlineColors(void);
extern void uiprivUninitUnderlineColors(void);
typedef void (^backgroundBlock)(uiDrawContext *c, uiDrawTextLayout *layout, double x, double y);
extern CFAttributedStringRef uiprivAttributedStringToCFAttributedString(uiDrawTextLayoutParams *p, NSArray **backgroundBlocks);

50
darwin/OLD_attrstr.m → darwin/attrstr.m
View File

@ -1,5 +1,6 @@
// 12 february 2017 // 12 february 2017
#import "uipriv_darwin.h" #import "uipriv_darwin.h"
#import "attrstr.h"
// this is what AppKit does internally // this is what AppKit does internally
// WebKit does this too; see https://github.com/adobe/webkit/blob/master/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm // WebKit does this too; see https://github.com/adobe/webkit/blob/master/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm
@ -17,7 +18,7 @@ static NSColor *tryColorNamed(NSString *name)
return [NSColor colorWithPatternImage:img]; return [NSColor colorWithPatternImage:img];
} }
void initUnderlineColors(void) void uiprivInitUnderlineColors(void)
{ {
spellingColor = tryColorNamed(@"NSSpellingDot"); spellingColor = tryColorNamed(@"NSSpellingDot");
if (spellingColor == nil) { if (spellingColor == nil) {
@ -47,11 +48,14 @@ void initUnderlineColors(void)
[auxiliaryColor retain]; // override autoreleasing [auxiliaryColor retain]; // override autoreleasing
} }
void uninitUnderlineColors(void) void uiprivUninitUnderlineColors(void)
{ {
[auxiliaryColor release]; [auxiliaryColor release];
auxiliaryColor = nil;
[grammarColor release]; [grammarColor release];
grammarColors = nil;
[spellingColor release]; [spellingColor release];
spellingColor = nil;
} }
// unlike the other systems, Core Text rolls family, size, weight, italic, width, AND opentype features into the "font" attribute // unlike the other systems, Core Text rolls family, size, weight, italic, width, AND opentype features into the "font" attribute
@ -62,12 +66,12 @@ void uninitUnderlineColors(void)
// TODO in fact I should just write something to explain everything in this file... // TODO in fact I should just write something to explain everything in this file...
struct foreachParams { struct foreachParams {
CFMutableAttributedStringRef mas; CFMutableAttributedStringRef mas;
NSMutableDictionary *combinedFontAttrs; // keys are CFIndex in mas, values are combinedFontAttr objects NSMutableDictionary *combinedFontAttrs; // keys are CFIndex in mas, values are uiprivCombinedFontAttr objects
uiDrawFontDescriptor *defaultFont; uiDrawFontDescriptor *defaultFont;
NSMutableArray *backgroundBlocks; NSMutableArray *backgroundBlocks;
}; };
@interface combinedFontAttr : NSObject @interface uiprivCombinedFontAttr : NSObject
@property const char *family; @property const char *family;
@property double size; @property double size;
@property uiDrawTextWeight weight; @property uiDrawTextWeight weight;
@ -75,11 +79,11 @@ struct foreachParams {
@property uiDrawTextStretch stretch; @property uiDrawTextStretch stretch;
@property const uiOpenTypeFeatures *features; @property const uiOpenTypeFeatures *features;
- (id)initWithDefaultFont:(uiDrawFontDescriptor *)defaultFont; - (id)initWithDefaultFont:(uiDrawFontDescriptor *)defaultFont;
- (BOOL)same:(combinedFontAttr *)b; - (BOOL)same:(uiprivCombinedFontAttr *)b;
- (CTFontRef)toCTFont; - (CTFontRef)toCTFont;
@end @end
@implementation combinedFontAttr @implementation uiprivCombinedFontAttr
- (id)initWithDefaultFont:(uiDrawFontDescriptor *)defaultFont - (id)initWithDefaultFont:(uiDrawFontDescriptor *)defaultFont
{ {
@ -97,7 +101,7 @@ struct foreachParams {
} }
// TODO deduplicate this with common/attrlist.c // TODO deduplicate this with common/attrlist.c
- (BOOL)same:(combinedFontAttr *)b - (BOOL)same:(uiprivCombinedFontAttr *)b
{ {
// TODO should this be case-insensitive? // TODO should this be case-insensitive?
if (strcmp(self.family, b.family) != 0) if (strcmp(self.family, b.family) != 0)
@ -144,26 +148,26 @@ static void ensureFontInRange(struct foreachParams *p, size_t start, size_t end)
{ {
size_t i; size_t i;
NSNumber *n; NSNumber *n;
combinedFontAttr *new; uiprivCombinedFontAttr *new;
for (i = start; i < end; i++) { for (i = start; i < end; i++) {
n = [NSNumber numberWithInteger:i]; n = [NSNumber numberWithInteger:i];
if ([p->combinedFontAttrs objectForKey:n] != nil) if ([p->combinedFontAttrs objectForKey:n] != nil)
continue; continue;
new = [[combinedFontAttr alloc] initWithDefaultFont:p->defaultFont]; new = [[uiprivCombinedFontAttr alloc] initWithDefaultFont:p->defaultFont];
[p->combinedFontAttrs setObject:new forKey:n]; [p->combinedFontAttrs setObject:new forKey:n];
} }
} }
static void adjustFontInRange(struct foreachParams *p, size_t start, size_t end, void (^adj)(combinedFontAttr *cfa)) static void adjustFontInRange(struct foreachParams *p, size_t start, size_t end, void (^adj)(uiprivCombinedFontAttr *cfa))
{ {
size_t i; size_t i;
NSNumber *n; NSNumber *n;
combinedFontAttr *cfa; uiprivCombinedFontAttr *cfa;
for (i = start; i < end; i++) { for (i = start; i < end; i++) {
n = [NSNumber numberWithInteger:i]; n = [NSNumber numberWithInteger:i];
cfa = (combinedFontAttr *) [p->combinedFontAttrs objectForKey:n]; cfa = (uiprivCombinedFontAttr *) [p->combinedFontAttrs objectForKey:n];
adj(cfa); adj(cfa);
} }
} }
@ -220,31 +224,31 @@ static uiForEach processAttribute(const uiAttributedString *s, const uiAttribute
switch (spec->Type) { switch (spec->Type) {
case uiAttributeFamily: case uiAttributeFamily:
ensureFontInRange(p, start, end); ensureFontInRange(p, start, end);
adjustFontInRange(p, start, end, ^(combinedFontAttr *cfa) { adjustFontInRange(p, start, end, ^(uiprivCombinedFontAttr *cfa) {
cfa.family = spec->Family; cfa.family = spec->Family;
}); });
break; break;
case uiAttributeSize: case uiAttributeSize:
ensureFontInRange(p, start, end); ensureFontInRange(p, start, end);
adjustFontInRange(p, start, end, ^(combinedFontAttr *cfa) { adjustFontInRange(p, start, end, ^(uiprivCombinedFontAttr *cfa) {
cfa.size = spec->Double; cfa.size = spec->Double;
}); });
break; break;
case uiAttributeWeight: case uiAttributeWeight:
ensureFontInRange(p, start, end); ensureFontInRange(p, start, end);
adjustFontInRange(p, start, end, ^(combinedFontAttr *cfa) { adjustFontInRange(p, start, end, ^(uiprivCombinedFontAttr *cfa) {
cfa.weight = (uiDrawTextWeight) (spec->Value); cfa.weight = (uiDrawTextWeight) (spec->Value);
}); });
break; break;
case uiAttributeItalic: case uiAttributeItalic:
ensureFontInRange(p, start, end); ensureFontInRange(p, start, end);
adjustFontInRange(p, start, end, ^(combinedFontAttr *cfa) { adjustFontInRange(p, start, end, ^(uiprivCombinedFontAttr *cfa) {
cfa.italic = (uiDrawTextItalic) (spec->Value); cfa.italic = (uiDrawTextItalic) (spec->Value);
}); });
break; break;
case uiAttributeStretch: case uiAttributeStretch:
ensureFontInRange(p, start, end); ensureFontInRange(p, start, end);
adjustFontInRange(p, start, end, ^(combinedFontAttr *cfa) { adjustFontInRange(p, start, end, ^(uiprivCombinedFontAttr *cfa) {
cfa.stretch = (uiDrawTextStretch) (spec->Value); cfa.stretch = (uiDrawTextStretch) (spec->Value);
}); });
break; break;
@ -300,7 +304,7 @@ static uiForEach processAttribute(const uiAttributedString *s, const uiAttribute
break; break;
case uiAttributeFeatures: case uiAttributeFeatures:
ensureFontInRange(p, start, end); ensureFontInRange(p, start, end);
adjustFontInRange(p, start, end, ^(combinedFontAttr *cfa) { adjustFontInRange(p, start, end, ^(uiprivCombinedFontAttr *cfa) {
cfa.features = spec->Features; cfa.features = spec->Features;
}); });
break; break;
@ -311,7 +315,7 @@ static uiForEach processAttribute(const uiAttributedString *s, const uiAttribute
return uiForEachContinue; return uiForEachContinue;
} }
static BOOL cfaIsEqual(combinedFontAttr *a, combinedFontAttr *b) static BOOL cfaIsEqual(uiprivCombinedFontAttr *a, uiprivCombinedFontAttr *b)
{ {
if (a == nil && b == nil) if (a == nil && b == nil)
return YES; return YES;
@ -323,13 +327,13 @@ static BOOL cfaIsEqual(combinedFontAttr *a, combinedFontAttr *b)
static void applyAndFreeFontAttributes(struct foreachParams *p) static void applyAndFreeFontAttributes(struct foreachParams *p)
{ {
CFIndex i, n; CFIndex i, n;
combinedFontAttr *cfa, *cfab; uiprivCombinedFontAttr *cfa, *cfab;
CTFontRef defaultFont; CTFontRef defaultFont;
CTFontRef font; CTFontRef font;
CFRange range; CFRange range;
// first get the default font as a CTFontRef // first get the default font as a CTFontRef
cfa = [[combinedFontAttr alloc] initWithDefaultFont:p->defaultFont]; cfa = [[uiprivCombinedFontAttr alloc] initWithDefaultFont:p->defaultFont];
defaultFont = [cfa toCTFont]; defaultFont = [cfa toCTFont];
[cfa release]; [cfa release];
@ -344,7 +348,7 @@ static void applyAndFreeFontAttributes(struct foreachParams *p)
// TODO use NSValue or some other method of NSNumber // TODO use NSValue or some other method of NSNumber
nn = [NSNumber numberWithInteger:i]; nn = [NSNumber numberWithInteger:i];
cfab = (combinedFontAttr *) [p->combinedFontAttrs objectForKey:nn]; cfab = (uiprivCombinedFontAttr *) [p->combinedFontAttrs objectForKey:nn];
if (cfaIsEqual(cfa, cfab)) if (cfaIsEqual(cfa, cfab))
continue; continue;
@ -403,7 +407,7 @@ static CTParagraphStyleRef mkParagraphStyle(uiDrawTextLayoutParams *p)
return ps; return ps;
} }
CFAttributedStringRef attrstrToCoreFoundation(uiDrawTextLayoutParams *p, NSArray **backgroundBlocks) CFAttributedStringRef uiprivAttributedStringToCFAttributedString(uiDrawTextLayoutParams *p, NSArray **backgroundBlocks)
{ {
CFStringRef cfstr; CFStringRef cfstr;
CFMutableDictionaryRef defaultAttrs; CFMutableDictionaryRef defaultAttrs;