X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/4596e76a9a78dac32f4a70f152ff3261e1098c03..b704c082e0ad23abfd8690ce504311be0f28f197:/Library.mm diff --git a/Library.mm b/Library.mm index f4b400a..d928a03 100644 --- a/Library.mm +++ b/Library.mm @@ -103,6 +103,7 @@ Class $MPVideoView; MSClassHook(NSBundle) MSClassHook(NSString) +MSClassHook(_UIAssetManager) MSClassHook(UIImage) MSMetaClassHook(UIImage) MSClassHook(UINavigationBar) @@ -133,6 +134,8 @@ MSMetaClassHook(SBIconAccessoryImage) MSClassHook(SBIconBadge) MSClassHook(SBIconBadgeFactory) MSClassHook(SBIconBadgeImage) +MSClassHook(SBIconBadgeView) +MSMetaClassHook(SBIconBadgeView) MSClassHook(SBIconContentView) MSClassHook(SBIconController) MSClassHook(SBIconLabel) @@ -197,6 +200,11 @@ static bool Four_($SBDockIconListView != nil); @end +@interface _UIAssetManager : NSObject +- (NSBundle *) bundle; +- (NSString *) carFileName; +@end + static BOOL (*_GSFontGetUseLegacyFontMetrics)(); #define $GSFontGetUseLegacyFontMetrics() \ (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics()) @@ -209,11 +217,7 @@ static bool SpringBoard_; static UIImage *(*_UIApplicationImageWithName)(NSString *name); static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain); -static UIImage *(*_UIImageWithNameUsingCurrentIdiom)(NSString *name); -static UIImage *(*_UIImageWithDeviceSpecificName)(NSString *name); static NSBundle *(*_UIKitBundle)(); -static bool (*_UIPackedImageTableGetIdentifierForName)(NSString *, int *); -static int (*_UISharedImageNameGetIdentifier)(NSString *); static NSMutableDictionary *Images_ = [[NSMutableDictionary alloc] initWithCapacity:64]; static NSMutableDictionary *Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64]; @@ -226,6 +230,39 @@ static NSMutableArray *Themes_; static NSDictionary *English_; static NSMutableDictionary *Info_; +// @interface WBBundle {{{ +@interface WBBundle : NSBundle { + NSString *identifier_; +} + ++ (WBBundle *) bundleWithIdentifier:(NSString *)identifier; + +@end + +@implementation WBBundle + +- (void) dealloc { + [identifier_ release]; + return [super dealloc]; +} + ++ (WBBundle *) bundleWithIdentifier:(NSString *)identifier { + return [[[self alloc] initWithIdentifier:identifier] autorelease]; +} + +- (id) initWithIdentifier:(NSString *)identifier { + if ((self = [super init]) != nil) { + identifier_ = [identifier retain]; + } return self; +} + +- (NSString *) bundleIdentifier { + return identifier_; +} + +@end +// }}} + // $getTheme$() {{{ static NSMutableDictionary *Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128]; @@ -243,7 +280,11 @@ static unsigned $getScale$(NSString *path) { StripName("~iphone"); StripName("~ipad"); - return [name hasSuffix:@"@2x"] ? 2 : 1; + if ([name hasSuffix:@"@3x"]) + return 3; + if ([name hasSuffix:@"@2x"]) + return 2; + return 1; } static NSArray *$useScale$(NSArray *files, bool use = true) { @@ -255,9 +296,6 @@ static NSArray *$useScale$(NSArray *files, bool use = true) { Scale_ = 1; } - if (Scale_ == 1) - return files; - NSString *idiom(IsWild_ ? @"ipad" : @"iphone"); NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 4)]); @@ -267,16 +305,16 @@ static NSArray *$useScale$(NSArray *files, bool use = true) { NSString *extension([file pathExtension]); if (use) { - if (Scale_ == 2) { - [scaled addObject:[NSString stringWithFormat:@"%@@2x~%@.%@", base, idiom, extension]]; - [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", base, extension]]; + for (unsigned scale(2); scale <= Scale_; ++scale) { + [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 (!IsWild_) <- support old themes [scaled addObject:file]; - } else if ([base hasSuffix: @"@2x"]) { + } else if ([base hasSuffix: @"@2x"] || [base hasSuffix:@"@3x"]) { [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]]; [scaled addObject:file]; @@ -332,13 +370,10 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) { } // }}} // $pathForFile$inBundle$() {{{ -static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui, bool use) { - NSString *identifier = [bundle bundleIdentifier]; - NSMutableArray *names = [NSMutableArray arrayWithCapacity:8]; - +static void $pathForFile$inBundle$(NSMutableArray *names, NSString *file, NSString *identifier, NSString *folder) { if (identifier != nil) [names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]]; - if (NSString *folder = [[bundle bundlePath] lastPathComponent]) { + if (folder != nil) { [names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]]; NSString *base([folder stringByDeletingPathExtension]); if ([base hasSuffix:@"~iphone"]) @@ -346,8 +381,6 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u if ([base hasSuffix:@"~ipad"]) [names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 5)], [folder pathExtension], file]]; } - if (ui) - [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]]; #define remapResourceName(oldname, newname) \ else if ([file isEqualToString:(oldname)]) \ @@ -356,24 +389,43 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u bool summer(SpringBoard_ && SummerBoard_); if (identifier == nil); + else if ([identifier isEqualToString:@"com.apple.uikit.Artwork"]) + $pathForFile$inBundle$(names, file, @"com.apple.UIKit", @"UIKit.framework"); + else if ([identifier isEqualToString:@"com.apple.uikit.LegacyArtwork"]) + $pathForFile$inBundle$(names, file, @"com.apple.UIKit", @"UIKit.framework"); + else if ([identifier isEqualToString:@"com.apple.UIKit"]) + [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]]; else if ([identifier isEqualToString:@"com.apple.chatkit"]) - [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.MobileSMS/%@", file]]; + $pathForFile$inBundle$(names, file, @"com.apple.MobileSMS", @"MobileSMS.app"); else if ([identifier isEqualToString:@"com.apple.calculator"]) [names addObject:[NSString stringWithFormat:@"Files/Applications/Calculator.app/%@", file]]; else if ([identifier isEqualToString:@"com.apple.Maps"] && [file isEqualToString:@"Icon-57@2x.png"]) - [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.Maps/icon.png"]]; + $pathForFile$inBundle$(names, @"icon.png", identifier, folder); else if (!summer); remapResourceName(@"FSO_BG.png", @"StatusBar") remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock") remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather") +} +static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NSURL *url, bool use) { + NSMutableArray *names = [NSMutableArray arrayWithCapacity:8]; + $pathForFile$inBundle$(names, file, identifier, [url lastPathComponent]); [names addObject:[NSString stringWithFormat:@"Fallback/%@", file]]; - if (NSString *path = $getTheme$($useScale$(names, use))) return path; - return nil; } + +// XXX: this cannot be merged due to WBBundle +static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool use) { + return $pathForFile$inBundle$(file, [bundle bundleIdentifier], [bundle bundleURL], use); +} + +static NSString *$pathForFile$inBundle$(NSString *file, CFBundleRef bundle, bool use) { + NSString *identifier((NSString *) CFBundleGetIdentifier(bundle)); + NSURL *url([(NSURL *) CFBundleCopyBundleURL(bundle) autorelease]); + return $pathForFile$inBundle$(file, identifier, url, use); +} // }}} static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { @@ -381,7 +433,12 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { NSString *path = [self path]; NSString *folder = [path lastPathComponent]; NSString *dname = [self displayName]; - NSString *didentifier = [self displayIdentifier]; + + NSString *didentifier; + if ([self respondsToSelector:@selector(displayIdentifier)]) + didentifier = [self displayIdentifier]; + else + didentifier = nil; if (Debug_) NSLog(@"WB:Debug: [SBApplication(%@:%@:%@:%@) pathForIcon]", identifier, folder, dname, didentifier); @@ -398,7 +455,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { if (NSString *name = Name) \ [names addObject:[NSString stringWithFormat:@"Icons%@/%@.png", suffix, name]]; - if (![didentifier isEqualToString:identifier]) + if (didentifier != nil && ![didentifier isEqualToString:identifier]) testForIcon(didentifier); testForIcon(identifier); @@ -434,7 +491,11 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { if (path == nil || [path length] == 0 || [path isEqualToString:@"/"]) return nil; - NSBundle *bundle([Bundles_ objectForKey:path]); + NSBundle *bundle; + @synchronized (Bundles_) { + bundle = [Bundles_ objectForKey:path]; + } + if (reinterpret_cast(bundle) == [NSNull null]) return nil; else if (bundle == nil) { @@ -444,7 +505,10 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { bundle = [NSBundle wb$bundleWithFile:path]; if (Debug_) NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle); - [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast(bundle)) forKey:path]; + + @synchronized (Bundles_) { + [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast(bundle)) forKey:path]; + } } return bundle; @@ -472,7 +536,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { if ([file hasPrefix:prefix]) { NSUInteger length([prefix length]); if (length != [file length]) - if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false, false)) + if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false)) return path; } } @@ -604,7 +668,7 @@ MSHook(UIImage *, SBApplicationIcon$generateIconImage$, SBApplicationIcon *self, return [UIImage imageWithContentsOfFile:path72]; if (NSString *path = $pathForIcon$([self application])) if (UIImage *image = [UIImage imageWithContentsOfFile:path]) { - float width; + CGFloat width; if ([$SBIcon respondsToSelector:@selector(defaultIconImageSize)]) width = [$SBIcon defaultIconImageSize].width; else @@ -653,7 +717,7 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) { NSBundle *bundle = [NSBundle mainBundle]; if (Debug_) NSLog(@"WB:Debug: _UIApplicationImageWithName(\"%@\", %@)", name, bundle); - if (NSString *path = $pathForFile$inBundle$(name, bundle, false, false)) + if (NSString *path = $pathForFile$inBundle$(name, bundle, false)) return CachedImageAtPath(path); return __UIApplicationImageWithName(name); } @@ -676,26 +740,31 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) { NSLog(@"WB:Error: [%s forwardInvocation:(%s)]", class_getName([self class]), sel_getName(sel)); \ } -// %hook -[NSBundle pathForResource:ofType:] {{{ -MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, resource, NSString *, type) { - NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type]; +// %hook CFBundleCopyResourceURL {{{ +MSHook(CFURLRef, CFBundleCopyResourceURL, CFBundleRef bundle, CFStringRef resourceName, CFStringRef resourceType, CFStringRef subDirName) { + NSString *file((NSString *) resourceName); + if (resourceType != NULL) + file = [NSString stringWithFormat:@"%@.%@", file, resourceType]; + if (subDirName != NULL) + file = [NSString stringWithFormat:@"%@/%@", subDirName, resourceType]; + if (Debug_) - NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file); - if (NSString *path = $pathForFile$inBundle$(file, self, false, false)) - return path; - return MSOldCall(resource, type); + 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); } // }}} static void $drawLabel$(NSString *label, CGRect rect, NSString *style, NSString *custom) { bool ellipsis(false); - float max = rect.size.width - 11, width; + CGFloat max = rect.size.width - 11, width; width: width = [(ellipsis ? [label stringByAppendingString:@"..."] : label) sizeWithStyle:style forWidth:320].width; if (width > max) { size_t length([label length]); - float spacing((width - max) / (length - 1)); + CGFloat spacing((width - max) / (length - 1)); if (spacing > 1.25) { ellipsis = true; @@ -726,25 +795,7 @@ static struct WBStringDrawingState { extern "C" CGColorSpaceRef CGContextGetFillColorSpace(CGContextRef); extern "C" void CGContextGetFillColor(CGContextRef, CGFloat[]); -static NSString *WBColorMarkup() { - CGContextRef context(UIGraphicsGetCurrentContext()); - //NSLog(@"XXX:1:%p", context); - if (context == NULL) - return @""; - - CGColorSpaceRef space(CGContextGetFillColorSpace(context)); - //NSLog(@"XXX:2:%p", space); - if (space == NULL) - return @""; - - size_t number(CGColorSpaceGetNumberOfComponents(space)); - //NSLog(@"XXX:3:%u", number); - if (number == 0) - return @""; - - CGFloat components[number + 1]; - CGContextGetFillColor(context, components); - +static NSString *WBColorMarkup(size_t number, const CGFloat *components) { CGFloat r, g, b, a; switch (number) { @@ -769,8 +820,52 @@ static NSString *WBColorMarkup() { return [NSString stringWithFormat:@"color: rgba(%g, %g, %g, %g)", r * 255, g * 255, b * 255, a]; } -MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing,includeEmoji, CGPoint, point, float, width, UIFont *, font, UILineBreakMode, mode, float, spacing, BOOL, emoji) { - //NSLog(@"XXX: @\"%@\" %g", self, spacing); +static NSString *WBColorMarkup() { + CGContextRef context(UIGraphicsGetCurrentContext()); + //NSLog(@"XXX:1:%p", context); + if (context == NULL) + return @""; + + CGColorSpaceRef space(CGContextGetFillColorSpace(context)); + //NSLog(@"XXX:2:%p", space); + if (space == NULL) + return @""; + + size_t number(CGColorSpaceGetNumberOfComponents(space)); + //NSLog(@"XXX:3:%u", number); + if (number == 0) + return @""; + + CGFloat components[number + 1]; + CGContextGetFillColor(context, components); + return WBColorMarkup(number, components); +} + +static NSString *WBColorMarkup(UIColor *uicolor) { + if (uicolor == nil) + return @""; + CGColorRef cgcolor([uicolor CGColor]); + if (cgcolor == NULL) + return @""; + + CGColorSpaceRef space(CGColorGetColorSpace(cgcolor)); + //NSLog(@"XXX:2:%p", space); + if (space == NULL) + return @""; + + size_t number(CGColorGetNumberOfComponents(cgcolor)); + //NSLog(@"XXX:3:%u", number); + if (number == 0) + return @""; + + const CGFloat *components(CGColorGetComponents(cgcolor)); + return WBColorMarkup(number, components); +} + +extern "C" NSString *NSStringFromCGPoint(CGPoint rect); + +MSInstanceMessage6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing,includeEmoji, CGPoint, point, CGFloat, width, UIFont *, font, UILineBreakMode, mode, CGFloat, spacing, BOOL, emoji) { + //NSLog(@"XXX: @\"%@\" %@ %g \"%@\" %u %g %u", self, NSStringFromCGPoint(point), width, font, mode, spacing, emoji); WBStringDrawingState *state(stringDrawingState_); if (state == NULL) @@ -794,7 +889,7 @@ MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreak 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) { - //NSLog(@"XXX: &\"%@\" %@ \"%@\" %u %u %g %u %@", self, NSStringFromCGRect(rect), font, mode, alignment, spacing, emoji, NSStringFromCGRect(truncation)); + //NSLog(@"XXX: @\"%@\" %@ \"%@\" %u %u %g %u %@", self, NSStringFromCGRect(rect), font, mode, alignment, spacing, emoji, NSStringFromCGRect(truncation)); WBStringDrawingState *state(stringDrawingState_); if (state == NULL) @@ -834,7 +929,57 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig return CGSizeZero; } -MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, float, width, UILineBreakMode, mode, float, spacing) { +MSInstanceMessage2(void, NSString, drawInRect,withAttributes, CGRect, rect, NSDictionary *, attributes) { + //NSLog(@"XXX: *\"%@\" %@", self, attributes); + + WBStringDrawingState *state(stringDrawingState_); + if (state == NULL) + return MSOldCall(rect, attributes); + + if (state->count_ != 0 && --state->count_ == 0) + stringDrawingState_ = state->next_; + if (state->info_ == nil) + return MSOldCall(rect, attributes); + + NSString *info([Info_ objectForKey:state->info_]); + if (info == nil) + return MSOldCall(rect, attributes); + + NSString *base(state->base_ ?: @""); + + UIFont *font([attributes objectForKey:@"NSFont"]); + UIColor *color([attributes objectForKey:@"NSColor"]); + + [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(color), base, info]]; +} + +extern "C" NSString *NSStringFromCGSize(CGSize size); + +MSInstanceMessage4(CGRect, NSString, boundingRectWithSize,options,attributes,context, CGSize, size, NSInteger, options, NSDictionary *, attributes, id, context) { + //NSLog(@"XXX: $\"%@\" %@ 0x%x %@ %@", self, NSStringFromCGSize(size), unsigned(options), attributes, context); + + WBStringDrawingState *state(stringDrawingState_); + if (state == NULL) + return MSOldCall(size, options, attributes, context); + + if (state->count_ != 0 && --state->count_ == 0) + stringDrawingState_ = state->next_; + if (state->info_ == nil) + return MSOldCall(size, options, attributes, context); + + NSString *info([Info_ objectForKey:state->info_]); + if (info == nil) + return MSOldCall(size, options, attributes, context); + + NSString *base(state->base_ ?: @""); + + UIFont *font([attributes objectForKey:@"NSFont"]); + UIColor *color([attributes objectForKey:@"NSColor"]); + + return (CGRect) {{0, 0}, [self 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); WBStringDrawingState *state(stringDrawingState_); @@ -855,7 +1000,7 @@ MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,let return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info] forWidth:width]; } -MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) { +MSInstanceMessage1(CGSize, NSString, sizeWithFont, UIFont *, font) { //NSLog(@"XXX: ?\"%@\"", self); WBStringDrawingState *state(stringDrawingState_); @@ -875,6 +1020,18 @@ MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) { return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), base, info] forWidth:65535]; } +MSClassMessageHook2(id, SBIconBadgeView, checkoutAccessoryImagesForIcon,location, id, icon, int, location) { + WBStringDrawingState badgeState = {NULL, 0, @"" + , @"BadgeStyle"}; + + stringDrawingState_ = &badgeState; + + id images(MSOldCall(icon, location)); + + stringDrawingState_ = NULL; + return images; +} + MSClassMessageHook2(UIImage *, SBIconAccessoryImage, checkoutAccessoryImageForIcon,location, id, icon, int, location) { if ([self _imageClassForIcon:icon location:location] != $SBIconBadgeImage) return MSOldCall(icon, location); @@ -908,9 +1065,11 @@ MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;" , @"CalendarIconDayStyle"}; - WBStringDrawingState sizeState = {&dayState, 7, nil, nil}; + WBStringDrawingState skipState = {&dayState, + unsigned(kCFCoreFoundationVersionNumber > 800 ? 16 : 7) + , nil, nil}; - WBStringDrawingState dateState = {&sizeState, 2, @"" + WBStringDrawingState dateState = {&skipState, 2, @"" , @"CalendarIconDateStyle"}; stringDrawingState_ = &dateState; @@ -976,7 +1135,7 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s if (NSString *style = [Info_ objectForKey:@"CalendarIconDayStyle"]) daystyle = [daystyle stringByAppendingString:style]; - float width([self bounds].size.width); + CGFloat width([self bounds].size.width); float leeway(10); CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)]; CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)]; @@ -1114,20 +1273,6 @@ MSInstanceMessageHook0(id, SBUIController, init) { if (paper != nil) paper = [paper stringByDeletingLastPathComponent]; - { - size_t size; - sysctlbyname("hw.machine", NULL, &size, NULL, 0); - char *machine = new char[size]; - - if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1) { - perror("sysctlbyname(\"hw.machine\", ?)"); - delete [] machine; - machine = NULL; - } - - IsWild_ = machine != NULL && strncmp(machine, "iPad", 4) == 0; - } - if (Debug_) NSLog(@"WB:Debug:Info = %@", [Info_ description]); @@ -1424,13 +1569,13 @@ WBDelegate(badge_) /* }}} */ // IconAlpha {{{ -MSInstanceMessageHook1(void, SBIcon, setIconImageAlpha, float, alpha) { +MSInstanceMessageHook1(void, SBIcon, setIconImageAlpha, CGFloat, alpha) { if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) alpha = [number floatValue]; return MSOldCall(alpha); } -MSInstanceMessageHook1(void, SBIcon, setIconLabelAlpha, float, alpha) { +MSInstanceMessageHook1(void, SBIcon, setIconLabelAlpha, CGFloat, alpha) { if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) alpha = [number floatValue]; return MSOldCall(alpha); @@ -1451,7 +1596,7 @@ MSInstanceMessageHook0(id, SBIcon, initWithDefaultSize) { } return self; } -MSInstanceMessageHook1(void, SBIcon, setAlpha, float, alpha) { +MSInstanceMessageHook1(void, SBIcon, setAlpha, CGFloat, alpha) { if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) alpha = [number floatValue]; return MSOldCall(alpha); @@ -1700,7 +1845,7 @@ MSInstanceMessageHook3(NSString *, NSBundle, localizedStringForKey,value,table, return value; } else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings", language, file - ], self, false, false)) { + ], self, false)) { if ((strings = [[NSDictionary alloc] initWithContentsOfFile:path]) != nil) { [Strings_ setObject:[strings autorelease] forKey:name]; goto strings; @@ -1782,6 +1927,15 @@ MSClassMessage2(id, SBIconView, _labelImageParametersForIcon,location, id, icon, } return nil; } +MSInstanceMessage0(id, SBIconView, _labelImageParameters) { + if (id parameters = MSOldCall()) { + int &location(MSHookIvar(self, "_iconLocation")); + if (&location != NULL) + $objc_setAssociatedObject(parameters, @selector(wb$inDock), [NSNumber numberWithBool:(location == 3)], OBJC_ASSOCIATION_RETAIN_NONATOMIC); + return parameters; + } return nil; +} + MSClassMessage1(UIImage *, SBIconLabelImage, _drawLabelImageForParameters, id, parameters) { bool docked(wb$inDock(parameters)); @@ -1888,15 +2042,24 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) { // }}} template -static UIImage *WBCacheUIImage(const Original_ &original, NSString *name, NSString *key) { - if ([name rangeOfString:@"."].location == NSNotFound) +static UIImage *WBCacheUIImage(NSBundle *bundle, const Original_ &original, NSString *name, NSString *key) { + if (name == nil) + return original(); + NSUInteger period([name rangeOfString:@"."].location); + NSUInteger length([name length]); + if (period == NSNotFound || length < 4 || period > length - 4) name = [name stringByAppendingString:@".png"]; - UIImage *image(WBCacheImage(original, [=](){ return $pathForFile$inBundle$(name, _UIKitBundle(), true, true); }, key)); - if (image != nil && UIDebug_) { - NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]); - if (![Manager_ fileExistsAtPath:path]) - [UIImagePNGRepresentation(image) writeToFile:path atomically:YES]; - } return image; + + return WBCacheImage([bundle, &original, name](){ + UIImage *image(original()); + if (image != nil && UIDebug_) { + NSString *path([@"/tmp/WBImages/" stringByAppendingString:[bundle bundleIdentifier]]); + [Manager_ createDirectoryAtPath:path withIntermediateDirectories:YES attributes:@{NSFilePosixPermissions: @0777} error:NULL]; + path = [NSString stringWithFormat:@"%@/%@", path, name]; + if (![Manager_ fileExistsAtPath:path]) + [UIImagePNGRepresentation(image) writeToFile:path atomically:YES]; + } return image; + }, [=](){ return $pathForFile$inBundle$(name, bundle, true); }, key); } // %hook _UIImageWithName() {{{ @@ -1905,7 +2068,7 @@ MSHook(UIImage *, _UIImageWithName, NSString *name) { return nil; if (Debug_) NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name); - return WBCacheUIImage( + return WBCacheUIImage(_UIKitBundle(), [=](){ return __UIImageWithName(name); }, name, [NSString stringWithFormat:@"I:%@", name]); } @@ -1920,22 +2083,74 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { [NSString stringWithFormat:@"D:%zu:%@%@", size_t([domain length]), domain, name]); } // }}} -// %hook _UIImageWithDeviceUsingCurrentIdiom() {{{ -MSHook(UIImage *, _UIImageWithNameUsingCurrentIdiom, NSString *name) { + +// UISharedArtwork (iOS 6) {{{ +MSInstanceMessageHook2(UISharedArtwork *, UISharedArtwork, initWithName,inBundle, NSString *, name, NSBundle *, bundle) { + if ((self = MSOldCall(name, bundle)) != nil) { + $objc_setAssociatedObject(self, @selector(wb$bundle), bundle, OBJC_ASSOCIATION_RETAIN_NONATOMIC); + } return self; +} + +MSInstanceMessageHook2(UIImage *, UISharedArtwork, imageNamed,device, NSString *, name, NSInteger, device) { + NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle))); if (Debug_) - NSLog(@"WB:Debug: _UIImageWithNameUsingCurrentIdiom(\"%@\")", name); - return WBCacheUIImage( - [=](){ return __UIImageWithNameUsingCurrentIdiom(name); }, - name, [NSString stringWithFormat:@"I:%@", name]); + NSLog(@"WB:Debug: -[UISharedArtwork(%@) imageNamed:@\"%@\" device:%li]", [bundle bundleIdentifier], name, (long) device); + return WBCacheUIImage(bundle, + [=](){ return MSOldCall(name, device); }, + name, [NSString stringWithFormat:@"M:%p:%@:%li", self, name, (long) device]); +} +// }}} +// _UIAssetManager (iOS 7) {{{ +MSInstanceMessageHook3(_UIAssetManager *, _UIAssetManager, initWithName,inBundle,idiom, NSString *, name, NSBundle *, bundle, NSInteger, idiom) { + if ((self = MSOldCall(name, bundle, idiom)) != nil) { + $objc_setAssociatedObject(self, @selector(wb$bundle), bundle, OBJC_ASSOCIATION_RETAIN_NONATOMIC); + } return self; +} + +MSInstanceMessageHook5(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtype,cachingOptions, NSString *, name, CGFloat, scale, NSInteger, idiom, NSUInteger, subtype, NSUInteger, caching) { + NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle))); + if (Debug_) + NSLog(@"WB:Debug: -[_UIAssetManager(%@/%@) imageNamed:@\"%@\" scale:%g idiom:%li subtype:%lu cachingOptions:%lu]", + [bundle bundleIdentifier], [self carFileName], + name, scale, (long) idiom, + (unsigned long) subtype, + (unsigned long) caching + ); + + if (bundle == _UIKitBundle()) { + NSString *name([self carFileName]); + if (false); + else if ([name isEqualToString:@"UIKit_NewArtwork"]) + bundle = [WBBundle bundleWithIdentifier:@"com.apple.uikit.Artwork"]; + else if ([name isEqualToString:@"UIKit_OriginalArtwork"]) + bundle = [WBBundle bundleWithIdentifier:@"com.apple.uikit.LegacyArtwork"]; + } + + return WBCacheUIImage(bundle, + [=](){ return MSOldCall(name, scale, idiom, subtype, caching); }, + name, [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu", self, name, scale, (long) idiom, (unsigned long) subtype]); } // }}} -// %hook _UIImageWithDeviceSpecificName() {{{ -MSHook(UIImage *, _UIImageWithDeviceSpecificName, NSString *name) { +// _UIAssetManager (iOS 8) {{{ +struct SizeClassPair { + NSInteger first; + NSInteger second; +}; + +MSInstanceMessageHook7(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtype,cachingOptions,sizeClassPair,attachCatalogImage, NSString *, name, CGFloat, scale, NSInteger, idiom, NSUInteger, subtype, NSUInteger, caching, SizeClassPair, size, BOOL, attach) { + NSBundle *bundle([self bundle]); if (Debug_) - NSLog(@"WB:Debug: _UIImageWithDeviceSpecificName(\"%@\")", name); - return WBCacheUIImage( - [=](){ return __UIImageWithDeviceSpecificName(name); }, - name, [NSString stringWithFormat:@"S:%@", name]); + NSLog(@"WB:Debug: -[_UIAssetManager(%@/%@) imageNamed:@\"%@\" scale:%g idiom:%li subtype:%lu cachingOptions:%lu sizeClassPair:[%li %li] attachCatalogImage:%s]", + [bundle bundleIdentifier], [self carFileName], + name, scale, (long) idiom, + (unsigned long) subtype, + (unsigned long) caching, + (long) size.first, (long) size.second, + attach ? "YES" : "NO" + ); + return WBCacheUIImage(bundle, + [=](){ return MSOldCall(name, scale, idiom, subtype, caching, size, attach); }, + name, [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu:%li:%li:%c", self, name, scale, (long) idiom, (unsigned long) subtype, (long) size.first, (long) size.second, attach ? 'Y' : 'N']); } // }}} @@ -2007,33 +2222,48 @@ static void ChangeWallpaper( } -MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, NSDictionary **names, void *arg2, void *arg3) { +MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, CFTypeRef *names, void *arg2, void *arg3) { NSArray *images(_CPBitmapCreateImagesFromPath(path, names, arg2, arg3)); - if (images != NULL && *names != nil && CFGetTypeID((CFTypeRef) *names) == CFDictionaryGetTypeID()) { - if (NSBundle *bundle = [NSBundle wb$bundleWithFile:path]) { - NSMutableArray *copy([images mutableCopy]); - [images release]; - images = copy; - - NSString *file([path stringByResolvingSymlinksInPath]); - NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]); - if ([file hasPrefix:prefix]) { - NSUInteger length([prefix length]); - if (length != [file length]) { - NSEnumerator *enumerator([*names keyEnumerator]); - while (NSString *name = [enumerator nextObject]) { - NSString *png([name stringByAppendingString:@".png"]); - if (NSString *themed = $pathForFile$inBundle$(png, bundle, false, true)) { - NSUInteger index([[*names objectForKey:name] intValue]); - UIImage *image($getImage$(themed)); - CGImageRef cg([image CGImage]); - [copy replaceObjectAtIndex:index withObject:(id)cg]; - } - } - } - } + if (images == nil) + return nil; + if (*names == nil) + return images; + + NSBundle *bundle([NSBundle wb$bundleWithFile:path]); + if (bundle == nil) + return images; + + NSString *file([path stringByResolvingSymlinksInPath]); + NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]); + // XXX: why do I care about this? + if (![file hasPrefix:prefix]) + return images; + + NSMutableArray *copy([images mutableCopy]); + [images release]; + images = copy; + + NSDictionary *indexes; + NSEnumerator *enumerator; + + if (CFGetTypeID((CFTypeRef) *names) == CFDictionaryGetTypeID()) { + indexes = (NSDictionary *) *names; + enumerator = [indexes keyEnumerator]; + } else { + indexes = nil; + enumerator = [(NSArray *) *names objectEnumerator]; + } + + for (NSUInteger index(0); NSString *name = [enumerator nextObject]; ++index) + if (NSString *themed = $pathForFile$inBundle$([name stringByAppendingString:@".png"], bundle, true)) { + if (indexes != nil) + index = [[indexes objectForKey:name] intValue]; + UIImage *image($getImage$(themed)); + CGImageRef cg([image CGImage]); + [copy replaceObjectAtIndex:index withObject:(id)cg]; } - } return images; + + return images; } MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) { @@ -2105,7 +2335,7 @@ static void NSString$drawInRect$withStyle$(NSString *self, SEL _cmd, CGRect rect return [[WBMarkup sharedMarkup] drawString:self inRect:rect withStyle:style]; } -static CGSize NSString$sizeWithStyle$forWidth$(NSString *self, SEL _cmd, NSString *style, float width) { +static CGSize NSString$sizeWithStyle$forWidth$(NSString *self, SEL _cmd, NSString *style, CGFloat width) { if (style == nil || [style length] == 0) style = @"font-family: Helvetica; font-size: 12px"; CGSize size([[WBMarkup sharedMarkup] sizeOfString:self withStyle:style forWidth:width]); @@ -2138,6 +2368,7 @@ static void SBInitialize() { } else { WBRename(SBIconLabelImageParameters, hash, hash); WBRename($SBIconView, _labelImageParametersForIcon:location:, _labelImageParametersForIcon$location$); + WBRename(SBIconView, _labelImageParameters, _labelImageParameters); WBRename($SBIconLabelImage, _drawLabelImageForParameters:, _drawLabelImageForParameters$); } @@ -2152,9 +2383,11 @@ static void SBInitialize() { WBRename(SBIconModel, getCachedImagedForIcon:, getCachedImagedForIcon$); WBRename(SBIconModel, getCachedImagedForIcon:smallIcon:, getCachedImagedForIcon$smallIcon$); - WBRename(SBSearchView, initWithFrame:, initWithFrame$); - WBRename(SBSearchTableViewCell, drawRect:, drawRect$); - WBRename(SBSearchTableViewCell, initWithStyle:reuseIdentifier:, initWithStyle$reuseIdentifier$); + if (kCFCoreFoundationVersionNumber < 800) { + WBRename(SBSearchView, initWithFrame:, initWithFrame$); + WBRename(SBSearchTableViewCell, drawRect:, drawRect$); + WBRename(SBSearchTableViewCell, initWithStyle:reuseIdentifier:, initWithStyle$reuseIdentifier$); + } //WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$); @@ -2173,6 +2406,11 @@ static void SBInitialize() { if (SummerBoard_) English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"]; + + if (kCFCoreFoundationVersionNumber >= 800) { + WBRename(NSString, drawInRect:withAttributes:, drawInRect$withAttributes$); + WBRename(NSString, boundingRectWithSize:options:attributes:context:, boundingRectWithSize$options$attributes$context$); + } } /*MSHook(int, open, const char *path, int oflag, mode_t mode) { @@ -2183,7 +2421,7 @@ static void SBInitialize() { no = true; if (strstr(path, "/icon") != NULL) - MSHookProcess(-1, ""); + *reinterpret_cast(NULL) = NULL; if (fd == -1 && errno == EFAULT) NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd); @@ -2209,9 +2447,24 @@ MSInitialize { dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics"); + // Initialize IsWild_ {{{ + size_t size; + sysctlbyname("hw.machine", NULL, &size, NULL, 0); + char *machine = new char[size]; + + if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1) { + perror("sysctlbyname(\"hw.machine\", ?)"); + delete [] machine; + machine = NULL; + } + + IsWild_ = machine != NULL && strncmp(machine, "iPad", 4) == 0; + // }}} // Load Settings.plist {{{ if (NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) { - if (NSNumber *value = [settings objectForKey:@"SummerBoard"]) + if (kCFCoreFoundationVersionNumber >= 1000) + SummerBoard_ = false; + else if (NSNumber *value = [settings objectForKey:@"SummerBoard"]) SummerBoard_ = [value boolValue]; else SummerBoard_ = true; @@ -2267,7 +2520,7 @@ MSInitialize { // AppSupport {{{ if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport")) { - NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, NSDictionary **, void *, void *); + NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, CFTypeRef *, void *, void *); msset(CPBitmapCreateImagesFromPath, image, "_CPBitmapCreateImagesFromPath"); MSHookFunction(CPBitmapCreateImagesFromPath, MSHake(CPBitmapCreateImagesFromPath)); } @@ -2290,6 +2543,11 @@ MSInitialize { MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath)); } // }}} + // Foundation {{{ + if (true) { + MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL)); + } + // }}} // GraphicsServices {{{ if (true) { MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName); @@ -2321,7 +2579,7 @@ MSInitialize { // }}} // SpringBoard {{{ if (SpringBoard_) { - Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper@2x.png", @"Wallpaper@2x.jpg", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain]; + Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper@3x.png", @"Wallpaper@3x.jpg", @"Wallpaper@2x.png", @"Wallpaper@2x.jpg", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain]; Papered_ = $getTheme$(Wallpapers_) != nil; Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]) != nil; @@ -2344,15 +2602,20 @@ MSInitialize { // }}} // UIKit {{{ if (MSImageRef image = MSGetImageByName("/System/Library/Frameworks/UIKit.framework/UIKit")) { +#ifdef __LP64__ + class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v40@0:8{CGPoint=dd}16@32"); + class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v56@0:8{CGRect={CGSize=dd}{CGSize=dd}}16@48"); + class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=dd}32@0:8@16d24"); +#else class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16"); class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v28@0:4{CGRect={CGSize=ff}{CGSize=ff}}8@24"); class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=ff}16@0:4@8f12"); +#endif WBHookSymbol(image, _UIKitBundle); - WBHookSymbol(image, _UIPackedImageTableGetIdentifierForName); - WBHookSymbol(image, _UISharedImageNameGetIdentifier); - MSHookFunction(_UIImageWithName, MSHake(_UIImageWithName)); + if (kCFCoreFoundationVersionNumber < 700) + MSHookFunction(_UIImageWithName, MSHake(_UIImageWithName)); WBHookSymbol(image, _UIApplicationImageWithName); MSHookFunction(_UIApplicationImageWithName, MSHake(_UIApplicationImageWithName)); @@ -2360,23 +2623,24 @@ MSInitialize { WBHookSymbol(image, _UIImageWithNameInDomain); MSHookFunction(_UIImageWithNameInDomain, MSHake(_UIImageWithNameInDomain)); - WBHookSymbol(image, _UIImageWithNameUsingCurrentIdiom); - MSHookFunction(_UIImageWithNameUsingCurrentIdiom, MSHake(_UIImageWithNameUsingCurrentIdiom)); + SEL includeEmoji(@selector(_legacy_drawAtPoint:forWidth:withFont:lineBreakMode:letterSpacing:includeEmoji:)); + if (![@"" respondsToSelector:includeEmoji]) + includeEmoji = @selector(drawAtPoint:forWidth:withFont:lineBreakMode:letterSpacing:includeEmoji:); + MSHookMessage($NSString, includeEmoji, MSHake(NSString$drawAtPoint$forWidth$withFont$lineBreakMode$letterSpacing$includeEmoji$)); - WBHookSymbol(image, _UIImageWithDeviceSpecificName); - MSHookFunction(_UIImageWithDeviceSpecificName, MSHake(_UIImageWithDeviceSpecificName)); + SEL letterSpacing(@selector(_legacy_sizeWithFont:forWidth:lineBreakMode:letterSpacing:)); + if (![@"" respondsToSelector:letterSpacing]) + letterSpacing = @selector(sizeWithFont:forWidth:lineBreakMode:letterSpacing:); + MSHookMessage($NSString, letterSpacing, MSHake(NSString$sizeWithFont$forWidth$lineBreakMode$letterSpacing$)); + + SEL sizeWithFont(@selector(_legacy_sizeWithFont:)); + if (![@"" respondsToSelector:sizeWithFont]) + sizeWithFont = @selector(sizeWithFont:); + MSHookMessage($NSString, sizeWithFont, MSHake(NSString$sizeWithFont$)); } // }}} //MSHookFunction(reinterpret_cast(&open), MSHake(open)); - if (UIDebug_ && ![Manager_ fileExistsAtPath:@"/tmp/UIImages"]) { - NSError *error(nil); - if (![Manager_ createDirectoryAtPath:@"/tmp/UIImages" withIntermediateDirectories:NO attributes:[NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithShort:0777], NSFilePosixPermissions, - nil] error:&error]) - NSLog(@"WB:Error: cannot create /tmp/UIImages (%@)", error); - } - [pool release]; }