Support NSAttributedString for iOS 9 calendar day.

[winterboard.git] / Library.mm

diff --git a/Library.mm b/Library.mm
index 1e79f60fdc8dcde381197c5f8f071769aac692f4..b097d03ef5fc624f4d8b38942c638d23d024fc01 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -102,7 +102,9 @@ Class $MPVideoView;
 
 MSClassHook(NSBundle)
 MSClassHook(NSString)
 
 MSClassHook(NSBundle)
 MSClassHook(NSString)

+MSClassHook(NSAttributedString)

 
 

+MSClassHook(_UIAssetManager)

 MSClassHook(UIImage)
 MSMetaClassHook(UIImage)
 MSClassHook(UINavigationBar)
 MSClassHook(UIImage)
 MSMetaClassHook(UIImage)
 MSClassHook(UINavigationBar)


@@ -133,6 +135,8 @@ MSMetaClassHook(SBIconAccessoryImage)
 MSClassHook(SBIconBadge)
 MSClassHook(SBIconBadgeFactory)
 MSClassHook(SBIconBadgeImage)
 MSClassHook(SBIconBadge)
 MSClassHook(SBIconBadgeFactory)
 MSClassHook(SBIconBadgeImage)

+MSClassHook(SBIconBadgeView)
+MSMetaClassHook(SBIconBadgeView)

 MSClassHook(SBIconContentView)
 MSClassHook(SBIconController)
 MSClassHook(SBIconLabel)
 MSClassHook(SBIconContentView)
 MSClassHook(SBIconController)
 MSClassHook(SBIconLabel)


@@ -197,6 +201,11 @@ static bool Four_($SBDockIconListView != nil);
 
 @end
 
 
 @end
 

+@interface _UIAssetManager : NSObject
+- (NSBundle *) bundle;
+- (NSString *) carFileName;
+@end
+

 static BOOL (*_GSFontGetUseLegacyFontMetrics)();
 #define $GSFontGetUseLegacyFontMetrics() \
     (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics())
 static BOOL (*_GSFontGetUseLegacyFontMetrics)();
 #define $GSFontGetUseLegacyFontMetrics() \
     (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics())


@@ -209,11 +218,7 @@ static bool SpringBoard_;
 
 static UIImage *(*_UIApplicationImageWithName)(NSString *name);
 static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain);
 
 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 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];
 
 static NSMutableDictionary *Images_ = [[NSMutableDictionary alloc] initWithCapacity:64];
 static NSMutableDictionary *Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64];


@@ -226,6 +231,39 @@ static NSMutableArray *Themes_;
 static NSDictionary *English_;
 static NSMutableDictionary *Info_;
 
 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];
 
 // $getTheme$() {{{
 static NSMutableDictionary *Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128];
 


@@ -243,7 +281,11 @@ static unsigned $getScale$(NSString *path) {
     StripName("~iphone");
     StripName("~ipad");
 
     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) {
 }
 
 static NSArray *$useScale$(NSArray *files, bool use = true) {


@@ -257,25 +299,29 @@ static NSArray *$useScale$(NSArray *files, bool use = true) {
 
     NSString *idiom(IsWild_ ? @"ipad" : @"iphone");
 
 
     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]);
 
 
     for (NSString *file in files) {
         NSString *base([file stringByDeletingPathExtension]);
         NSString *extension([file pathExtension]);
 

-        if (use) {
-            if (Scale_ == 2) {
-                [scaled addObject:[NSString stringWithFormat:@"%@@2x~%@.%@", base, idiom, extension]];
-                [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", base, 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];
-        } else if ([base hasSuffix: @"@2x"]) {
-            [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
-            [scaled addObject:file];
+            for (unsigned scale(3); scale >= 1; --scale)
+                if (scale != Scale_)
+                    WBScaleImage(scale);
+        } else if ([base hasSuffix: @"@2x"] || [base hasSuffix:@"@3x"]) {
+            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)]);
 
             // 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)]);


@@ -329,13 +375,10 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) {
 }
 // }}}
 // $pathForFile$inBundle$() {{{
 }
 // }}}
 // $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 (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"])
         [names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
         NSString *base([folder stringByDeletingPathExtension]);
         if ([base hasSuffix:@"~iphone"])


@@ -343,34 +386,51 @@ 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 ([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)]) \
 
     #define remapResourceName(oldname, newname) \
         else if ([file isEqualToString:(oldname)]) \

-            [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \
+            [names addObject:oldname ".png"];

 
     bool summer(SpringBoard_ && SummerBoard_);
 
     if (identifier == nil);
 
     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"])
     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"])
     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")
     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]];
     [names addObject:[NSString stringWithFormat:@"Fallback/%@", file]];

-

     if (NSString *path = $getTheme$($useScale$(names, use)))
         return path;
     if (NSString *path = $getTheme$($useScale$(names, use)))
         return path;

-

     return nil;
 }
     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 = @"") {
 // }}}
 
 static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {


@@ -378,7 +438,12 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
     NSString *path = [self path];
     NSString *folder = [path lastPathComponent];
     NSString *dname = [self displayName];
     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);
 
     if (Debug_)
         NSLog(@"WB:Debug: [SBApplication(%@:%@:%@:%@) pathForIcon]", identifier, folder, dname, didentifier);


@@ -395,7 +460,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
         if (NSString *name = Name) \
             [names addObject:[NSString stringWithFormat:@"Icons%@/%@.png", suffix, name]];
 
         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);
         testForIcon(didentifier);
 
     testForIcon(identifier);


@@ -426,27 +491,40 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
 
 @implementation NSBundle (WinterBoard)
 
 
 @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;
 
     path = [path stringByDeletingLastPathComponent];
     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<id>(bundle) == [NSNull null])
         return nil;
     else if (bundle == nil) {
         if ([Manager_ fileExistsAtPath:[path stringByAppendingPathComponent:@"Info.plist"]])
             bundle = [NSBundle bundleWithPath:path];
         if (bundle == nil)
     if (reinterpret_cast<id>(bundle) == [NSNull null])
         return nil;
     else if (bundle == nil) {
         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);
         if (Debug_)
             NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle);

-        [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast<id>(bundle)) forKey:path];
+
+        @synchronized (Bundles_) {
+            [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast<id>(bundle)) forKey:path];
+        }

     }
 
     return bundle;
 }
 
     }
 
     return bundle;
 }
 

++ (NSBundle *) wb$bundleWithFile:(NSString *)path {
+    if ([path hasPrefix:@"/Library/Themes"])
+        return nil;
+    return [self _wb$bundleWithFile:path];
+}
+

 @end
 // }}}
 // -[NSString wb$themedPath] {{{
 @end
 // }}}
 // -[NSString wb$themedPath] {{{


@@ -457,9 +535,6 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
 @implementation NSString (WinterBoard)
 
 - (NSString *) wb$themedPath {
 @implementation NSString (WinterBoard)
 
 - (NSString *) wb$themedPath {

-    if ([self hasPrefix:@"/Library/Themes/"])
-        return self;
-

     if (Debug_)
         NSLog(@"WB:Debug:Bypass(\"%@\")", self);
 
     if (Debug_)
         NSLog(@"WB:Debug:Bypass(\"%@\")", self);
 


@@ -469,7 +544,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
         if ([file hasPrefix:prefix]) {
             NSUInteger length([prefix length]);
             if (length != [file length])
         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;
         }
     }
                     return path;
         }
     }


@@ -650,7 +725,7 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) {
     NSBundle *bundle = [NSBundle mainBundle];
     if (Debug_)
         NSLog(@"WB:Debug: _UIApplicationImageWithName(\"%@\", %@)", name, bundle);
     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);
 }
         return CachedImageAtPath(path);
     return __UIApplicationImageWithName(name);
 }


@@ -673,14 +748,22 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) {
             NSLog(@"WB:Error: [%s forwardInvocation:(%s)]", class_getName([self class]), sel_getName(sel)); \
     }
 
             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];
-    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);
+// %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 (![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);

 }
 // }}}
 
 }
 // }}}
 


@@ -723,25 +806,7 @@ static struct WBStringDrawingState {
 extern "C" CGColorSpaceRef CGContextGetFillColorSpace(CGContextRef);
 extern "C" void CGContextGetFillColor(CGContextRef, CGFloat[]);
 
 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) {
     CGFloat r, g, b, a;
 
     switch (number) {


@@ -766,6 +831,48 @@ static NSString *WBColorMarkup() {
     return [NSString stringWithFormat:@"color: rgba(%g, %g, %g, %g)", r * 255, g * 255, b * 255, a];
 }
 
     return [NSString stringWithFormat:@"color: rgba(%g, %g, %g, %g)", r * 255, g * 255, b * 255, a];
 }
 

+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) {
 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) {


@@ -790,6 +897,30 @@ MSInstanceMessage6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode
     return CGSizeZero;
 }
 
     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) {
 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) {


@@ -833,6 +964,82 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig
     return CGSizeZero;
 }
 
     return CGSizeZero;
 }
 

+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]};
+}
+
+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"]);
+
+    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);
 
 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);
 


@@ -874,6 +1081,18 @@ MSInstanceMessage1(CGSize, NSString, sizeWithFont, UIFont *, font) {
     return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), base, info] forWidth:65535];
 }
 
     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);
 MSClassMessageHook2(UIImage *, SBIconAccessoryImage, checkoutAccessoryImageForIcon,location, id, icon, int, location) {
     if ([self _imageClassForIcon:icon location:location] != $SBIconBadgeImage)
         return MSOldCall(icon, location);


@@ -902,18 +1121,22 @@ MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText,
 }
 
 MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, int, type) {
 }
 
 MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, int, type) {

-    WBStringDrawingState dayState = {NULL, 2, @""
+    WBStringDrawingState dayState = {NULL, unsigned(kCFCoreFoundationVersionNumber >= 1200 ? 1 : 2), @""

         // XXX: this is only correct on an iPod dock
         "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;"
     , @"CalendarIconDayStyle"};
 
         // XXX: this is only correct on an iPod dock
         "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;"
     , @"CalendarIconDayStyle"};
 

-    WBStringDrawingState wtfState = {&dayState, 1, nil, nil};
+    unsigned skips;
+    if (kCFCoreFoundationVersionNumber < 800)
+        skips = 7;
+    else if (kCFCoreFoundationVersionNumber < 1200)
+        skips = 16;
+    else
+        skips = 9;

 
 

-    WBStringDrawingState sizeState = {
-        kCFCoreFoundationVersionNumber > 800 ? &wtfState : &dayState
-    , 7, nil, nil};
+    WBStringDrawingState skipState = {&dayState, skips, nil, nil};

 
 

-    WBStringDrawingState dateState = {&sizeState, 2, @""
+    WBStringDrawingState dateState = {&skipState, 2, @""

     , @"CalendarIconDateStyle"};
 
     stringDrawingState_ = &dateState;
     , @"CalendarIconDateStyle"};
 
     stringDrawingState_ = &dateState;


@@ -1069,7 +1292,7 @@ static UIImage *$getImage$(NSString *path) {
 }
 
 template <typename Original_, typename Modified_>
 }
 
 template <typename Original_, typename Modified_>

-_finline UIImage *WBCacheImage(const Original_ &original, const Modified_ &modified, NSString *key) {
+_finline UIImage *WBCacheImage(const Modified_ &modified, const Original_ &original, NSString *key) {

     UIImage *image([Images_ objectForKey:key]);
     if (image != nil)
         return reinterpret_cast<id>(image) == [NSNull null] ? original() : image;
     UIImage *image([Images_ objectForKey:key]);
     if (image != nil)
         return reinterpret_cast<id>(image) == [NSNull null] ? original() : image;


@@ -1117,20 +1340,6 @@ MSInstanceMessageHook0(id, SBUIController, init) {
     if (paper != nil)
         paper = [paper stringByDeletingLastPathComponent];
 
     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]);
 
     if (Debug_)
         NSLog(@"WB:Debug:Info = %@", [Info_ description]);
 


@@ -1427,13 +1636,13 @@ WBDelegate(badge_)
 /* }}} */
 
 // IconAlpha {{{
 /* }}} */
 
 // 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);
 }
 
     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);
     if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
         alpha = [number floatValue];
     return MSOldCall(alpha);


@@ -1454,7 +1663,7 @@ MSInstanceMessageHook0(id, SBIcon, initWithDefaultSize) {
     } return self;
 }
 
     } 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);
     if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
         alpha = [number floatValue];
     return MSOldCall(alpha);


@@ -1703,7 +1912,7 @@ MSInstanceMessageHook3(NSString *, NSBundle, localizedStringForKey,value,table,
                 return value;
     } else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings",
         language, file
                 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;
         if ((strings = [[NSDictionary alloc] initWithContentsOfFile:path]) != nil) {
             [Strings_ setObject:[strings autorelease] forKey:name];
             goto strings;


@@ -1900,15 +2109,27 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) {
 // }}}
 
 template <typename Original_>
 // }}}
 
 template <typename Original_>

-static UIImage *WBCacheUIImage(const Original_ &original, NSString *name, NSString *key) {
-    if ([name rangeOfString:@"."].location == NSNotFound)
+static UIImage *WBCacheImage(NSBundle *bundle, NSString *name, const Original_ &original, 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"];
         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(
+        [=](){ return $pathForFile$inBundle$(name, bundle, true); },
+    [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;
+    },
+    key);

 }
 
 // %hook _UIImageWithName() {{{
 }
 
 // %hook _UIImageWithName() {{{


@@ -1917,9 +2138,9 @@ MSHook(UIImage *, _UIImageWithName, NSString *name) {
         return nil;
     if (Debug_)
         NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name);
         return nil;
     if (Debug_)
         NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name);

-    return WBCacheUIImage(
+    return WBCacheImage(_UIKitBundle(), name,

         [=](){ return __UIImageWithName(name); },
         [=](){ return __UIImageWithName(name); },

-    name, [NSString stringWithFormat:@"I:%@", name]);
+    [NSString stringWithFormat:@"I:%@", name]);

 }
 // }}}
 // %hook _UIImageWithNameInDomain() {{{
 }
 // }}}
 // %hook _UIImageWithNameInDomain() {{{


@@ -1927,27 +2148,79 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
     if (Debug_)
         NSLog(@"WB:Debug: _UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
     return WBCacheImage(
     if (Debug_)
         NSLog(@"WB:Debug: _UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
     return WBCacheImage(

-        [=](){ return __UIImageWithNameInDomain(name, domain); },

         [=](){ return $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])); },
         [=](){ return $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])); },

+        [=](){ return __UIImageWithNameInDomain(name, domain); },

     [NSString stringWithFormat:@"D:%zu:%@%@", size_t([domain length]), domain, name]);
 }
 // }}}
     [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_)
     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 WBCacheImage(bundle, name,
+        [=](){ return MSOldCall(name, device); },
+    [NSString stringWithFormat:@"M:%p:%@:%li", self, name, (long) device]);

 }
 // }}}
 }
 // }}}

-// %hook _UIImageWithDeviceSpecificName() {{{
-MSHook(UIImage *, _UIImageWithDeviceSpecificName, NSString *name) {
+// _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_)
     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]",
+            [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 WBCacheImage(bundle, name,
+        [=](){ return MSOldCall(name, scale, idiom, subtype, caching); },
+    [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu", self, name, scale, (long) idiom, (unsigned long) subtype]);
+}
+// }}}
+// _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: -[_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 WBCacheImage(bundle, name,
+        [=](){ return MSOldCall(name, scale, idiom, subtype, caching, size, attach); },
+    [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']);

 }
 // }}}
 
 }
 // }}}
 


@@ -1990,10 +2263,17 @@ MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool
     return GetFileNameForThisAction$(value, a0, a1, 0, a3);
 }
 
     return GetFileNameForThisAction$(value, a0, a1, 0, a3);
 }
 

+#ifdef __LP64__
+MSHook(bool, _Z24GetFileNameForThisActionjPcjRb, unsigned int a0, char *a1, unsigned int a2, bool &a3) {
+    bool value(__Z24GetFileNameForThisActionjPcjRb(a0, a1, a2, a3));
+    return GetFileNameForThisAction$(value, a0, a1, a2, a3);
+}
+#else

 MSHook(bool, _Z24GetFileNameForThisActionmPcmRb, unsigned long a0, char *a1, unsigned long a2, bool &a3) {
     bool value(__Z24GetFileNameForThisActionmPcmRb(a0, a1, a2, a3));
     return GetFileNameForThisAction$(value, a0, a1, a2, a3);
 }
 MSHook(bool, _Z24GetFileNameForThisActionmPcmRb, unsigned long a0, char *a1, unsigned long a2, bool &a3) {
     bool value(__Z24GetFileNameForThisActionmPcmRb(a0, a1, a2, a3));
     return GetFileNameForThisAction$(value, a0, a1, a2, a3);
 }

+#endif

 
 static void ChangeWallpaper(
     CFNotificationCenterRef center,
 
 static void ChangeWallpaper(
     CFNotificationCenterRef center,


@@ -2019,33 +2299,47 @@ 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));
     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];
+            if (UIImage *image = $getImage$(themed))
+                [copy replaceObjectAtIndex:index withObject:(id)[image CGImage]];

         }
         }

-    } return images;
+
+    return images;

 }
 
 MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) {
 }
 
 MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) {


@@ -2188,6 +2482,11 @@ static void SBInitialize() {
 
     if (SummerBoard_)
         English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
 
     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) {
 }
 
 /*MSHook(int, open, const char *path, int oflag, mode_t mode) {


@@ -2198,7 +2497,7 @@ static void SBInitialize() {
     no = true;
 
     if (strstr(path, "/icon") != NULL)
     no = true;
 
     if (strstr(path, "/icon") != NULL)

-        MSHookProcess(-1, "");
+        *reinterpret_cast<void *volatile *>(NULL) = NULL;

 
     if (fd == -1 && errno == EFAULT)
         NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd);
 
     if (fd == -1 && errno == EFAULT)
         NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd);


@@ -2224,9 +2523,24 @@ MSInitialize {
 
     dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics");
 
 
     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"]]) {
     // 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;
             SummerBoard_ = [value boolValue];
         else
             SummerBoard_ = true;


@@ -2282,7 +2596,7 @@ MSInitialize {
 
     // AppSupport {{{
     if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport")) {
 
     // 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));
     }
         msset(CPBitmapCreateImagesFromPath, image, "_CPBitmapCreateImagesFromPath");
         MSHookFunction(CPBitmapCreateImagesFromPath, MSHake(CPBitmapCreateImagesFromPath));
     }


@@ -2293,9 +2607,15 @@ MSInitialize {
         msset(_Z24GetFileNameForThisActionmPcRb, image, "__Z24GetFileNameForThisActionmPcRb");
         MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb);
 
         msset(_Z24GetFileNameForThisActionmPcRb, image, "__Z24GetFileNameForThisActionmPcRb");
         MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb);
 

+#ifdef __LP64__
+        bool (*_Z24GetFileNameForThisActionjPcjRb)(unsigned int, char *, unsigned int, bool &);
+        msset(_Z24GetFileNameForThisActionjPcjRb, image, "__Z24GetFileNameForThisActionjPcjRb");
+        MSHookFunction(_Z24GetFileNameForThisActionjPcjRb, &$_Z24GetFileNameForThisActionjPcjRb, &__Z24GetFileNameForThisActionjPcjRb);
+#else

         bool (*_Z24GetFileNameForThisActionmPcmRb)(unsigned long, char *, unsigned long, bool &);
         msset(_Z24GetFileNameForThisActionmPcmRb, image, "__Z24GetFileNameForThisActionmPcmRb");
         MSHookFunction(_Z24GetFileNameForThisActionmPcmRb, &$_Z24GetFileNameForThisActionmPcmRb, &__Z24GetFileNameForThisActionmPcmRb);
         bool (*_Z24GetFileNameForThisActionmPcmRb)(unsigned long, char *, unsigned long, bool &);
         msset(_Z24GetFileNameForThisActionmPcmRb, image, "__Z24GetFileNameForThisActionmPcmRb");
         MSHookFunction(_Z24GetFileNameForThisActionmPcmRb, &$_Z24GetFileNameForThisActionmPcmRb, &__Z24GetFileNameForThisActionmPcmRb);

+#endif

     }
     // }}}
     // BackBoardServices {{{
     }
     // }}}
     // BackBoardServices {{{


@@ -2305,6 +2625,12 @@ MSInitialize {
         MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath));
     }
     // }}}
         MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath));
     }
     // }}}

+    // Foundation {{{
+    if (true) {
+        if (![identifier isEqualToString:@"com.apple.backupd"]) // XXX: rethink
+        MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL));
+    }
+    // }}}

     // GraphicsServices {{{
     if (true) {
         MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName);
     // GraphicsServices {{{
     if (true) {
         MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName);


@@ -2336,7 +2662,7 @@ MSInitialize {
     // }}}
     // SpringBoard {{{
     if (SpringBoard_) {
     // }}}
     // 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;
 
         Papered_ = $getTheme$(Wallpapers_) != nil;
         Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]) != nil;
 


@@ -2370,10 +2696,9 @@ MSInitialize {
 #endif
 
         WBHookSymbol(image, _UIKitBundle);
 #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));
 
         WBHookSymbol(image, _UIApplicationImageWithName);
         MSHookFunction(_UIApplicationImageWithName, MSHake(_UIApplicationImageWithName));


@@ -2381,12 +2706,6 @@ MSInitialize {
         WBHookSymbol(image, _UIImageWithNameInDomain);
         MSHookFunction(_UIImageWithNameInDomain, MSHake(_UIImageWithNameInDomain));
 
         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:);
         SEL includeEmoji(@selector(_legacy_drawAtPoint:forWidth:withFont:lineBreakMode:letterSpacing:includeEmoji:));
         if (![@"" respondsToSelector:includeEmoji])
             includeEmoji = @selector(drawAtPoint:forWidth:withFont:lineBreakMode:letterSpacing:includeEmoji:);


@@ -2401,18 +2720,13 @@ MSInitialize {
         if (![@"" respondsToSelector:sizeWithFont])
             sizeWithFont = @selector(sizeWithFont:);
         MSHookMessage($NSString, sizeWithFont, MSHake(NSString$sizeWithFont$));
         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$));

     }
     // }}}
 
     //MSHookFunction(reinterpret_cast<int (*)(const char *, int, mode_t)>(&open), MSHake(open));
 
     }
     // }}}
 
     //MSHookFunction(reinterpret_cast<int (*)(const char *, int, mode_t)>(&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];
 }
     [pool release];
 }