Support NSAttributedString for iOS 9 calendar day.

[winterboard.git] / Library.mm

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

+MSClassHook(NSAttributedString)

 
 MSClassHook(_UIAssetManager)
 MSClassHook(UIImage)
 
 MSClassHook(_UIAssetManager)
 MSClassHook(UIImage)


@@ -298,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) {
-            for (unsigned scale(2); scale <= Scale_; ++scale) {
-                [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, scale, idiom, extension]];
-                [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, scale, extension]];
-            }
+#define WBScaleImage(scale) \
+    if (scale == 1) { \
+        [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]]; \
+        [scaled addObject:file]; \
+    } else { \
+        [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, scale, idiom, extension]]; \
+        [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, scale, extension]]; \
+    }

 
 

-            [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
+        if (use) {
+            WBScaleImage(Scale_);

 
 

-            // if (!IsWild_) <- support old themes
-            [scaled addObject:file];
+            for (unsigned scale(3); scale >= 1; --scale)
+                if (scale != Scale_)
+                    WBScaleImage(scale);

         } else if ([base hasSuffix: @"@2x"] || [base hasSuffix:@"@3x"]) {
         } else if ([base hasSuffix: @"@2x"] || [base hasSuffix:@"@3x"]) {

-            [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
-            [scaled addObject:file];
+            WBScaleImage(1);

 
             // XXX: this actually can't be used, as the person loading the file doesn't realize that the @2x changed
             /*NSString *rest([base substringWithRange:NSMakeRange(0, [base length] - 3)]);
 
             // XXX: this actually can't be used, as the person loading the file doesn't realize that the @2x changed
             /*NSString *rest([base substringWithRange:NSMakeRange(0, [base length] - 3)]);


@@ -486,7 +491,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
 
 @implementation NSBundle (WinterBoard)
 
 
 @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;


@@ -502,7 +507,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
         if ([Manager_ fileExistsAtPath:[path stringByAppendingPathComponent:@"Info.plist"]])
             bundle = [NSBundle bundleWithPath:path];
         if (bundle == nil)
         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);
 


@@ -514,6 +519,12 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
     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] {{{


@@ -524,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);
 


@@ -748,10 +756,13 @@ MSHook(CFURLRef, CFBundleCopyResourceURL, CFBundleRef bundle, CFStringRef resour
     if (subDirName != NULL)
         file = [NSString stringWithFormat:@"%@/%@", subDirName, resourceType];
 
     if (subDirName != NULL)
         file = [NSString stringWithFormat:@"%@/%@", subDirName, resourceType];
 

-    if (Debug_)
-        NSLog(@"WB:Debug: CFBundleCopyResourceURL(<%@>, \"%@\", \"%@\", \"%@\")", CFBundleGetIdentifier(bundle), resourceName, resourceType, subDirName);
-    if (NSString *path = $pathForFile$inBundle$(file, bundle, false))
-        return (CFURLRef) [[NSURL alloc] initFileURLWithPath:path];
+    if (![file hasSuffix:@".png"]) {
+        if (Debug_)
+            NSLog(@"WB:Debug: CFBundleCopyResourceURL(<%@>, \"%@\", \"%@\", \"%@\")", CFBundleGetIdentifier(bundle), resourceName, resourceType, subDirName);
+        if (NSString *path = $pathForFile$inBundle$(file, bundle, false))
+            return (CFURLRef) [[NSURL alloc] initFileURLWithPath:path];
+    }
+

     return _CFBundleCopyResourceURL(bundle, resourceName, resourceType, subDirName);
 }
 // }}}
     return _CFBundleCopyResourceURL(bundle, resourceName, resourceType, subDirName);
 }
 // }}}


@@ -886,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) {


@@ -979,6 +1014,32 @@ MSInstanceMessage4(CGRect, NSString, boundingRectWithSize,options,attributes,con
     return (CGRect) {{0, 0}, [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(color), base, info] forWidth:size.width]};
 }
 
     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);
 


@@ -1060,14 +1121,20 @@ 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 skipState = {&dayState,
-        unsigned(kCFCoreFoundationVersionNumber > 800 ? 16 : 7)
-    , nil, nil};
+    unsigned skips;
+    if (kCFCoreFoundationVersionNumber < 800)
+        skips = 7;
+    else if (kCFCoreFoundationVersionNumber < 1200)
+        skips = 16;
+    else
+        skips = 9;
+
+    WBStringDrawingState skipState = {&dayState, skips, nil, nil};

 
     WBStringDrawingState dateState = {&skipState, 2, @""
     , @"CalendarIconDateStyle"};
 
     WBStringDrawingState dateState = {&skipState, 2, @""
     , @"CalendarIconDateStyle"};


@@ -1225,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;


@@ -2042,7 +2109,7 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) {
 // }}}
 
 template <typename Original_>
 // }}}
 
 template <typename Original_>

-static UIImage *WBCacheUIImage(NSBundle *bundle, const Original_ &original, NSString *name, NSString *key) {
+static UIImage *WBCacheImage(NSBundle *bundle, NSString *name, const Original_ &original, NSString *key) {

     if (name == nil)
         return original();
     NSUInteger period([name rangeOfString:@"."].location);
     if (name == nil)
         return original();
     NSUInteger period([name rangeOfString:@"."].location);


@@ -2050,7 +2117,9 @@ static UIImage *WBCacheUIImage(NSBundle *bundle, const Original_ &original, NSSt
     if (period == NSNotFound || length < 4 || period > length - 4)
         name = [name stringByAppendingString:@".png"];
 
     if (period == NSNotFound || length < 4 || period > length - 4)
         name = [name stringByAppendingString:@".png"];
 

-    return WBCacheImage([bundle, &original, name](){
+    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]]);
         UIImage *image(original());
         if (image != nil && UIDebug_) {
             NSString *path([@"/tmp/WBImages/" stringByAppendingString:[bundle bundleIdentifier]]);


@@ -2059,7 +2128,8 @@ static UIImage *WBCacheUIImage(NSBundle *bundle, const Original_ &original, NSSt
             if (![Manager_ fileExistsAtPath:path])
                 [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
         } return image;
             if (![Manager_ fileExistsAtPath:path])
                 [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
         } return image;

-    }, [=](){ return $pathForFile$inBundle$(name, bundle, true); }, key);
+    },
+    key);

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


@@ -2068,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(_UIKitBundle(),
+    return WBCacheImage(_UIKitBundle(), name,

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

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

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


@@ -2078,8 +2148,8 @@ 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]);
 }
 // }}}


@@ -2095,9 +2165,9 @@ MSInstanceMessageHook2(UIImage *, UISharedArtwork, imageNamed,device, NSString *
     NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle)));
     if (Debug_)
         NSLog(@"WB:Debug: -[UISharedArtwork(%@) imageNamed:@\"%@\" device:%li]", [bundle bundleIdentifier], name, (long) device);
     NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle)));
     if (Debug_)
         NSLog(@"WB:Debug: -[UISharedArtwork(%@) imageNamed:@\"%@\" device:%li]", [bundle bundleIdentifier], name, (long) device);

-    return WBCacheUIImage(bundle,
+    return WBCacheImage(bundle, name,

         [=](){ return MSOldCall(name, device); },
         [=](){ return MSOldCall(name, device); },

-    name, [NSString stringWithFormat:@"M:%p:%@:%li", self, name, (long) device]);
+    [NSString stringWithFormat:@"M:%p:%@:%li", self, name, (long) device]);

 }
 // }}}
 // _UIAssetManager (iOS 7) {{{
 }
 // }}}
 // _UIAssetManager (iOS 7) {{{


@@ -2126,9 +2196,9 @@ MSInstanceMessageHook5(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtyp
             bundle = [WBBundle bundleWithIdentifier:@"com.apple.uikit.LegacyArtwork"];
     }
 
             bundle = [WBBundle bundleWithIdentifier:@"com.apple.uikit.LegacyArtwork"];
     }
 

-    return WBCacheUIImage(bundle,
+    return WBCacheImage(bundle, name,

         [=](){ return MSOldCall(name, scale, idiom, subtype, caching); },
         [=](){ return MSOldCall(name, scale, idiom, subtype, caching); },

-    name, [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu", self, name, scale, (long) idiom, (unsigned long) subtype]);
+    [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu", self, name, scale, (long) idiom, (unsigned long) subtype]);

 }
 // }}}
 // _UIAssetManager (iOS 8) {{{
 }
 // }}}
 // _UIAssetManager (iOS 8) {{{


@@ -2148,9 +2218,9 @@ MSInstanceMessageHook7(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtyp
             (long) size.first, (long) size.second,
             attach ? "YES" : "NO"
         );
             (long) size.first, (long) size.second,
             attach ? "YES" : "NO"
         );

-    return WBCacheUIImage(bundle,
+    return WBCacheImage(bundle, name,

         [=](){ return MSOldCall(name, scale, idiom, subtype, caching, size, attach); },
         [=](){ 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']);
+    [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']);

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


@@ -2557,6 +2627,7 @@ MSInitialize {
     // }}}
     // Foundation {{{
     if (true) {
     // }}}
     // Foundation {{{
     if (true) {

+        if (![identifier isEqualToString:@"com.apple.backupd"]) // XXX: rethink

         MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL));
     }
     // }}}
         MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL));
     }
     // }}}


@@ -2649,6 +2720,9 @@ 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$));

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