X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/0db8a0844b9ca9bc99ee05daec842af82d38130c..0032040f5dc9856880c5c10c67a21c40078d3f8b:/Library.mm?ds=inline diff --git a/Library.mm b/Library.mm index d5175fb..80e1869 100644 --- a/Library.mm +++ b/Library.mm @@ -133,6 +133,8 @@ MSMetaClassHook(SBIconAccessoryImage) MSClassHook(SBIconBadge) MSClassHook(SBIconBadgeFactory) MSClassHook(SBIconBadgeImage) +MSClassHook(SBIconBadgeView) +MSMetaClassHook(SBIconBadgeView) MSClassHook(SBIconContentView) MSClassHook(SBIconController) MSClassHook(SBIconLabel) @@ -255,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)]); @@ -604,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 @@ -679,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)) @@ -689,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; @@ -726,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) { @@ -769,8 +752,52 @@ static NSString *WBColorMarkup() { return [NSString stringWithFormat:@"color: rgba(%g, %g, %g, %g)", r * 255, g * 255, b * 255, a]; } -MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing,includeEmoji, CGPoint, point, float, width, UIFont *, font, UILineBreakMode, mode, float, spacing, BOOL, emoji) { - //NSLog(@"XXX: @\"%@\" %g", self, spacing); +static NSString *WBColorMarkup() { + CGContextRef context(UIGraphicsGetCurrentContext()); + //NSLog(@"XXX:1:%p", context); + if (context == NULL) + return @""; + + CGColorSpaceRef space(CGContextGetFillColorSpace(context)); + //NSLog(@"XXX:2:%p", space); + if (space == NULL) + return @""; + + size_t number(CGColorSpaceGetNumberOfComponents(space)); + //NSLog(@"XXX:3:%u", number); + if (number == 0) + return @""; + + CGFloat components[number + 1]; + CGContextGetFillColor(context, components); + return WBColorMarkup(number, components); +} + +static NSString *WBColorMarkup(UIColor *uicolor) { + if (uicolor == nil) + return @""; + CGColorRef cgcolor([uicolor CGColor]); + if (cgcolor == NULL) + return @""; + + CGColorSpaceRef space(CGColorGetColorSpace(cgcolor)); + //NSLog(@"XXX:2:%p", space); + if (space == NULL) + return @""; + + size_t number(CGColorGetNumberOfComponents(cgcolor)); + //NSLog(@"XXX:3:%u", number); + if (number == 0) + return @""; + + const CGFloat *components(CGColorGetComponents(cgcolor)); + return WBColorMarkup(number, components); +} + +extern "C" NSString *NSStringFromCGPoint(CGPoint rect); + +MSInstanceMessage6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing,includeEmoji, CGPoint, point, CGFloat, width, UIFont *, font, UILineBreakMode, mode, CGFloat, spacing, BOOL, emoji) { + //NSLog(@"XXX: @\"%@\" %@ %g \"%@\" %u %g %u", self, NSStringFromCGPoint(point), width, font, mode, spacing, emoji); WBStringDrawingState *state(stringDrawingState_); if (state == NULL) @@ -794,7 +821,7 @@ MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreak extern "C" NSString *NSStringFromCGRect(CGRect rect); MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alignment,lineSpacing,includeEmoji,truncationRect, CGRect, rect, UIFont *, font, UILineBreakMode, mode, UITextAlignment, alignment, float, spacing, BOOL, emoji, CGRect, truncation) { - //NSLog(@"XXX: &\"%@\" %@ \"%@\" %u %u %g %u %@", self, NSStringFromCGRect(rect), font, mode, alignment, spacing, emoji, NSStringFromCGRect(truncation)); + //NSLog(@"XXX: @\"%@\" %@ \"%@\" %u %u %g %u %@", self, NSStringFromCGRect(rect), font, mode, alignment, spacing, emoji, NSStringFromCGRect(truncation)); WBStringDrawingState *state(stringDrawingState_); if (state == NULL) @@ -834,7 +861,57 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig return CGSizeZero; } -MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, float, width, UILineBreakMode, mode, float, spacing) { +MSInstanceMessage2(void, NSString, drawInRect,withAttributes, CGRect, rect, NSDictionary *, attributes) { + //NSLog(@"XXX: *\"%@\" %@", self, attributes); + + WBStringDrawingState *state(stringDrawingState_); + if (state == NULL) + return MSOldCall(rect, attributes); + + if (state->count_ != 0 && --state->count_ == 0) + stringDrawingState_ = state->next_; + if (state->info_ == nil) + return MSOldCall(rect, attributes); + + NSString *info([Info_ objectForKey:state->info_]); + if (info == nil) + return MSOldCall(rect, attributes); + + NSString *base(state->base_ ?: @""); + + UIFont *font([attributes objectForKey:@"NSFont"]); + UIColor *color([attributes objectForKey:@"NSColor"]); + + [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(color), base, info]]; +} + +extern "C" NSString *NSStringFromCGSize(CGSize size); + +MSInstanceMessage4(CGRect, NSString, boundingRectWithSize,options,attributes,context, CGSize, size, NSInteger, options, NSDictionary *, attributes, id, context) { + //NSLog(@"XXX: $\"%@\" %@ 0x%x %@ %@", self, NSStringFromCGSize(size), unsigned(options), attributes, context); + + WBStringDrawingState *state(stringDrawingState_); + if (state == NULL) + return MSOldCall(size, options, attributes, context); + + if (state->count_ != 0 && --state->count_ == 0) + stringDrawingState_ = state->next_; + if (state->info_ == nil) + return MSOldCall(size, options, attributes, context); + + NSString *info([Info_ objectForKey:state->info_]); + if (info == nil) + return MSOldCall(size, options, attributes, context); + + NSString *base(state->base_ ?: @""); + + UIFont *font([attributes objectForKey:@"NSFont"]); + UIColor *color([attributes objectForKey:@"NSColor"]); + + return (CGRect) {{0, 0}, [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(color), base, info] forWidth:size.width]}; +} + +MSInstanceMessage4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, CGFloat, width, UILineBreakMode, mode, CGFloat, spacing) { //NSLog(@"XXX: #\"%@\" \"%@\" %g %u %g", self, font, width, mode, spacing); WBStringDrawingState *state(stringDrawingState_); @@ -855,7 +932,7 @@ MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,let return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info] forWidth:width]; } -MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) { +MSInstanceMessage1(CGSize, NSString, sizeWithFont, UIFont *, font) { //NSLog(@"XXX: ?\"%@\"", self); WBStringDrawingState *state(stringDrawingState_); @@ -875,6 +952,18 @@ MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) { return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), base, info] forWidth:65535]; } +MSClassMessageHook2(id, SBIconBadgeView, checkoutAccessoryImagesForIcon,location, id, icon, int, location) { + WBStringDrawingState badgeState = {NULL, 0, @"" + , @"BadgeStyle"}; + + stringDrawingState_ = &badgeState; + + id images(MSOldCall(icon, location)); + + stringDrawingState_ = NULL; + return images; +} + MSClassMessageHook2(UIImage *, SBIconAccessoryImage, checkoutAccessoryImageForIcon,location, id, icon, int, location) { if ([self _imageClassForIcon:icon location:location] != $SBIconBadgeImage) return MSOldCall(icon, location); @@ -908,9 +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 skipState = {&dayState, + unsigned(kCFCoreFoundationVersionNumber > 800 ? 16 : 7) + , nil, nil}; - WBStringDrawingState dateState = {&sizeState, 2, @"" + WBStringDrawingState dateState = {&skipState, 2, @"" , @"CalendarIconDateStyle"}; stringDrawingState_ = &dateState; @@ -976,7 +1067,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)]; @@ -1424,13 +1515,13 @@ WBDelegate(badge_) /* }}} */ // IconAlpha {{{ -MSInstanceMessageHook1(void, SBIcon, setIconImageAlpha, float, alpha) { +MSInstanceMessageHook1(void, SBIcon, setIconImageAlpha, CGFloat, alpha) { if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) alpha = [number floatValue]; return MSOldCall(alpha); } -MSInstanceMessageHook1(void, SBIcon, setIconLabelAlpha, float, alpha) { +MSInstanceMessageHook1(void, SBIcon, setIconLabelAlpha, CGFloat, alpha) { if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) alpha = [number floatValue]; return MSOldCall(alpha); @@ -1451,7 +1542,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); @@ -1782,6 +1873,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)); @@ -1889,6 +1989,8 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) { 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]); @@ -2051,15 +2153,6 @@ static void msset(Type_ &function, MSImageRef image, const char *name) { #define WBHookSymbol(image, function) \ msset(function, image, "_" #function) -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); -} - template static void dlset(Type_ &function, const char *name) { function = reinterpret_cast(dlsym(RTLD_DEFAULT, name)); @@ -2112,7 +2205,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]); @@ -2145,6 +2238,7 @@ static void SBInitialize() { } else { WBRename(SBIconLabelImageParameters, hash, hash); WBRename($SBIconView, _labelImageParametersForIcon:location:, _labelImageParametersForIcon$location$); + WBRename(SBIconView, _labelImageParameters, _labelImageParameters); WBRename($SBIconLabelImage, _drawLabelImageForParameters:, _drawLabelImageForParameters$); } @@ -2159,9 +2253,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$); @@ -2180,6 +2276,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) { @@ -2351,9 +2452,15 @@ MSInitialize { // }}} // UIKit {{{ if (MSImageRef image = MSGetImageByName("/System/Library/Frameworks/UIKit.framework/UIKit")) { +#ifdef __LP64__ + class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v40@0:8{CGPoint=dd}16@32"); + class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v56@0:8{CGRect={CGSize=dd}{CGSize=dd}}16@48"); + class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=dd}32@0:8@16d24"); +#else class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16"); class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v28@0:4{CGRect={CGSize=ff}{CGSize=ff}}8@24"); class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=ff}16@0:4@8f12"); +#endif WBHookSymbol(image, _UIKitBundle); WBHookSymbol(image, _UIPackedImageTableGetIdentifierForName); @@ -2372,6 +2479,21 @@ MSInitialize { 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$)); } // }}}