X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/5e57af8174dcd3743b049e8c388d25a8b1544b2c..refs/heads/master:/Library.mm diff --git a/Library.mm b/Library.mm index 2d112fb..037c3e0 100644 --- a/Library.mm +++ b/Library.mm @@ -102,6 +102,7 @@ Class $MPVideoView; MSClassHook(NSBundle) MSClassHook(NSString) +MSClassHook(NSAttributedString) MSClassHook(_UIAssetManager) MSClassHook(UIImage) @@ -298,25 +299,29 @@ static NSArray *$useScale$(NSArray *files, bool use = true) { NSString *idiom(IsWild_ ? @"ipad" : @"iphone"); - NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 4)]); + NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 6)]); for (NSString *file in files) { NSString *base([file stringByDeletingPathExtension]); NSString *extension([file pathExtension]); - if (use) { - for (unsigned scale(2); scale <= Scale_; ++scale) { - [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, scale, idiom, extension]]; - [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, scale, extension]]; - } +#define WBScaleImage(scale) \ + if (scale == 1) { \ + [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]]; \ + [scaled addObject:file]; \ + } else { \ + [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, scale, idiom, extension]]; \ + [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, scale, extension]]; \ + } - [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]]; + if (use) { + WBScaleImage(Scale_); - // if (!IsWild_) <- support old themes - [scaled addObject:file]; + for (unsigned scale(3); scale >= 1; --scale) + if (scale != Scale_) + WBScaleImage(scale); } else if ([base hasSuffix: @"@2x"] || [base hasSuffix:@"@3x"]) { - [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]]; - [scaled addObject:file]; + WBScaleImage(1); // XXX: this actually can't be used, as the person loading the file doesn't realize that the @2x changed /*NSString *rest([base substringWithRange:NSMakeRange(0, [base length] - 3)]); @@ -486,7 +491,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { @implementation NSBundle (WinterBoard) -+ (NSBundle *) wb$bundleWithFile:(NSString *)path { ++ (NSBundle *) _wb$bundleWithFile:(NSString *)path { path = [path stringByDeletingLastPathComponent]; if (path == nil || [path length] == 0 || [path isEqualToString:@"/"]) return nil; @@ -502,7 +507,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { if ([Manager_ fileExistsAtPath:[path stringByAppendingPathComponent:@"Info.plist"]]) bundle = [NSBundle bundleWithPath:path]; if (bundle == nil) - bundle = [NSBundle wb$bundleWithFile:path]; + bundle = [NSBundle _wb$bundleWithFile:path]; if (Debug_) NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle); @@ -514,6 +519,12 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { return bundle; } ++ (NSBundle *) wb$bundleWithFile:(NSString *)path { + if ([path hasPrefix:@"/Library/Themes"]) + return nil; + return [self _wb$bundleWithFile:path]; +} + @end // }}} // -[NSString wb$themedPath] {{{ @@ -524,9 +535,6 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { @implementation NSString (WinterBoard) - (NSString *) wb$themedPath { - if ([self hasPrefix:@"/Library/Themes/"]) - return self; - if (Debug_) NSLog(@"WB:Debug:Bypass(\"%@\")", self); @@ -748,10 +756,13 @@ MSHook(CFURLRef, CFBundleCopyResourceURL, CFBundleRef bundle, CFStringRef resour if (subDirName != NULL) file = [NSString stringWithFormat:@"%@/%@", subDirName, resourceType]; - if (Debug_) - NSLog(@"WB:Debug: CFBundleCopyResourceURL(<%@>, \"%@\", \"%@\", \"%@\")", CFBundleGetIdentifier(bundle), resourceName, resourceType, subDirName); - if (NSString *path = $pathForFile$inBundle$(file, bundle, false)) - return (CFURLRef) [[NSURL alloc] initFileURLWithPath:path]; + if (![file hasSuffix:@".png"]) { + if (Debug_) + NSLog(@"WB:Debug: CFBundleCopyResourceURL(<%@>, \"%@\", \"%@\", \"%@\")", CFBundleGetIdentifier(bundle), resourceName, resourceType, subDirName); + if (NSString *path = $pathForFile$inBundle$(file, bundle, false)) + return (CFURLRef) [[NSURL alloc] initFileURLWithPath:path]; + } + return _CFBundleCopyResourceURL(bundle, resourceName, resourceType, subDirName); } // }}} @@ -886,6 +897,30 @@ MSInstanceMessage6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode return CGSizeZero; } +MSInstanceMessage1(void, NSAttributedString, drawAtPoint, CGPoint, point) { + //NSLog(@"XXX: @\"%@\" %@", self, NSStringFromCGPoint(point)); + + WBStringDrawingState *state(stringDrawingState_); + if (state == NULL) + return MSOldCall(point); + + if (state->count_ != 0 && --state->count_ == 0) + stringDrawingState_ = state->next_; + if (state->info_ == nil) + return MSOldCall(point); + + NSString *info([Info_ objectForKey:state->info_]); + if (info == nil) + return MSOldCall(point); + + NSDictionary *attributes([self attributesAtIndex:0 effectiveRange:NULL]); + + UIFont *font([attributes objectForKey:@"NSFont"]); + + NSString *base(state->base_ ?: @""); + [[self string] drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), base, info]]; +} + extern "C" NSString *NSStringFromCGRect(CGRect rect); MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alignment,lineSpacing,includeEmoji,truncationRect, CGRect, rect, UIFont *, font, UILineBreakMode, mode, UITextAlignment, alignment, float, spacing, BOOL, emoji, CGRect, truncation) { @@ -979,6 +1014,33 @@ MSInstanceMessage4(CGRect, NSString, boundingRectWithSize,options,attributes,con return (CGRect) {{0, 0}, [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(color), base, info] forWidth:size.width]}; } +MSInstanceMessage3(CGRect, NSAttributedString, boundingRectWithSize,options,context, CGSize, size, NSInteger, options, id, context) { + //NSLog(@"XXX: $\"%@\" %@ 0x%x %@", self, NSStringFromCGSize(size), unsigned(options), context); + + WBStringDrawingState *state(stringDrawingState_); + if (state == NULL) + return MSOldCall(size, options, context); + + if (state->count_ != 0 && --state->count_ == 0) + stringDrawingState_ = state->next_; + if (state->info_ == nil) + return MSOldCall(size, options, context); + + NSString *info([Info_ objectForKey:state->info_]); + if (info == nil) + return MSOldCall(size, options, context); + + NSString *base(state->base_ ?: @""); + + NSDictionary *attributes([self attributesAtIndex:0 effectiveRange:NULL]); + + UIFont *font([attributes objectForKey:@"NSFont"]); + UIColor *color([attributes objectForKey:@"NSColor"]); + + MSOldCall(size, options, context); + return (CGRect) {{0, 0}, [[self string] sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(color), base, info] forWidth:size.width]}; +} + MSInstanceMessage4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, CGFloat, width, UILineBreakMode, mode, CGFloat, spacing) { //NSLog(@"XXX: #\"%@\" \"%@\" %g %u %g", self, font, width, mode, spacing); @@ -1060,14 +1122,20 @@ MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, } MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, int, type) { - WBStringDrawingState dayState = {NULL, 2, @"" + WBStringDrawingState dayState = {NULL, unsigned(kCFCoreFoundationVersionNumber >= 1200 ? 3 : 2), @"" // XXX: this is only correct on an iPod dock "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;" , @"CalendarIconDayStyle"}; - WBStringDrawingState skipState = {&dayState, - unsigned(kCFCoreFoundationVersionNumber > 800 ? 16 : 7) - , nil, nil}; + unsigned skips; + if (kCFCoreFoundationVersionNumber < 800) + skips = 7; + else if (kCFCoreFoundationVersionNumber < 1200) + skips = 16; + else + skips = 7; + + WBStringDrawingState skipState = {&dayState, skips, nil, nil}; WBStringDrawingState dateState = {&skipState, 2, @"" , @"CalendarIconDateStyle"}; @@ -2236,7 +2304,7 @@ MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, CFTypeRef *names NSArray *images(_CPBitmapCreateImagesFromPath(path, names, arg2, arg3)); if (images == nil) return nil; - if (*names == nil) + if (names == NULL || *names == nil) return images; NSBundle *bundle([NSBundle wb$bundleWithFile:path]); @@ -2560,6 +2628,7 @@ MSInitialize { // }}} // Foundation {{{ if (true) { + if (![identifier isEqualToString:@"com.apple.backupd"]) // XXX: rethink MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL)); } // }}} @@ -2652,6 +2721,9 @@ MSInitialize { if (![@"" respondsToSelector:sizeWithFont]) sizeWithFont = @selector(sizeWithFont:); MSHookMessage($NSString, sizeWithFont, MSHake(NSString$sizeWithFont$)); + + MSHookMessage($NSAttributedString, @selector(drawAtPoint:), MSHake(NSAttributedString$drawAtPoint$)); + MSHookMessage($NSAttributedString, @selector(boundingRectWithSize:options:context:), MSHake(NSAttributedString$boundingRectWithSize$options$context$)); } // }}}