X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/42ac4858f9a8d9550733ca6f647ef375fb33c4b8..db6fa9632fd87d6873bb41bd304584fb6f2a2e83:/Library.mm diff --git a/Library.mm b/Library.mm index 9202ca3..f6cc678 100644 --- a/Library.mm +++ b/Library.mm @@ -1,39 +1,23 @@ /* WinterBoard - Theme Manager for the iPhone - * Copyright (C) 2008-2011 Jay Freeman (saurik) + * Copyright (C) 2008-2014 Jay Freeman (saurik) */ +/* GNU Lesser General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: + * WinterBoard is free software: you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. + * WinterBoard is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with WinterBoard. If not, see . +**/ +/* }}} */ #include @@ -105,8 +89,6 @@ bool _itv; #include "WBMarkup.h" -extern "C" void __clear_cache (char *beg, char *end); - static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_AssociationPolicy policy); static id (*$objc_getAssociatedObject)(id object, void *key); static void (*$objc_removeAssociatedObjects)(id object); @@ -123,7 +105,6 @@ MSClassHook(NSString) MSClassHook(UIImage) MSMetaClassHook(UIImage) -MSClassHook(UIImageTableArtwork) MSClassHook(UINavigationBar) MSClassHook(UISharedArtwork) MSClassHook(UIToolbar) @@ -152,6 +133,8 @@ MSMetaClassHook(SBIconAccessoryImage) MSClassHook(SBIconBadge) MSClassHook(SBIconBadgeFactory) MSClassHook(SBIconBadgeImage) +MSClassHook(SBIconBadgeView) +MSMetaClassHook(SBIconBadgeView) MSClassHook(SBIconContentView) MSClassHook(SBIconController) MSClassHook(SBIconLabel) @@ -228,12 +211,13 @@ 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 *UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:32]; -static NSMutableDictionary *PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16]; +static NSMutableDictionary *Images_ = [[NSMutableDictionary alloc] initWithCapacity:64]; static NSMutableDictionary *Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64]; static NSMutableDictionary *Strings_ = [[NSMutableDictionary alloc] initWithCapacity:0]; static NSMutableDictionary *Bundles_ = [[NSMutableDictionary alloc] initWithCapacity:2]; @@ -273,9 +257,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)]); @@ -333,7 +314,7 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) { for (NSString *file in files) { path = [NSString stringWithFormat:@"%@/%@", theme, file]; if ([Manager_ fileExistsAtPath:path]) { - if ([[Manager_ pathContentOfSymbolicLinkAtPath:path] isEqualToString:@"/"]) + if ([[Manager_ destinationOfSymbolicLinkAtPath:path error:NULL] isEqualToString:@"/"]) path = nil; goto set; } @@ -622,7 +603,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 @@ -657,13 +638,13 @@ MSHook(NSString *, SBApplication$pathForIcon, SBApplication *self, SEL sel) { static UIImage *CachedImageAtPath(NSString *path) { path = [path stringByResolvingSymlinksInPath]; - UIImage *image = [PathImages_ objectForKey:path]; + UIImage *image = [Images_ objectForKey:path]; if (image != nil) return reinterpret_cast(image) == [NSNull null] ? nil : image; image = [[UIImage alloc] initWithContentsOfFile:path cache:true]; if (image != nil) image = [image autorelease]; - [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:path]; + [Images_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:path]; return image; } @@ -697,6 +678,8 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) { // %hook -[NSBundle pathForResource:ofType:] {{{ MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, resource, NSString *, type) { NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type]; + if ([file isEqualToString:@"Info.plist"]) + return MSOldCall(resource, type); if (Debug_) NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file); if (NSString *path = $pathForFile$inBundle$(file, self, false, false)) @@ -707,13 +690,13 @@ MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, 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; @@ -744,25 +727,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) { @@ -787,14 +752,58 @@ 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) return MSOldCall(point, width, font, mode, spacing, emoji); - if (--state->count_ == 0) + if (state->count_ != 0 && --state->count_ == 0) stringDrawingState_ = state->next_; if (state->info_ == nil) return MSOldCall(point, width, font, mode, spacing, emoji); @@ -812,13 +821,13 @@ 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) return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation); - if (--state->count_ == 0) + if (state->count_ != 0 && --state->count_ == 0) stringDrawingState_ = state->next_; if (state->info_ == nil) return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation); @@ -852,14 +861,64 @@ 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_); if (state == NULL) return MSOldCall(font, width, mode, spacing); - if (--state->count_ == 0) + if (state->count_ != 0 && --state->count_ == 0) stringDrawingState_ = state->next_; if (state->info_ == nil) return MSOldCall(font, width, mode, spacing); @@ -873,14 +932,14 @@ 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_); if (state == NULL) return MSOldCall(font); - if (--state->count_ == 0) + if (state->count_ != 0 && --state->count_ == 0) stringDrawingState_ = state->next_; if (state->info_ == nil) return MSOldCall(font); @@ -893,11 +952,23 @@ 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); - WBStringDrawingState badgeState = {NULL, -1, @"" + WBStringDrawingState badgeState = {NULL, 0, @"" , @"BadgeStyle"}; stringDrawingState_ = &badgeState; @@ -909,7 +980,7 @@ MSClassMessageHook2(UIImage *, SBIconAccessoryImage, checkoutAccessoryImageForIc } MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, NSString *, text) { - WBStringDrawingState badgeState = {NULL, -1, @"" + WBStringDrawingState badgeState = {NULL, 0, @"" , @"BadgeStyle"}; stringDrawingState_ = &badgeState; @@ -926,7 +997,11 @@ MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;" , @"CalendarIconDayStyle"}; - WBStringDrawingState sizeState = {&dayState, 7, nil, nil}; + WBStringDrawingState wtfState = {&dayState, 1, nil, nil}; + + WBStringDrawingState sizeState = { + kCFCoreFoundationVersionNumber > 800 ? &wtfState : &dayState + , 7, nil, nil}; WBStringDrawingState dateState = {&sizeState, 2, @"" , @"CalendarIconDateStyle"}; @@ -994,7 +1069,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)]; @@ -1083,6 +1158,17 @@ static UIImage *$getImage$(NSString *path) { return image; } +template +_finline UIImage *WBCacheImage(const Original_ &original, const Modified_ &modified, NSString *key) { + UIImage *image([Images_ objectForKey:key]); + if (image != nil) + return reinterpret_cast(image) == [NSNull null] ? original() : image; + if (NSString *path = modified()) + image = $getImage$(path); + [Images_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; + return image == nil ? original() : image; +} + static UIImage *$getDefaultDesktopImage$() { if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"LockBackground.png", @"LockBackground.jpg", nil]))) return $getImage$(path); @@ -1431,13 +1517,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); @@ -1458,7 +1544,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); @@ -1789,6 +1875,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)); @@ -1894,98 +1989,55 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) { } // }}} -MSInstanceMessage2(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; -} - -MSInstanceMessage1(UIImage *, UIImageTableArtwork, imageNamed, NSString *, name) { - NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle))); - if (Debug_) - NSLog(@"WB:Debug:[UIImageTableArtwork[%@] imageNamed:\"%@\"]", bundle, name); - if (bundle == nil) - return MSOldCall(name); - UIImage *image = [UIImages_ objectForKey:name]; - if (image != nil) - return reinterpret_cast(image) == [NSNull null] ? MSOldCall(name) : image; - if (NSString *path = $pathForFile$inBundle$(name, bundle, true, true)) - image = $getImage$(path); - [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:name]; - if (image != nil) - return image; - - image = MSOldCall(name); - - if (UIDebug_) { +template +static UIImage *WBCacheUIImage(const Original_ &original, NSString *name, NSString *key) { + if ([name rangeOfString:@"."].location == NSNotFound) + 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 image; } // %hook _UIImageWithName() {{{ MSHook(UIImage *, _UIImageWithName, NSString *name) { - if (Debug_) - NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name); if (name == nil) return nil; - - int identifier; - bool packed; - - if (_UIPackedImageTableGetIdentifierForName != NULL) - packed = _UIPackedImageTableGetIdentifierForName(name, &identifier); - else if (_UISharedImageNameGetIdentifier != NULL) { - identifier = _UISharedImageNameGetIdentifier(name); - packed = identifier != -1; - } else { - identifier = -1; - packed = false; - } - if (Debug_) - NSLog(@"WB:Debug: _UISharedImageNameGetIdentifier(\"%@\") = %d", name, identifier); - - if (!packed) - return __UIImageWithName(name); - else { - NSNumber *key([NSNumber numberWithInt:identifier]); - UIImage *image([UIImages_ objectForKey:key]); - if (image != nil) - return reinterpret_cast(image) == [NSNull null] ? __UIImageWithName(name) : image; - if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true, true)) - image = $getImage$(path); - [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; - if (image != nil) - return image; - - image = __UIImageWithName(name); - - if (UIDebug_) { - NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]); - if (![Manager_ fileExistsAtPath:path]) - [UIImagePNGRepresentation(image) writeToFile:path atomically:YES]; - } - - return image; - } + NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name); + return WBCacheUIImage( + [=](){ return __UIImageWithName(name); }, + name, [NSString stringWithFormat:@"I:%@", name]); } // }}} // %hook _UIImageWithNameInDomain() {{{ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { - NSString *key([NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]); - UIImage *image([PathImages_ objectForKey:key]); - if (image != nil) - return reinterpret_cast(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : image; if (Debug_) - NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain); - if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]]))) - image = $getImage$(path); - [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; - return image == nil ? __UIImageWithNameInDomain(name, domain) : image; + NSLog(@"WB:Debug: _UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain); + return WBCacheImage( + [=](){ return __UIImageWithNameInDomain(name, domain); }, + [=](){ return $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])); }, + [NSString stringWithFormat:@"D:%zu:%@%@", size_t([domain length]), domain, name]); +} +// }}} +// %hook _UIImageWithDeviceUsingCurrentIdiom() {{{ +MSHook(UIImage *, _UIImageWithNameUsingCurrentIdiom, NSString *name) { + if (Debug_) + NSLog(@"WB:Debug: _UIImageWithNameUsingCurrentIdiom(\"%@\")", name); + return WBCacheUIImage( + [=](){ return __UIImageWithNameUsingCurrentIdiom(name); }, + name, [NSString stringWithFormat:@"I:%@", name]); +} +// }}} +// %hook _UIImageWithDeviceSpecificName() {{{ +MSHook(UIImage *, _UIImageWithDeviceSpecificName, NSString *name) { + if (Debug_) + NSLog(@"WB:Debug: _UIImageWithDeviceSpecificName(\"%@\")", name); + return WBCacheUIImage( + [=](){ return __UIImageWithDeviceSpecificName(name); }, + name, [NSString stringWithFormat:@"S:%@", name]); } // }}} @@ -2002,11 +2054,10 @@ MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits t // }}} #define AudioToolbox "/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox" -#define UIKit "/System/Library/Frameworks/UIKit.framework/UIKit" static bool GetFileNameForThisAction$(bool value, unsigned long a0, char *a1, unsigned long a2, bool &a3) { if (Debug_) - NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u, %u) = %u", a0, value ? a1 : NULL, a2, a3, value); + NSLog(@"WB:Debug:GetFileNameForThisAction(%lu, %s, %lu, %u) = %u", a0, value ? a1 : NULL, a2, a3, value); if (value) { NSString *path = [NSString stringWithUTF8String:a1]; @@ -2101,14 +2152,8 @@ static void msset(Type_ &function, MSImageRef image, const char *name) { function = reinterpret_cast(MSFindSymbol(image, name)); } -template -static void nlset(Type_ &function, struct nlist *nl, size_t index) { - struct nlist &name(nl[index]); - uintptr_t value(name.n_value); - if ((name.n_desc & N_ARM_THUMB_DEF) != 0) - value |= 0x00000001; - function = reinterpret_cast(value); -} +#define WBHookSymbol(image, function) \ + msset(function, image, "_" #function) template static void dlset(Type_ &function, const char *name) { @@ -2162,7 +2207,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]); @@ -2195,6 +2240,7 @@ static void SBInitialize() { } else { WBRename(SBIconLabelImageParameters, hash, hash); WBRename($SBIconView, _labelImageParametersForIcon:location:, _labelImageParametersForIcon$location$); + WBRename(SBIconView, _labelImageParameters, _labelImageParameters); WBRename($SBIconLabelImage, _drawLabelImageForParameters:, _drawLabelImageForParameters$); } @@ -2209,9 +2255,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$); @@ -2230,6 +2278,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) { @@ -2296,10 +2349,8 @@ MSInitialize { if (name == nil) continue; - NSString *theme(nil); - #define testForTheme(format...) \ - if (theme == nil) { \ + { \ NSString *path = [NSString stringWithFormat:format]; \ if ([Manager_ fileExistsAtPath:path]) { \ [Themes_ addObject:path]; \ @@ -2386,7 +2437,7 @@ MSInitialize { CFNotificationCenterAddObserver( CFNotificationCenterGetDarwinNotifyCenter(), - NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0 + NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, CFNotificationSuspensionBehaviorCoalesce ); if ($getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"]) != nil) { @@ -2402,34 +2453,49 @@ MSInitialize { } // }}} // UIKit {{{ - if ([NSBundle bundleWithIdentifier:@"com.apple.UIKit"] != nil) { + 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 - if (kCFCoreFoundationVersionNumber > 700) { // XXX: iOS 6.x - WBRename(UISharedArtwork, initWithName:inBundle:, initWithName$inBundle$); - WBRename(UIImageTableArtwork, imageNamed:, imageNamed$); - } else { - struct nlist nl[6]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName"; - nl[1].n_un.n_name = (char *) "__UIImageWithNameInDomain"; - nl[2].n_un.n_name = (char *) "__UIKitBundle"; - nl[3].n_un.n_name = (char *) "__UIPackedImageTableGetIdentifierForName"; - nl[4].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier"; - nlist(UIKit, nl); - - nlset(_UIApplicationImageWithName, nl, 0); - nlset(_UIImageWithNameInDomain, nl, 1); - nlset(_UIKitBundle, nl, 2); - nlset(_UIPackedImageTableGetIdentifierForName, nl, 3); - nlset(_UISharedImageNameGetIdentifier, nl, 4); - - MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName); - MSHookFunction(_UIImageWithName, &$_UIImageWithName, &__UIImageWithName); - MSHookFunction(_UIImageWithNameInDomain, &$_UIImageWithNameInDomain, &__UIImageWithNameInDomain); - } + WBHookSymbol(image, _UIKitBundle); + WBHookSymbol(image, _UIPackedImageTableGetIdentifierForName); + WBHookSymbol(image, _UISharedImageNameGetIdentifier); + + MSHookFunction(_UIImageWithName, MSHake(_UIImageWithName)); + + WBHookSymbol(image, _UIApplicationImageWithName); + MSHookFunction(_UIApplicationImageWithName, MSHake(_UIApplicationImageWithName)); + + WBHookSymbol(image, _UIImageWithNameInDomain); + MSHookFunction(_UIImageWithNameInDomain, MSHake(_UIImageWithNameInDomain)); + + WBHookSymbol(image, _UIImageWithNameUsingCurrentIdiom); + MSHookFunction(_UIImageWithNameUsingCurrentIdiom, MSHake(_UIImageWithNameUsingCurrentIdiom)); + + WBHookSymbol(image, _UIImageWithDeviceSpecificName); + MSHookFunction(_UIImageWithDeviceSpecificName, MSHake(_UIImageWithDeviceSpecificName)); + + 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$)); + + 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$)); } // }}}