gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-23 20:01:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

back/cairo: CairoFontEnumerator.m: Replace -handleKey:selector:valueClass: and -handleKey:selector: methods with macros.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@32880 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2011-04-17 22:29:18 +00:00
parent 7d4e86e5d3
commit 8545154f67
1 changed files with 38 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
Source/cairo/CairoFontEnumerator.m
View file

@ -549,34 +549,31 @@ static NSArray *faFromFc(FcPattern *pat)
} }
} }
- (void)handleKey: (NSString*)key selector: (SEL)selector valueClass: (Class)valueClass #define ADD_TO_PATTERN(key, handlerMethod, valueClass) \
{ do { \
id value = [_attributes objectForKey: key]; id value = [_attributes objectForKey: key]; \
if (value) if (value) \
{ { \
if ([value isKindOfClass: valueClass]) if ([value isKindOfClass: valueClass]) \
{ { \
if ([self respondsToSelector: selector]) [self handlerMethod value]; \
{ } \
[self performSelector: selector withObject: value]; else \
} { \
} NSLog(@"NSFontDescriptor: Ignoring invalid value %@ for attribute %@", value, key); \
else } \
{ } \
NSLog(@"NSFontDescriptor: Ignoring invalid value %@ for attribute %@", value, key); } while (0);
}
}
}
- (void)addAttributes - (void)addAttributes
{ {
[self handleKey: NSFontNameAttribute selector: @selector(addName:) valueClass: [NSString class]]; ADD_TO_PATTERN(NSFontNameAttribute, addName:, [NSString class]);
[self handleKey: NSFontVisibleNameAttribute selector: @selector(addVisibleName:) valueClass: [NSString class]]; ADD_TO_PATTERN(NSFontVisibleNameAttribute, addVisibleName:, [NSString class]);
[self handleKey: NSFontFamilyAttribute selector: @selector(addFamilyName:) valueClass: [NSString class]]; ADD_TO_PATTERN(NSFontFamilyAttribute, addFamilyName:, [NSString class]);
[self handleKey: NSFontFaceAttribute selector: @selector(addStyleName:) valueClass: [NSString class]]; ADD_TO_PATTERN(NSFontFaceAttribute, addStyleName:, [NSString class]);
[self handleKey: NSFontTraitsAttribute selector: @selector(addTraits:) valueClass: [NSDictionary class]]; ADD_TO_PATTERN(NSFontTraitsAttribute, addTraits:, [NSDictionary class]);
[self handleKey: NSFontSizeAttribute selector: @selector(addSize:) valueClass: [NSNumber class]]; ADD_TO_PATTERN(NSFontSizeAttribute, addSize:, [NSNumber class]);
[self handleKey: NSFontCharacterSetAttribute selector: @selector(addCharacterSet:) valueClass: [NSCharacterSet class]]; ADD_TO_PATTERN(NSFontCharacterSetAttribute, addCharacterSet:, [NSCharacterSet class]);
} }
- (FcPattern *)createPatternWithAttributes: (NSDictionary *)attributes - (FcPattern *)createPatternWithAttributes: (NSDictionary *)attributes
@ -749,29 +746,25 @@ static NSArray *faFromFc(FcPattern *pat)
return nil; return nil;
} }
- (void)handleKey: (NSString*)key selector: (SEL)sel #define READ_FROM_PATTERN(key, readMethod) \
{ do { \
if ([self respondsToSelector: sel]) id result = [self readMethod _pat]; \
{ if (result != nil) \
id (*readMethod)(id, SEL, FcPattern*) = (id (*)(id, SEL, FcPattern*))[self methodForSelector: sel]; { \
id result = readMethod(self, sel, _pat); [_attributes setObject: result \
if (result != nil) forKey: key]; \
{ } \
[_attributes setObject: result } while (0);
forKey: key];
}
}
}
- (void)parseAttributes - (void)parseAttributes
{ {
[self handleKey: NSFontNameAttribute selector: @selector(readNameFromPattern:)]; READ_FROM_PATTERN(NSFontNameAttribute, readNameFromPattern:);
[self handleKey: NSFontVisibleNameAttribute selector: @selector(readVisibleNameFromPattern:)]; READ_FROM_PATTERN(NSFontVisibleNameAttribute, readVisibleNameFromPattern:);
[self handleKey: NSFontFamilyAttribute selector: @selector(readFamilyNameFromPattern:)]; READ_FROM_PATTERN(NSFontFamilyAttribute, readFamilyNameFromPattern:);
[self handleKey: NSFontFaceAttribute selector: @selector(readStyleNameFromPattern:)]; READ_FROM_PATTERN(NSFontFaceAttribute, readStyleNameFromPattern:);
[self handleKey: NSFontTraitsAttribute selector: @selector(readTraitsFromPattern:)]; READ_FROM_PATTERN(NSFontTraitsAttribute, readTraitsFromPattern:);
[self handleKey: NSFontSizeAttribute selector: @selector(readSizeFromPattern:)]; READ_FROM_PATTERN(NSFontSizeAttribute, readSizeFromPattern:);
[self handleKey: NSFontCharacterSetAttribute selector: @selector(readCharacterSetFromPattern:)]; READ_FROM_PATTERN(NSFontCharacterSetAttribute, readCharacterSetFromPattern:);
} }
- (NSDictionary*)attributesFromPattern: (FcPattern *)pat - (NSDictionary*)attributesFromPattern: (FcPattern *)pat